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 2CE2E1B3F5 for ; Fri, 23 Nov 2018 11:30:13 +0100 (CET) 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 mx1.redhat.com (Postfix) with ESMTPS id 8C81085541; Fri, 23 Nov 2018 10:30:12 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1458C6128A; Fri, 23 Nov 2018 10:30:10 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Ajit Khaparde , dpdk stable Date: Fri, 23 Nov 2018 10:26:51 +0000 Message-Id: <20181123102713.17309-47-ktraynor@redhat.com> In-Reply-To: <20181123102713.17309-1-ktraynor@redhat.com> References: <20181123102713.17309-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 23 Nov 2018 10:30:12 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bnxt: fix uninitialized variable access' 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: Fri, 23 Nov 2018 10:30:13 -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/29/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 0262f01d631ffb47ca1564f375f7a94acc488b0c Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Sun, 28 Oct 2018 04:35:42 +0000 Subject: [PATCH] net/bnxt: fix uninitialized variable access [ upstream commit c06aee624d69f91f253fa8e6f0c809c03ef126ce ] ag_cons is used uninitialized, it is used when DEBUG enabled, remove debug code. Fixes: 0958d8b6435d ("net/bnxt: support LRO") Signed-off-by: Ferruh Yigit Acked-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxr.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index c7bc88481..1bfc63d93 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -103,23 +103,4 @@ static inline void bnxt_reuse_rx_mbuf(struct bnxt_rx_ring_info *rxr, } -#ifdef BNXT_DEBUG -static void bnxt_reuse_ag_mbuf(struct bnxt_rx_ring_info *rxr, uint16_t cons, - struct rte_mbuf *mbuf) -{ - uint16_t prod = rxr->ag_prod; - struct bnxt_sw_rx_bd *prod_rx_buf; - struct rx_prod_pkt_bd *prod_bd, *cons_bd; - - prod_rx_buf = &rxr->ag_buf_ring[prod]; - - prod_rx_buf->mbuf = mbuf; - - prod_bd = &rxr->ag_desc_ring[prod]; - cons_bd = &rxr->ag_desc_ring[cons]; - - prod_bd->address = cons_bd->addr; -} -#endif - static inline struct rte_mbuf *bnxt_consume_rx_buf(struct bnxt_rx_ring_info *rxr, @@ -378,7 +359,4 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt, uint16_t cons, prod, cp_cons = RING_CMP(cpr->cp_ring_struct, tmp_raw_cons); -#ifdef BNXT_DEBUG - uint16_t ag_cons; -#endif struct rte_mbuf *mbuf; int rc = 0; @@ -483,6 +461,4 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt, /* Re-install the mbuf back to the rx ring */ bnxt_reuse_rx_mbuf(rxr, cons, mbuf); - if (agg_buf) - bnxt_reuse_ag_mbuf(rxr, ag_cons, mbuf); rc = -EIO; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-23 10:22:55.484551877 +0000 +++ 0047-net-bnxt-fix-uninitialized-variable-access.patch 2018-11-23 10:22:54.000000000 +0000 @@ -1,13 +1,14 @@ -From c06aee624d69f91f253fa8e6f0c809c03ef126ce Mon Sep 17 00:00:00 2001 +From 0262f01d631ffb47ca1564f375f7a94acc488b0c Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Sun, 28 Oct 2018 04:35:42 +0000 Subject: [PATCH] net/bnxt: fix uninitialized variable access +[ upstream commit c06aee624d69f91f253fa8e6f0c809c03ef126ce ] + ag_cons is used uninitialized, it is used when DEBUG enabled, remove debug code. Fixes: 0958d8b6435d ("net/bnxt: support LRO") -Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit Acked-by: Ajit Khaparde