From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 1153F1B10D for ; Wed, 21 Nov 2018 17:06:23 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6F5A188E50; Wed, 21 Nov 2018 16:06:22 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C13A608E7; Wed, 21 Nov 2018 16:06:21 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Ferruh Yigit , dpdk stable Date: Wed, 21 Nov 2018 16:04:15 +0000 Message-Id: <20181121160440.9014-25-ktraynor@redhat.com> In-Reply-To: <20181121160440.9014-1-ktraynor@redhat.com> References: <20181121160440.9014-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 21 Nov 2018 16:06:22 +0000 (UTC) Subject: [dpdk-stable] patch 'net/avf: fix missing compiler error flags' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Wed, 21 Nov 2018 16:06:23 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/26/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 9459e0acddd6de13797ce3ebc08195d71e686227 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 19 Sep 2018 11:04:16 +0100 Subject: [PATCH] net/avf: fix missing compiler error flags [ upstream commit bfd38e4d708bc2479e70329ce242ce2e13c8da5d ] The AVF driver was missing $(WERROR_FLAGS) in it's cflags, which means that a number of compilation errors were getting missed. This patch adds in the flag and fixes most of the errors, just disabling the strict-aliasing ones. Fixes: 22b123a36d07 ("net/avf: initialize PMD") Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Fixes: a2b29a7733ef ("net/avf: enable basic Rx Tx") Fixes: 319c421f3890 ("net/avf: enable SSE Rx Tx") Signed-off-by: Bruce Richardson Reviewed-by: Ferruh Yigit --- drivers/net/avf/Makefile | 2 +- drivers/net/avf/avf_ethdev.c | 2 +- drivers/net/avf/avf_rxtx.h | 2 +- drivers/net/avf/avf_rxtx_vec_sse.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/avf/Makefile b/drivers/net/avf/Makefile index 3f815bbc4..0a142c104 100644 --- a/drivers/net/avf/Makefile +++ b/drivers/net/avf/Makefile @@ -9,5 +9,5 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_pmd_avf.a -CFLAGS += -O3 +CFLAGS += -O3 $(WERROR_FLAGS) -Wno-strict-aliasing LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c index be9f163be..a44e3e6ca 100644 --- a/drivers/net/avf/avf_ethdev.c +++ b/drivers/net/avf/avf_ethdev.c @@ -561,5 +561,5 @@ avf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) static const uint32_t * -avf_dev_supported_ptypes_get(struct rte_eth_dev *dev) +avf_dev_supported_ptypes_get(struct rte_eth_dev *dev __rte_unused) { static const uint32_t ptypes[] = { diff --git a/drivers/net/avf/avf_rxtx.h b/drivers/net/avf/avf_rxtx.h index 297d0776d..c4120f8a4 100644 --- a/drivers/net/avf/avf_rxtx.h +++ b/drivers/net/avf/avf_rxtx.h @@ -228,5 +228,5 @@ void avf_dump_tx_descriptor(const struct avf_tx_queue *txq, const void *desc, uint16_t tx_id) { - char *name; + const char *name; const struct avf_tx_desc *tx_desc = desc; enum avf_tx_desc_dtype_value type; diff --git a/drivers/net/avf/avf_rxtx_vec_sse.c b/drivers/net/avf/avf_rxtx_vec_sse.c index 8275100f3..343a6aac3 100644 --- a/drivers/net/avf/avf_rxtx_vec_sse.c +++ b/drivers/net/avf/avf_rxtx_vec_sse.c @@ -622,5 +622,5 @@ avf_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts, } -void __attribute__((cold)) +static void __attribute__((cold)) avf_rx_queue_release_mbufs_sse(struct avf_rx_queue *rxq) { -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 15:59:14.265445890 +0000 +++ 0025-net-avf-fix-missing-compiler-error-flags.patch 2018-11-21 15:59:13.000000000 +0000 @@ -1,8 +1,10 @@ -From bfd38e4d708bc2479e70329ce242ce2e13c8da5d Mon Sep 17 00:00:00 2001 +From 9459e0acddd6de13797ce3ebc08195d71e686227 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 19 Sep 2018 11:04:16 +0100 Subject: [PATCH] net/avf: fix missing compiler error flags +[ upstream commit bfd38e4d708bc2479e70329ce242ce2e13c8da5d ] + The AVF driver was missing $(WERROR_FLAGS) in it's cflags, which means that a number of compilation errors were getting missed. This patch adds in the flag and fixes most of the errors, just disabling the @@ -13,8 +15,6 @@ Fixes: a2b29a7733ef ("net/avf: enable basic Rx Tx") Fixes: 319c421f3890 ("net/avf: enable SSE Rx Tx") -CC: stable@dpdk.org - Signed-off-by: Bruce Richardson Reviewed-by: Ferruh Yigit --- @@ -36,10 +36,10 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c -index 6b6ff7d55..549498477 100644 +index be9f163be..a44e3e6ca 100644 --- a/drivers/net/avf/avf_ethdev.c +++ b/drivers/net/avf/avf_ethdev.c -@@ -560,5 +560,5 @@ avf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +@@ -561,5 +561,5 @@ avf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) static const uint32_t * -avf_dev_supported_ptypes_get(struct rte_eth_dev *dev)