From patchwork Fri Jun 16 09:08:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108964 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1195169vqr; Fri, 16 Jun 2023 02:25:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4QbiFfvUUejhT5FHl6z2QUq358uFcPyzkiqQuRdngf5sKl3KsJupLlTSMKrcBoKQRNN+fs X-Received: by 2002:a05:6a00:189a:b0:64a:5cde:3a7d with SMTP id x26-20020a056a00189a00b0064a5cde3a7dmr1721418pfh.27.1686907527098; Fri, 16 Jun 2023 02:25:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686907527; cv=none; d=google.com; s=arc-20160816; b=CbgtOlT/3GrMg9sAjtH/4sEPlXxfPtuzH8OCBs6pn3rVw33tS2o89xxJpndGKGkN/t oYjzQX3x9WkArTA9LjussyoCOJktIWZ436mY8XpK7iYnl2ltDaDQhff7pPqWnN+yMdNJ Nb1qgzBNLVEklHG/1Wgwj9BQ/XNm+DMOGkRdW9Q3XTDMFJYQJmQK0mhqhg31EWtVw+8V gmtweTOAd4Tku//H+zvhs871wEMH6gCm+z56yheBg8m283aI6Bs+k5aUYlggWFz2z406 EGdJSwu2mj6O3Wb/QDumzlJLYii3l1RFZvO4gvmFelCgAwEa5OM6TSD0jcMrQQcCFKOF Vifg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=hKR6hQjksmR0KBzz+tuMD71ZVi6IBuAamKpBSDUnXGQ=; b=xrSFCapWhuUYWareOVC9Ce2tCsnIMUrRfL46jwuYT8zthlQ9EaYHjvB1WAlVXCvG8K C5NtET9/Sp549r3QETltNzmVSyhIO5voRXtZJW1oniWafE9ZesZj7sNf0o9DVoDaqiNA A+xvNRRnlAwQJpo8v4uTi7TJSzv5EpZiV3oD+mVkos+VhetYWXx6CMLsu/J7nB7IU62s Zjz8rAkyiIXC1IgAonMPd/5Q++kwc0TFIAU3CdIUaljMQgaR0SZJph7QbKC5nXGoSmHO s6aO7v2yqig/HRrcJ9EUmCwrylgd6tuIJPPfvzki02wMZO34jyvDzCkVpX5g4qwFPsAy COvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XkA67CHY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e29-20020a056a0000dd00b006434e20d023si11305260pfj.399.2023.06.16.02.25.10; Fri, 16 Jun 2023 02:25:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XkA67CHY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243398AbjFPJKk (ORCPT + 99 others); Fri, 16 Jun 2023 05:10:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344507AbjFPJKK (ORCPT ); Fri, 16 Jun 2023 05:10:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 577DA3AB3 for ; Fri, 16 Jun 2023 02:08:52 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7166F6326F for ; Fri, 16 Jun 2023 09:08:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17B15C433C0; Fri, 16 Jun 2023 09:08:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686906530; bh=6H2J61C/zhonIL9tyV87l0liBvz4B9aaRzMD1YpvQE4=; h=From:To:Cc:Subject:Date:From; b=XkA67CHY1l+/tBfiCQacrRszQ1FP6oXVHm5ALNsIXr8juvZASfoEOzpZltWLv1qVa MAgvEtQkesLYwgMy/4gDfqYvp/gcie/gDWHkSvfm1w+86ecyiiEpt/kFLplu1vTlv7 5x4oie6b2M3sir6hIzR18fRZrFrJMOWJ7ZAK8/hlg+zE11g/JzOHOBQj3JrWzhMaVJ qFh2Jl7MHO7Sa8BUiK4mdKIIhBesmn890oA0PSesNnWPeQ68ncgqt2lAx+hPxEikZj q3e3hZzQhtfeW/ux3bsO5cYPL/5oLX5mcqHt1bt5V3hQY3h8zkkvcB8h1JgtMwR5Ol 9CmN1N/q/O6+A== From: Arnd Bergmann To: Edward Cree , Martin Habets , Jakub Kicinski Cc: Arnd Bergmann , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Pieter Jansen van Vuuren , netdev@vger.kernel.org, linux-net-drivers@amd.com, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] sfc: fix uninitialized variable use Date: Fri, 16 Jun 2023 11:08:18 +0200 Message-Id: <20230616090844.2677815-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768850747114780308?= X-GMAIL-MSGID: =?utf-8?q?1768850747114780308?= From: Arnd Bergmann The new efx_bind_neigh() function contains a broken code path when IPV6 is disabled: drivers/net/ethernet/sfc/tc_encap_actions.c:144:7: error: variable 'n' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (encap->type & EFX_ENCAP_FLAG_IPV6) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/sfc/tc_encap_actions.c:184:8: note: uninitialized use occurs here if (!n) { ^ drivers/net/ethernet/sfc/tc_encap_actions.c:144:3: note: remove the 'if' if its condition is always false if (encap->type & EFX_ENCAP_FLAG_IPV6) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/sfc/tc_encap_actions.c:141:22: note: initialize the variable 'n' to silence this warning struct neighbour *n; ^ = NULL Change it to use the existing error handling path here. Fixes: 7e5e7d800011a ("sfc: neighbour lookup for TC encap action offload") Signed-off-by: Arnd Bergmann Reviewed-by: Simon Horman --- drivers/net/ethernet/sfc/tc_encap_actions.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/sfc/tc_encap_actions.c b/drivers/net/ethernet/sfc/tc_encap_actions.c index aac259528e73e..cfd76d5bbdd48 100644 --- a/drivers/net/ethernet/sfc/tc_encap_actions.c +++ b/drivers/net/ethernet/sfc/tc_encap_actions.c @@ -163,6 +163,7 @@ static int efx_bind_neigh(struct efx_nic *efx, * enabled how did someone create an IPv6 tunnel_key? */ rc = -EOPNOTSUPP; + n = NULL; NL_SET_ERR_MSG_MOD(extack, "No IPv6 support (neigh bind)"); #endif } else { From patchwork Fri Jun 16 09:08:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108987 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1200752vqr; Fri, 16 Jun 2023 02:37:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7HD1mdNNZylKbRoTxXdXMxzMgG6xQIYBbNzXkzZoxtnE5zdbixFcxnWiCMlcrS+Zl3KnyH X-Received: by 2002:a17:90a:1597:b0:25b:e5b9:401d with SMTP id m23-20020a17090a159700b0025be5b9401dmr1793866pja.11.1686908256559; Fri, 16 Jun 2023 02:37:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686908256; cv=none; d=google.com; s=arc-20160816; b=ZU139D6pcu1IZlx0cJmwdrTC+Y7btXTzhJdQA5BIQoRkKtACfLSpd7KN32/QnKstrZ K/qS2K0JdsA0GB/UeOhLVQTSV5IieN4oi1Eglr3ShwMW67no+1JuTN65oYZmhuCbNqyY 7DoUugmbt2ToBIrxZ+Uandz6UmwBYEJipJ31oVrV60FhD9HyVIPXt2jconAXGuojpNz4 1zHvVOpR28wtyFfl55bGGD5O8fv8jOrpkhdMXY/y4RGDuhoLykKmlLNEqZBwtdPnr0v+ +7kaLvvSRD63Khs7NdnSLH/t//oYXftY9tzQDJZ7ERWxftkya4Y0G+XZYN0isrAAFUD/ VNhg== 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:cc:to:from :dkim-signature; bh=4+e6n9tugul4MjTxqoQHzyMJ6IYc4RdoQ+CxTNf3mXE=; b=UOiHPWHlOYCGVosOyfxOun1sNbCtXnO2miTHulNqCBPyTCqjJGlnuBdUwjPisu+gyH WAIlKGgHAK0VNL4zDoT3Py9LOfykapPNWAYEYz8lWoXcreXjmGc5CO83ASh5cYAh5qyW 8acjhHF/3lvO02j44tWB3uhXOgvehVlhRHKRAeuMvo1KrTKlNmxX3ZTl8xeOJwHTpaf8 uIhKVDcrfU57CJotni80qOauPR5wE7yxh/dlqGUR8SwVv9rVDWs4iCM0IvjSas8Nw1Tp Maa5mUTnqQpYvOSIaY4WYyQgiht5dC/OhxfqVS5E1hGV6T2i4ym2TkZZdUF+j453KiLf R8Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sgxB3PPe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k17-20020a170902c41100b001a51368b098si9750228plk.209.2023.06.16.02.37.20; Fri, 16 Jun 2023 02:37:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sgxB3PPe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344055AbjFPJLL (ORCPT + 99 others); Fri, 16 Jun 2023 05:11:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344813AbjFPJKe (ORCPT ); Fri, 16 Jun 2023 05:10:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CED5B420F for ; Fri, 16 Jun 2023 02:09:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 50DF76326F for ; Fri, 16 Jun 2023 09:09:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A41EC433C0; Fri, 16 Jun 2023 09:09:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686906544; bh=iPWPXNvnYRe2+h21DBS9ZfvzMiWbCC13nR/zPknLFF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sgxB3PPe7xDo5i1HoqL5Nkc8iI3Igjm7zkJRKSoXXGviq3rQZkC+DUKVcBcKTuX1l Y+v+WN/zaUD1H7JdvtbQq9E9sWKNvEpbaa1U4ahwYGjKTJ9yoPn6R3kfuJvJ8v/Qdb Y0E+he2nJLOvJusREIyfzy4yl7zqQ+mtsk8GtM6D8POPXd3rpY8A6sIqjDOLjw5be/ T78yns/TYvPxei64/CIZgxtYSi9tCKIaEWbKx74gpSHxR5zcmUjXtR42Rk82XBITfG ZX0iAEUNCEUHkzWCgUwHqnKTmcL4OQveGOaiDzHXDQclQxW56DqQ/Eh6B2R3mjWJFR rnmjGGAv+AWLw== From: Arnd Bergmann To: Edward Cree , Martin Habets , Jakub Kicinski Cc: Arnd Bergmann , "David S. Miller" , Eric Dumazet , Paolo Abeni , Alejandro Lucero , Jiri Pirko , Pieter Jansen van Vuuren , Simon Horman , netdev@vger.kernel.org, linux-net-drivers@amd.com, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] sfc: add CONFIG_INET dependency for TC offload Date: Fri, 16 Jun 2023 11:08:19 +0200 Message-Id: <20230616090844.2677815-2-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230616090844.2677815-1-arnd@kernel.org> References: <20230616090844.2677815-1-arnd@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768851511884884907?= X-GMAIL-MSGID: =?utf-8?q?1768851511884884907?= From: Arnd Bergmann The driver now fails to link when CONFIG_INET is disabled, so add an explicit Kconfig dependency: ld.lld: error: undefined symbol: ip_route_output_flow >>> referenced by tc_encap_actions.c >>> drivers/net/ethernet/sfc/tc_encap_actions.o:(efx_tc_flower_create_encap_md) in archive vmlinux.a ld.lld: error: undefined symbol: ip_send_check >>> referenced by tc_encap_actions.c >>> drivers/net/ethernet/sfc/tc_encap_actions.o:(efx_gen_encap_header) in archive vmlinux.a >>> referenced by tc_encap_actions.c >>> drivers/net/ethernet/sfc/tc_encap_actions.o:(efx_gen_encap_header) in archive vmlinux.a ld.lld: error: undefined symbol: arp_tbl >>> referenced by tc_encap_actions.c >>> drivers/net/ethernet/sfc/tc_encap_actions.o:(efx_tc_netevent_event) in archive vmlinux.a >>> referenced by tc_encap_actions.c >>> drivers/net/ethernet/sfc/tc_encap_actions.o:(efx_tc_netevent_event) in archive vmlinux.a Fixes: a1e82162af0b8 ("sfc: generate encap headers for TC offload") Signed-off-by: Arnd Bergmann Reviewed-by: Simon Horman Reviewed-by: Edward Cree --- drivers/net/ethernet/sfc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig index 4af36ba8906ba..3eb55dcfa8a61 100644 --- a/drivers/net/ethernet/sfc/Kconfig +++ b/drivers/net/ethernet/sfc/Kconfig @@ -50,6 +50,7 @@ config SFC_MCDI_MON config SFC_SRIOV bool "Solarflare SFC9100-family SR-IOV support" depends on SFC && PCI_IOV + depends on INET default y help This enables support for the Single Root I/O Virtualization