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 55310A04B1 for ; Mon, 23 Nov 2020 18:13:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 07F93C910; Mon, 23 Nov 2020 18:13:09 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 634BFA3 for ; Mon, 23 Nov 2020 18:13:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151586; 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=6HkagQecN1EpHkMXVatLjcaOdfYF8p4LtlhSxEvHlQw=; b=QYvOPe11C8KPm8v3BWZzd4Ngu4BHXoAhDDwoXQVvOrgbaPRcm0T1eg0ExEW6l875YZTFOS eAVWbJtrFJ4K4BzszXm9EaMXCW9FyYMOeXrj/oHHQhJfZGDVc1HmwG/44F69SLvhE9Qb/l n3FEuSgNUQOdgSC84qCceIjX1y3JP6A= 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-141-g8eNya9gN3-eyeXtqjfcGw-1; Mon, 23 Nov 2020 12:12:59 -0500 X-MC-Unique: g8eNya9gN3-eyeXtqjfcGw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 841BB87308D; Mon, 23 Nov 2020 17:12:58 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91E7860C04; Mon, 23 Nov 2020 17:12:57 +0000 (UTC) From: Kevin Traynor To: Ting Xu Cc: Jingjing Wu , dpdk stable Date: Mon, 23 Nov 2020 17:12:02 +0000 Message-Id: <20201123171222.79398-10-ktraynor@redhat.com> In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> References: <20201123171222.79398-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/avf: fix releasing mbufs' has been queued to LTS release 18.11.11 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.11 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/27/20. 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. 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/67ae38570c4e8b3c14d781e09eba210179342f8a Thanks. Kevin. --- >From 67ae38570c4e8b3c14d781e09eba210179342f8a Mon Sep 17 00:00:00 2001 From: Ting Xu Date: Wed, 11 Nov 2020 11:06:51 +0800 Subject: [PATCH] net/avf: fix releasing mbufs [ upstream commit 36b8b062885f2b6576818a1c18ffaacb4dccefa5 ] In the function _avf_rx_queue_release_mbufs_vec to release rx mbufs, rxq->rxrearm_nb is given the value of rx descriptor number at last. However, since the process to release and allocate mbufs lacks the initialization of rxrearm_nb, if we try to release mbufs next time, it will return without releasing directly. In this patch, rxrearm_nb is initialized to be zero in rx queue reset. Fixes: 319c421f3890 ("net/avf: enable SSE Rx Tx") Signed-off-by: Ting Xu Acked-by: Jingjing Wu --- drivers/net/avf/avf_rxtx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c index 8c8771e665..33670fdb1c 100644 --- a/drivers/net/avf/avf_rxtx.c +++ b/drivers/net/avf/avf_rxtx.c @@ -170,4 +170,5 @@ reset_rx_queue(struct avf_rx_queue *rxq) rxq->pkt_first_seg = NULL; rxq->pkt_last_seg = NULL; + rxq->rxrearm_nb = 0; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.230422849 +0000 +++ 0010-net-avf-fix-releasing-mbufs.patch 2020-11-23 17:10:13.976061566 +0000 @@ -1 +1 @@ -From 36b8b062885f2b6576818a1c18ffaacb4dccefa5 Mon Sep 17 00:00:00 2001 +From 67ae38570c4e8b3c14d781e09eba210179342f8a Mon Sep 17 00:00:00 2001 @@ -4 +4 @@ -Subject: [PATCH] net/iavf: fix releasing mbufs +Subject: [PATCH] net/avf: fix releasing mbufs @@ -6 +6,3 @@ -In the function _iavf_rx_queue_release_mbufs_vec to release rx mbufs, +[ upstream commit 36b8b062885f2b6576818a1c18ffaacb4dccefa5 ] + +In the function _avf_rx_queue_release_mbufs_vec to release rx mbufs, @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ - drivers/net/iavf/iavf_rxtx.c | 1 + + drivers/net/avf/avf_rxtx.c | 1 + @@ -22,5 +23,5 @@ -diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c -index baac5d65c8..8f43208c80 100644 ---- a/drivers/net/iavf/iavf_rxtx.c -+++ b/drivers/net/iavf/iavf_rxtx.c -@@ -195,4 +195,5 @@ reset_rx_queue(struct iavf_rx_queue *rxq) +diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c +index 8c8771e665..33670fdb1c 100644 +--- a/drivers/net/avf/avf_rxtx.c ++++ b/drivers/net/avf/avf_rxtx.c +@@ -170,4 +170,5 @@ reset_rx_queue(struct avf_rx_queue *rxq)