From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 284D2A04F0 for ; Tue, 10 Dec 2019 16:00:31 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 032171BECF; Tue, 10 Dec 2019 16:00:31 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 15C051BE9D for ; Tue, 10 Dec 2019 16:00:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PNle98tZEiBTcxRDvro3aNkqNdrB1/O1YhhCwiw5+2s=; b=R/SYYhMeb920Mg/CzxwLh959Gsnkxf/P+76BQKxM3aWZ98o//zKLuoSIEJMIEQwBgSnU1T ayJcPUi+IrfmRsC2/UFKoz4v1dYELJBlBgizA6pZTWlZCRxmfAoDaOokftb0erz/Bzlucx xTrQvkprvZlr2tIsAWJf5l6TkWlnlPw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-80-lpIa5kXLO1qqpBFErDFq3g-1; Tue, 10 Dec 2019 10:00:25 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 410B6801E74; Tue, 10 Dec 2019 15:00:24 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6215D5D9C5; Tue, 10 Dec 2019 15:00:23 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: dpdk stable Date: Tue, 10 Dec 2019 14:58:49 +0000 Message-Id: <20191210145937.32755-15-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: lpIa5kXLO1qqpBFErDFq3g-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/igb: fix global variable multiple definitions' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/16/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/e314e7856dc9244a1d= a2cc6b5204e33c8d1e76c7 Thanks. Kevin. --- >From e314e7856dc9244a1da2cc6b5204e33c8d1e76c7 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 5 Sep 2019 15:53:07 +0100 Subject: [PATCH] net/igb: fix global variable multiple definitions [ upstream commit b6730d93a13ace701d4f53adcdbbd7c50a90cfbd ] Filtering related global variables are defined in a header file which was causing multiple definitions of the variables, fixed it by moving them to the .c file. Issue has been detected by '-fno-common' gcc flag. Fixes: 22bb13410cb2 ("net/igb: create consistent filter") Fixes: 424ae915baf0 ("net/e1000: move RSS to flow API") Signed-off-by: Ferruh Yigit --- drivers/net/e1000/e1000_ethdev.h | 12 ++++++------ drivers/net/e1000/igb_flow.c | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/net/e1000/e1000_ethdev.h b/drivers/net/e1000/e1000_eth= dev.h index 78fb61e41..28b3e74f8 100644 --- a/drivers/net/e1000/e1000_ethdev.h +++ b/drivers/net/e1000/e1000_ethdev.h @@ -345,15 +345,15 @@ struct igb_flow_mem { =20 TAILQ_HEAD(igb_ntuple_filter_list, igb_ntuple_filter_ele); -struct igb_ntuple_filter_list igb_filter_ntuple_list; +extern struct igb_ntuple_filter_list igb_filter_ntuple_list; TAILQ_HEAD(igb_ethertype_filter_list, igb_ethertype_filter_ele); -struct igb_ethertype_filter_list igb_filter_ethertype_list; +extern struct igb_ethertype_filter_list igb_filter_ethertype_list; TAILQ_HEAD(igb_syn_filter_list, igb_eth_syn_filter_ele); -struct igb_syn_filter_list igb_filter_syn_list; +extern struct igb_syn_filter_list igb_filter_syn_list; TAILQ_HEAD(igb_flex_filter_list, igb_flex_filter_ele); -struct igb_flex_filter_list igb_filter_flex_list; +extern struct igb_flex_filter_list igb_filter_flex_list; TAILQ_HEAD(igb_rss_filter_list, igb_rss_conf_ele); -struct igb_rss_filter_list igb_filter_rss_list; +extern struct igb_rss_filter_list igb_filter_rss_list; TAILQ_HEAD(igb_flow_mem_list, igb_flow_mem); -struct igb_flow_mem_list igb_flow_list; +extern struct igb_flow_mem_list igb_flow_list; =20 extern const struct rte_flow_ops igb_flow_ops; diff --git a/drivers/net/e1000/igb_flow.c b/drivers/net/e1000/igb_flow.c index 33683498a..77ac4a5bc 100644 --- a/drivers/net/e1000/igb_flow.c +++ b/drivers/net/e1000/igb_flow.c @@ -50,4 +50,11 @@ #define=09IGB_FLEX_RAW_NUM=0912 =20 +struct igb_flow_mem_list igb_flow_list; +struct igb_ntuple_filter_list igb_filter_ntuple_list; +struct igb_ethertype_filter_list igb_filter_ethertype_list; +struct igb_syn_filter_list igb_filter_syn_list; +struct igb_flex_filter_list igb_filter_flex_list; +struct igb_rss_filter_list igb_filter_rss_list; + /** * Please aware there's an asumption for all the parsers. --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:40.101064961 +0000 +++ 0015-net-igb-fix-global-variable-multiple-definitions.patch=092019-12-1= 0 14:49:39.004458663 +0000 @@ -1 +1 @@ -From b6730d93a13ace701d4f53adcdbbd7c50a90cfbd Mon Sep 17 00:00:00 2001 +From e314e7856dc9244a1da2cc6b5204e33c8d1e76c7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b6730d93a13ace701d4f53adcdbbd7c50a90cfbd ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 01ff9433b..1e41ae9de 100644 +index 78fb61e41..28b3e74f8 100644 @@ -26 +27 @@ -@@ -352,15 +352,15 @@ struct igb_flow_mem { +@@ -345,15 +345,15 @@ struct igb_flow_mem { @@ -49 +50 @@ -index 4e0b38fcf..31ca9bb1c 100644 +index 33683498a..77ac4a5bc 100644