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 CAADDA04F0 for ; Tue, 10 Dec 2019 16:00:41 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A876D1BE9E; Tue, 10 Dec 2019 16:00:41 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 2B98B1B13C for ; Tue, 10 Dec 2019 16:00:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990039; 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=qp0tW0ZHM4S2acSoDad0ds3dbZQoLA4aXvE7qjMJSPk=; b=cjlcORRQkECwUdsTktk1A5t2g36/K0uog1Qc7b09luphyfsPXaXDOwysS2FOfnjZ7/GIS0 +taRfI1Wnh+FAhzSOJ9+kkuwzHpIZD8xb4B2HmFuCiOjcNJwwm/ozrdRk3FXzL0AgfV3W+ JEBux+qJEK59y8Mjm1FHpL3DGPdp1h8= 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-370-ktRGEEyaMVy4UwamFpQ1Jw-1; Tue, 10 Dec 2019 10:00:36 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7D77C800C7F; Tue, 10 Dec 2019 15:00:35 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88A2B5D9C5; Tue, 10 Dec 2019 15:00:34 +0000 (UTC) From: Kevin Traynor To: Lance Richardson Cc: Ajit Khaparde , dpdk stable Date: Tue, 10 Dec 2019 14:58:57 +0000 Message-Id: <20191210145937.32755-23-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: ktRGEEyaMVy4UwamFpQ1Jw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/bnxt: fix mbuf free when clearing Tx queue' has been queued to LTS release 18.11.6 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.6 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/16/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 rebasi= ng (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/34afffbb2f7f29d9c1= e1ac994b10fa6328fdd075 Thanks. Kevin. --- >From 34afffbb2f7f29d9c1e1ac994b10fa6328fdd075 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 d6b93b44a..b76ad05fe 100644 --- a/drivers/net/bnxt/bnxt_txq.c +++ b/drivers/net/bnxt/bnxt_txq.c @@ -36,5 +36,5 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_qu= eue *txq) =09=09for (i =3D 0; i < txq->tx_ring->tx_ring_struct->ring_size; i++) { =09=09=09if (sw_ring[i].mbuf) { -=09=09=09=09rte_pktmbuf_free(sw_ring[i].mbuf); +=09=09=09=09rte_pktmbuf_free_seg(sw_ring[i].mbuf); =09=09=09=09sw_ring[i].mbuf =3D NULL; =09=09=09} --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:40.640999049 +0000 +++ 0023-net-bnxt-fix-mbuf-free-when-clearing-Tx-queue.patch=092019-12-10 1= 4:49:39.025458271 +0000 @@ -1 +1 @@ -From 00932678c6bbbe922a2790e59fd68b34719f3171 Mon Sep 17 00:00:00 2001 +From 34afffbb2f7f29d9c1e1ac994b10fa6328fdd075 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 00932678c6bbbe922a2790e59fd68b34719f3171 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index ebb9199d2..6b866d445 100644 +index d6b93b44a..b76ad05fe 100644 @@ -23 +24 @@ -@@ -35,5 +35,5 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_q= ueue *txq) +@@ -36,5 +36,5 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_q= ueue *txq)