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 0395BA04F6 for ; Thu, 19 Dec 2019 15:38:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E57A21BFC3; Thu, 19 Dec 2019 15:38:10 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 6EFCF1BF7B for ; Thu, 19 Dec 2019 15:38:10 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id f129so5861044wmf.2 for ; Thu, 19 Dec 2019 06:38:10 -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=bpLhHliAGxPTN/7lVfZazLxqaLUI6lKnZB+vTgfTZUo=; b=YjNt5+z35Rtza0DzcTxx+pjbE7GoAW08Boptp50iFDx70ymb6vsIFcN53sGSj5HWWX lkLljlhCA7fhXv+ZvOxeA+lZozsBtyB9vtUvRt8gO0ywwM104jbUQpokGKWW4GPcB/8A 3TXO84dClb9HaZW3qlgMVKam0pJtfoOmEoegKjSwdgKK3gEBUV5XEQRsbC+rCMighrHk JmIo0Fatv9HBSjKZ8MmnUNO7imutCzPPT3czsbBrRXQoneF9eI1WbhJoeNt7o85DAxeM mqoJofawsdb+jULaWAzCTvRQZNxmx86vmcPoXOoyv63EqSretxEDSN1HAAl6x7W1kpQl mybA== 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=bpLhHliAGxPTN/7lVfZazLxqaLUI6lKnZB+vTgfTZUo=; b=KS7BGeXnOyWqWw/g5gNP/EImvsz6t16TtJITqdSlLOMYZ5hvHH/gV0R2iwoIkVrLKR WOFGJXLqvztBpsfsnkBz2zE/riof+Mk89KiqJ4PJairIhwpSLspDG8b8VlRFPkfETHuW 88CxhN/T+W92AQLpG1vw9jOfLZqs7DqBU89BxckdGfY3pohG9WXIhnK9j5TvN71uQVZf FrKQn/7tqbaiWUre4dm8opCORq+UNmPZo2qVYMtmH26YnqG3BVOvYkmKqVj6Zwrsuhb7 1ct1APpZRmeSBcQbRnLWFXHLBeTj0dwoIpnIydJoEirLy7w8b90NoYZU1kk0fd4BcV2n sOtQ== X-Gm-Message-State: APjAAAU+g+RWi2kU/uuXedlGfteLEmAYayJyOVl/kgcafxoFn69Xe3MA VJOhtSC8F2nuIh9ScJoiuw4GfasWDeY= X-Google-Smtp-Source: APXvYqz2sfuAML8iFlhFyjMntEJoHTAHbvdnQoBJShsjRUYhc7i0S1P+72+e95k295jnCi/nktoM+w== X-Received: by 2002:a7b:cf01:: with SMTP id l1mr9991832wmg.86.1576766290197; Thu, 19 Dec 2019 06:38:10 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j12sm6638302wrt.55.2019.12.19.06.38.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:38:09 -0800 (PST) From: luca.boccassi@gmail.com To: Lance Richardson Cc: Ajit Khaparde , dpdk stable Date: Thu, 19 Dec 2019 14:33:49 +0000 Message-Id: <20191219143447.21506-82-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/bnxt: fix mbuf free when clearing Tx queue' 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 1cf806df108542fa2e002200f4a05718c70e26a6 Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Wed, 23 Oct 2019 10:27:35 -0400 Subject: [PATCH] net/bnxt: fix mbuf free when clearing Tx queue [ upstream commit 00932678c6bbbe922a2790e59fd68b34719f3171 ] When freeing pending transmit mbufs, use rte_pktmbuf_free_seg() instead of rte_pktmbuf_free(), otherwise linked mbufs may be freed more than once. Fixes: 6eb3cc2294fd ("net/bnxt: add initial Tx code") Reviewed-by: Ajit Khaparde Signed-off-by: Lance Richardson --- drivers/net/bnxt/bnxt_txq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c index 4ecb037674..f0098c3b4a 100644 --- a/drivers/net/bnxt/bnxt_txq.c +++ b/drivers/net/bnxt/bnxt_txq.c @@ -61,7 +61,7 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_queue *txq) if (sw_ring) { for (i = 0; i < txq->tx_ring->tx_ring_struct->ring_size; i++) { if (sw_ring[i].mbuf) { - rte_pktmbuf_free(sw_ring[i].mbuf); + rte_pktmbuf_free_seg(sw_ring[i].mbuf); sw_ring[i].mbuf = NULL; } } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:29.633200847 +0000 +++ 0082-net-bnxt-fix-mbuf-free-when-clearing-Tx-queue.patch 2019-12-19 14:32:26.197299650 +0000 @@ -1,14 +1,15 @@ -From 00932678c6bbbe922a2790e59fd68b34719f3171 Mon Sep 17 00:00:00 2001 +From 1cf806df108542fa2e002200f4a05718c70e26a6 Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Wed, 23 Oct 2019 10:27:35 -0400 Subject: [PATCH] net/bnxt: fix mbuf free when clearing Tx queue +[ upstream commit 00932678c6bbbe922a2790e59fd68b34719f3171 ] + When freeing pending transmit mbufs, use rte_pktmbuf_free_seg() instead of rte_pktmbuf_free(), otherwise linked mbufs may be freed more than once. Fixes: 6eb3cc2294fd ("net/bnxt: add initial Tx code") -Cc: stable@dpdk.org Reviewed-by: Ajit Khaparde Signed-off-by: Lance Richardson @@ -17,10 +18,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c -index ebb9199d2d..6b866d4454 100644 +index 4ecb037674..f0098c3b4a 100644 --- a/drivers/net/bnxt/bnxt_txq.c +++ b/drivers/net/bnxt/bnxt_txq.c -@@ -34,7 +34,7 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_queue *txq) +@@ -61,7 +61,7 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_queue *txq) if (sw_ring) { for (i = 0; i < txq->tx_ring->tx_ring_struct->ring_size; i++) { if (sw_ring[i].mbuf) {