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 8933CA04F0 for ; Thu, 19 Dec 2019 15:40:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 801CB1BFD5; Thu, 19 Dec 2019 15:40:40 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id B2D121BFD5 for ; Thu, 19 Dec 2019 15:40:39 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id y11so6225582wrt.6 for ; Thu, 19 Dec 2019 06:40:39 -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=I0x7hCt6VRqWmemcQGb1JzllKYIDnwCIKbWaQqt84Os=; b=oeMGXIgbjjIP3TWb+1tJ7YJzOXNT/ZNcdAa/LfjFxmRFKAx1IEFl2EptAqwZrXcf7I AubA1S/iq/Hsv0rmeUKVr04RLcd7Cf22jUctkIHoFPoH8+jQc9ylzUcXi1agwlFFgCH3 gPRSqSVzjwsPLbaZGe2s3N5dG8Q2v/cfe9vFv8cl1DfzMhrtzJgHPIiPn/yZ4g1rEjPn pKFuSWvofKxWN+6XgJDk9kB3zsehnXYFEwSWzdsBmwxTyxCBu5Y/2j+scqCA2MWZwNQN 8Xk9NSJNVwd+F545uc/nL7s1LjzwsNDNywiLraBFb6hDS67d/uWclQWS46nk5LsZEPQs cg7A== 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=I0x7hCt6VRqWmemcQGb1JzllKYIDnwCIKbWaQqt84Os=; b=Ol7So7MQgMvQDs8gMufTm+M+gCz2xULmc2f2hotfxqsceHGLvLUfc17UL8QXjkSU0W WSx+ydQ+8PEc640JDCrSVH8WPbj0TS8A68AF7hvGzCZnAq589//XjM8u5KbTFGnN0aJc Z7QJfuSuu69XZ9aH+hSP0EMuTK1DqfcE4KZ+gV7qhnbmx/wkq25DDh4Rov9/J2gXRxOY E5U3yiuuF8iQjsS/4PPjz9TvTT0ctaR71pA1CPTS5BoNV9a/6HVlCvtQz0EQN0dBSMUB TwaE5vPqnpUys1iE38ZLNym8FRkX/8BVteJ9l0a4W9n7eG5hNwM2bJn9qfq6jOsP28Ej CGDg== X-Gm-Message-State: APjAAAUqYQNFjb0WVUSAPbeRqFaJD/XTIpexGZ/7NAiyAZ3hZM6KaD1q 6q/OU3hVLJieveciKzGUDtI= X-Google-Smtp-Source: APXvYqxS18uckQqSR9alhLJdXYZuPjRrfPA5lklECxwHqenDS7VIWmMaGh9hFe9MRqNwF2ISNxZbiA== X-Received: by 2002:adf:ea51:: with SMTP id j17mr9884703wrn.83.1576766439246; Thu, 19 Dec 2019 06:40:39 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m126sm6406758wmf.7.2019.12.19.06.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:40:38 -0800 (PST) From: luca.boccassi@gmail.com To: Xiao Wang Cc: Anna Lukin , Xiaolong Ye , dpdk stable Date: Thu, 19 Dec 2019 14:34:14 +0000 Message-Id: <20191219143447.21506-107-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/fm10k: fix mbuf free in vector Rx' 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 6963f948b9281856e1b5f07377307090aa48d392 Mon Sep 17 00:00:00 2001 From: Xiao Wang Date: Fri, 25 Oct 2019 20:33:22 -0400 Subject: [PATCH] net/fm10k: fix mbuf free in vector Rx [ upstream commit 84fff3425b896a465a29b92a81aab563c07847cd ] 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") Signed-off-by: Xiao Wang Signed-off-by: Anna Lukin Reviewed-by: Xiaolong Ye --- 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 1a66dc3dbf..9e86c28b07 100644 --- a/drivers/net/fm10k/fm10k_rxtx_vec.c +++ b/drivers/net/fm10k/fm10k_rxtx_vec.c @@ -388,8 +388,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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:30.573730158 +0000 +++ 0107-net-fm10k-fix-mbuf-free-in-vector-Rx.patch 2019-12-19 14:32:26.245300601 +0000 @@ -1,13 +1,14 @@ -From 84fff3425b896a465a29b92a81aab563c07847cd Mon Sep 17 00:00:00 2001 +From 6963f948b9281856e1b5f07377307090aa48d392 Mon Sep 17 00:00:00 2001 From: Xiao Wang Date: Fri, 25 Oct 2019 20:33:22 -0400 Subject: [PATCH] net/fm10k: fix mbuf free in vector Rx +[ upstream commit 84fff3425b896a465a29b92a81aab563c07847cd ] + 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 @@ -17,10 +18,10 @@ 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 45542bef30..d76dfd16fd 100644 +index 1a66dc3dbf..9e86c28b07 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) +@@ -388,8 +388,15 @@ fm10k_rx_queue_release_mbufs_vec(struct fm10k_rx_queue *rxq) return; /* free all mbufs that are valid in the ring */