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 42513A00B8 for ; Mon, 28 Oct 2019 06:43:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 31F751BEFA; Mon, 28 Oct 2019 06:43:27 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id B94291BEFA; Mon, 28 Oct 2019 06:43:25 +0100 (CET) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Oct 2019 22:43:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,238,1569308400"; d="scan'208";a="400711086" Received: from yexl-server.sh.intel.com (HELO localhost) ([10.67.117.17]) by fmsmga006.fm.intel.com with ESMTP; 27 Oct 2019 22:43:23 -0700 Date: Mon, 28 Oct 2019 13:39:57 +0800 From: Ye Xiaolong To: Xiao Wang Cc: dev@dpdk.org, qi.z.zhang@intel.com, stable@dpdk.org, Anna Lukin Message-ID: <20191028053957.GB33024@intel.com> References: <20191026003322.131809-1-xiao.w.wang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191026003322.131809-1-xiao.w.wang@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [dpdk-stable] [PATCH] net/fm10k: fix mbuf free in vector Rx 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" On 10/25, Xiao Wang wrote: >There's a corner case that all the Rx queue mbufs are allocated but none >of them is used, this patch fixes mbuf free for this case. > >Fixes: b6719f8a04bb ("fm10k: release mbuf for vector Rx") >Cc: stable@dpdk.org > >Signed-off-by: Xiao Wang >Signed-off-by: Anna Lukin >--- > drivers/net/fm10k/fm10k_rxtx_vec.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > >diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c >index 45542bef3..d76dfd16f 100644 >--- a/drivers/net/fm10k/fm10k_rxtx_vec.c >+++ b/drivers/net/fm10k/fm10k_rxtx_vec.c >@@ -359,8 +359,15 @@ fm10k_rx_queue_release_mbufs_vec(struct fm10k_rx_queue *rxq) > return; > > /* free all mbufs that are valid in the ring */ >- for (i = rxq->next_dd; i != rxq->rxrearm_start; i = (i + 1) & mask) >- rte_pktmbuf_free_seg(rxq->sw_ring[i]); >+ if (rxq->rxrearm_nb == 0) { >+ for (i = 0; i < rxq->nb_desc; i++) >+ if (rxq->sw_ring[i] != NULL) >+ rte_pktmbuf_free_seg(rxq->sw_ring[i]); >+ } else { >+ for (i = rxq->next_dd; i != rxq->rxrearm_start; >+ i = (i + 1) & mask) >+ rte_pktmbuf_free_seg(rxq->sw_ring[i]); >+ } > rxq->rxrearm_nb = rxq->nb_desc; > > /* set all entries to NULL */ >-- >2.15.1 > Reviewed-by: Xiaolong Ye Applied to dpdk-next-net-intel. Thanks.