From patchwork Mon Oct 30 04:58:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 159475 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1989549vqb; Sun, 29 Oct 2023 22:04:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2smElQpJvOwI9wpvbZPTUq54Q2CUfd+lfS66RJQPrurx/RRv6Q7brxnlC9sUcSQ5fXZ7h X-Received: by 2002:a05:6830:16cf:b0:6b9:6419:1cde with SMTP id l15-20020a05683016cf00b006b964191cdemr9302442otr.22.1698642256610; Sun, 29 Oct 2023 22:04:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698642256; cv=none; d=google.com; s=arc-20160816; b=WAjn/mqVs8ohJyCAIkIX7q07HMcMDmh6e925bod7McsGGpVX99jPg+rALD1KQxiR20 Rn/bCraZhoOcdTljZJMY0hdlYvkUsIJwfshUPOyvKG3lrcGtaHcqNCtPch7H12pgQqZH t1VV78eWWGqSkVUj8h3du2HzitAR42cGFo/Fr+fdjHglSGLp+vPOs+c3FKhM0g9bW/WG 47EmaxXVyHvZizp1EDRW8C0MieaqLpOe1+sHN09o8TYWM2sOD/GT+TaMbIj4PACpCMac NYVeJSWbPrBR9srtTtz0RNQGJN5Rgt3AmdXE3cMH21Zv/+SNqi5I21ZO42X9tWD2IsrM eViA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=xAnfqE6UvaOpcjQUHnh8QC3ca91/EV9KNTkMgLrAa6A=; fh=zYEmLH91K0BhYPrt6I2nS4LgIhj2kx6joeFANxsEwFU=; b=jCIWdeW6WQoJo5MS9fbr1t8J2xt0h4Ap9eC67HbF9WJGZJVAXbJO/Nli40XTA20ZSV Mf67esGNjFWE4asdtl3tQHwomC0f+C81PnaGggVizrzDORNSujCLC/8jhvEpC6I1Eldj dl9BJ4HAeVYzoSPcSwuPWn10PNuZvBMwqt+/smOIWhV/Kt4G3syeB6znSjL0KMl+lO3Q bAOYyZFQdgsPshvh0T0KmfYAXqosQrQEzY9N/7IWjIg8EZQ2cWN3ZFVhwokEHSfOXGeX 3/F1ekj8wE6WoHIts+BJ5FAC/F9S2RAk2Zs+WoquXURLtMTwdioQXskkrGRDVwbZ4NKv m6XA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=EHFlLPOJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id c21-20020a056a00249500b00690d695b113si4530549pfv.337.2023.10.29.22.04.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 22:04:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=EHFlLPOJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 640BB805E444; Sun, 29 Oct 2023 22:04:14 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230438AbjJ3E6S (ORCPT + 31 others); Mon, 30 Oct 2023 00:58:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbjJ3E6Q (ORCPT ); Mon, 30 Oct 2023 00:58:16 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB861BC; Sun, 29 Oct 2023 21:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698641891; bh=xAnfqE6UvaOpcjQUHnh8QC3ca91/EV9KNTkMgLrAa6A=; h=Date:From:To:Cc:Subject:From; b=EHFlLPOJ8h10vplzw9JC+d3UZAxyJP3VRdIxS/gFl6PmLHGvd9B6UpCaX3X4kLDhC bnJ6N0AW94FkiRE9gVtZhWzdFKJ/fn5a3GPgmCz5X+HD8qlImMhsitAGiYYyAHPnaA 4EX9wrIKsrPEhDDFfKk7kW3WDjt0Wbwy4kOE1SoUjQ1ytVYprH4ax1u3gZ/Ek23B3w mN+ecSii3Uqtd/HgHFsChQVGByHPfo7RYbtkoK/TMLZMj/zOXZfNoQI/vbNR9FqYah 4a8fy/Pvxov7brAeS4DEbaObK5dgaSCA76k8XWaSxxlOgqtok742KEuUFjEetPdPvq M1W0UgGpqXiUg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SJgyB0FRLz4xPc; Mon, 30 Oct 2023 15:58:09 +1100 (AEDT) Date: Mon, 30 Oct 2023 15:58:09 +1100 From: Stephen Rothwell To: Herbert Xu , David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Linux Crypto List , Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Francesco Ruggeri , Salam Noureddine , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the crypto tree Message-ID: <20231030155809.6b47288c@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 29 Oct 2023 22:04:14 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781155502698861219 X-GMAIL-MSGID: 1781155502698861219 Hi all, After merging the crypto tree, today's linux-next build (powerpc allyesconfig) failed like this: net/ipv4/tcp_ao.c: In function 'tcp_ao_key_alloc': net/ipv4/tcp_ao.c:1536:13: error: implicit declaration of function 'crypto_ahash_alignmask'; did you mean 'crypto_ahash_alg_name'? [-Werror=implicit-function-declaration] 1536 | if (crypto_ahash_alignmask(tfm) > TCP_AO_KEY_ALIGN) { | ^~~~~~~~~~~~~~~~~~~~~~ | crypto_ahash_alg_name Caused by commit 0f8660c82b79 ("crypto: ahash - remove crypto_ahash_alignmask") interacting with commit 4954f17ddefc ("net/tcp: Introduce TCP_AO setsockopt()s") from the net-next tree. I have applied the following merge resolution patch for today: From: Stephen Rothwell Date: Mon, 30 Oct 2023 15:54:37 +1100 Subject: [PATCH] fix up for "crypto: ahash - remove crypto_ahash_alignmask" interacting with "net/tcp: Introduce TCP_AO setsockopt()s" Signed-off-by: Stephen Rothwell Signed-off-by: Stephen Rothwell Acked-by: Herbert Xu Reviewed-by: Dmitry Safonov --- net/ipv4/tcp_ao.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c index 6a845e906a1d..d18562bb3184 100644 --- a/net/ipv4/tcp_ao.c +++ b/net/ipv4/tcp_ao.c @@ -1533,10 +1533,6 @@ static struct tcp_ao_key *tcp_ao_key_alloc(struct sock *sk, goto err_free_pool; tfm = crypto_ahash_reqtfm(hp.req); - if (crypto_ahash_alignmask(tfm) > TCP_AO_KEY_ALIGN) { - err = -EOPNOTSUPP; - goto err_pool_end; - } digest_size = crypto_ahash_digestsize(tfm); tcp_sigpool_end(&hp);