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 A6C91A04F3 for ; Thu, 19 Dec 2019 15:38:06 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9FCDA1BF92; Thu, 19 Dec 2019 15:38:06 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by dpdk.org (Postfix) with ESMTP id 2B7281BFB1 for ; Thu, 19 Dec 2019 15:38:04 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id d16so6189921wre.10 for ; Thu, 19 Dec 2019 06:38:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I4DD8kaGqse1SAwVToyllP3xf77mrE37pN7KWdkdwy4=; b=fjKxD7ILU2nZWoMWWzhtpPDwcuU49RFRpAGYKM03G4L5sa2Xi6Z717U7/Nu5hSHBs2 DJKn0jwBQgXza1vCbasP3HOlw8bGdiLrkX+Dz/yFTDlb8EZfhkYH8rFe/QHJcYRsk+c7 L7X4/bBTRirDlWOCrXMlx7+l/xXmPvU/YSGXrGSFupBaKJ7uEaB124nMyLoBJMymndjj l6GjfLtNSJfYLR/ELrw9PdXzIe9Ris6J6jg6JCavkDCht27R7TkBSS/Vo15RNPUwF1b0 Ay0T0Are7xpZpKXxIOtVVVfLxznLZsbIuetVbsrHbggAt4FqDMRrSFgIA+JgZiitT7TN d7Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I4DD8kaGqse1SAwVToyllP3xf77mrE37pN7KWdkdwy4=; b=ii5WdEY6v42/n0CSf6lvNemqfRwyo9evxW90isi4fSJuEyow/eRCDUD7B0G9cMFNuX UmvnYRE3/2tZWiSfL45+RIESwe2m/V62r7Vv4vx/fxNf7tnRICw8mMPVUEAWjJI4Gr1A 0LnJXJaS91JpPIC+0F0TaHxOyPvPUbhaYzPSINiGvEOzGOVA57xuLanCYByTteBPTFe1 B/TPrSgzq2lfGyuT6v/jr4Rx5QWNHh400EzPVl6ajsRxZ6DE9D/C7zXLlfw+QGKXl8o7 vnDd/AXAXswgVXHqwiyAzjXgXKquZlxF0+VZhgqGX2XN/LKArV25HfT+JegMG2vQFM1c ngdA== X-Gm-Message-State: APjAAAVVVVRxxsgLD1B5LU4LBev3/8SHVjryPLzS8c/eeIQAmjhqFe1G JTgAznflG1ANPw6CAtEUf7KcKiLiSsA= X-Google-Smtp-Source: APXvYqzn9fctIglsqUv4R1flZEJb+9qp5bYm+8bKjQKBYEq2M1xQB/K+2ourRWUdNCVjsc/xeCJi9A== X-Received: by 2002:adf:eb89:: with SMTP id t9mr9976525wrn.5.1576766283863; Thu, 19 Dec 2019 06:38:03 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m3sm6363216wrs.53.2019.12.19.06.38.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:38:03 -0800 (PST) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: dpdk stable Date: Thu, 19 Dec 2019 14:33:45 +0000 Message-Id: <20191219143447.21506-78-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/igb: fix global variable multiple definitions' has been queued to LTS release 17.11.10 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 17.11.10 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/21/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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From eec95b017daf7b4beca531b2c4a526cb467c23f4 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 | 10 +++++----- drivers/net/e1000/igb_flow.c | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/e1000/e1000_ethdev.h b/drivers/net/e1000/e1000_ethdev.h index 5668910c5a..70a4798bae 100644 --- a/drivers/net/e1000/e1000_ethdev.h +++ b/drivers/net/e1000/e1000_ethdev.h @@ -350,15 +350,15 @@ struct igb_flow_mem { }; 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_flow_mem_list, igb_flow_mem); -struct igb_flow_mem_list igb_flow_list; +extern struct igb_flow_mem_list igb_flow_list; 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 057579b346..894f8a14d5 100644 --- a/drivers/net/e1000/igb_flow.c +++ b/drivers/net/e1000/igb_flow.c @@ -78,6 +78,12 @@ #define IGB_FLEX_RAW_NUM 12 +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; + /** * Please aware there's an asumption for all the parsers. * rte_flow_item is using big endian, rte_flow_attr and -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:29.456504518 +0000 +++ 0078-net-igb-fix-global-variable-multiple-definitions.patch 2019-12-19 14:32:26.177299253 +0000 @@ -1,8 +1,10 @@ -From b6730d93a13ace701d4f53adcdbbd7c50a90cfbd Mon Sep 17 00:00:00 2001 +From eec95b017daf7b4beca531b2c4a526cb467c23f4 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. @@ -11,19 +13,18 @@ Fixes: 22bb13410cb2 ("net/igb: create consistent filter") Fixes: 424ae915baf0 ("net/e1000: move RSS to flow API") -Cc: stable@dpdk.org 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(-) + drivers/net/e1000/e1000_ethdev.h | 10 +++++----- + drivers/net/e1000/igb_flow.c | 6 ++++++ + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/e1000/e1000_ethdev.h b/drivers/net/e1000/e1000_ethdev.h -index 01ff9433b3..1e41ae9de1 100644 +index 5668910c5a..70a4798bae 100644 --- a/drivers/net/e1000/e1000_ethdev.h +++ b/drivers/net/e1000/e1000_ethdev.h -@@ -351,17 +351,17 @@ struct igb_flow_mem { +@@ -350,15 +350,15 @@ struct igb_flow_mem { }; TAILQ_HEAD(igb_ntuple_filter_list, igb_ntuple_filter_ele); @@ -38,9 +39,6 @@ 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; @@ -48,10 +46,10 @@ 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 4e0b38fcf1..31ca9bb1c3 100644 +index 057579b346..894f8a14d5 100644 --- a/drivers/net/e1000/igb_flow.c +++ b/drivers/net/e1000/igb_flow.c -@@ -49,6 +49,13 @@ +@@ -78,6 +78,12 @@ #define IGB_FLEX_RAW_NUM 12 @@ -60,7 +58,6 @@ +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.