From patchwork Mon Feb 22 16:25:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 385815 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp1419727jap; Mon, 22 Feb 2021 08:31:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJzX63DWvWjRqzPOg0GCqd9uKgz8SrTBPt5Ucc2SXP3Esxd8NTllYbuGLOfSK07+MFNw/ch4 X-Received: by 2002:aa7:cd63:: with SMTP id ca3mr16522894edb.119.1614011482189; Mon, 22 Feb 2021 08:31:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614011482; cv=none; d=google.com; s=arc-20160816; b=msNyO5XX9unTfSTjd0npx1xHQED8y4AP1IJz58wyosGZcXkjPELd2NGhtpRGQ7mbz8 CUYAZW42fqafzJbHRruFQ1/wRuvWXFb3Kjp6N+W/gV/jPYvMYOj24P59X0/nz5/gW5y5 EImL62y7as3//0wE9GFQuHiDi85U6W19OZCThfTuLuBvJGexshJSCpjXKfC6VWRn3UdS wP4wS75mhXRuHWSe+62WFr4vhcolm3FqimMnO/ZZ4wMJkKs7N4hl5KVKWA40tZwNZSTf vxBQ9fEdP+7DUQuYdmrR04iMhQDQw+j2P4pxGXL9EACNuc6jsjsPtAMcO3RkedvxYqdN 9t6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=8r6qIde3sFs9t093eU9Rh2Ii/O2i5YprmtUZTFEX6Y0=; b=UvFXtaWYSu4Qd5Yz6uFji/IFxtyelLYFHE7aZ/cgbSNQKY8b4P5zY3uvJtUdPog2qq V0bJP6QlomXatdnY0IkW1u6GQjWy6j89oNxRhGzLIYRk6r99C+qTa9QwfMatE9pFNCKN t4rGinl6PsUA/ftvgN9EFW4Ue9n7n5Zn0o2HafjiR0Wf+BwzCyRs6nCv00gKHRWe3h7y meFiK+XnWSNbPh/xtHOeZ9bDfHqbNKUBKq8OxezUUA3Umja99jWK6pZo9eqPod0lJUa0 Tt1dpLkdeEA6dviYxGCsY6glTturop8gwfdGzmYrSx69Gyv4OwvigtWss3gsrdXRW0Ho lJFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=20210105 header.b=FuAlNWrO; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id se21si5744482ejb.362.2021.02.22.08.31.22; Mon, 22 Feb 2021 08:31:22 -0800 (PST) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@zx2c4.com header.s=20210105 header.b=FuAlNWrO; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231757AbhBVQad (ORCPT + 9 others); Mon, 22 Feb 2021 11:30:33 -0500 Received: from mail.zx2c4.com ([104.131.123.232]:60986 "EHLO mail.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231623AbhBVQ22 (ORCPT ); Mon, 22 Feb 2021 11:28:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1614011166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8r6qIde3sFs9t093eU9Rh2Ii/O2i5YprmtUZTFEX6Y0=; b=FuAlNWrOVbAuxVSoW/J3PYzAqhJXVVDTrwdVLoEByc+3KEbYLcJFgM5DuFxXC7wkPw4ChR uEbFd3tq8osPLt1I5s8fxKXRmhTNYcL5qz6Q3SRVX38maAuA8Iz5d1fEGqliQrDaUNjYgH joQWkgZzgeSIr/LkQCpb+Pg9eE4TNJs= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 08ff0b9b (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Mon, 22 Feb 2021 16:26:06 +0000 (UTC) From: "Jason A. Donenfeld" To: netdev@vger.kernel.org, davem@davemloft.net Subject: [PATCH net 7/7] wireguard: kconfig: use arm chacha even with no neon Date: Mon, 22 Feb 2021 17:25:49 +0100 Message-Id: <20210222162549.3252778-8-Jason@zx2c4.com> In-Reply-To: <20210222162549.3252778-1-Jason@zx2c4.com> References: <20210222162549.3252778-1-Jason@zx2c4.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The condition here was incorrect: a non-neon fallback implementation is available on arm32 when NEON is not supported. Reported-by: Ilya Lipnitskiy Fixes: e7096c131e51 ("net: WireGuard secure network tunnel") Signed-off-by: Jason A. Donenfeld --- drivers/net/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.1 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 260f9f46668b..63339d29be90 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -87,7 +87,7 @@ config WIREGUARD select CRYPTO_CURVE25519_X86 if X86 && 64BIT select ARM_CRYPTO if ARM select ARM64_CRYPTO if ARM64 - select CRYPTO_CHACHA20_NEON if (ARM || ARM64) && KERNEL_MODE_NEON + select CRYPTO_CHACHA20_NEON if ARM || (ARM64 && KERNEL_MODE_NEON) select CRYPTO_POLY1305_NEON if ARM64 && KERNEL_MODE_NEON select CRYPTO_POLY1305_ARM if ARM select CRYPTO_CURVE25519_NEON if ARM && KERNEL_MODE_NEON