From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id ECED5A034C for ; Fri, 25 Feb 2022 18:17:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E65464114D; Fri, 25 Feb 2022 18:17:59 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id D595F41148 for ; Fri, 25 Feb 2022 18:17:57 +0100 (CET) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id CE82D3FCAB for ; Fri, 25 Feb 2022 17:17:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809476; bh=YMjCA5Cpq2PSP9WoY5v4GpYrf+b4Y/zYejYMjWlgVZo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kwnWFnD8SOJWH5j9b3ODlPpNyB9RghV0Li4uKEXPwQ/9FD96t7Z0eAUP9z0I4DyI4 iIQH1SKs2vflEq/I71pbLRpclKJLXNUuX1x1L9TTzh1BvH5ONVSdKbudpHb5SE3GET Ryot+luzA7n00dg5JOq7241G1+z3evXFnbgdoHewGv0/Af4Ty+5AyUAvTbCV/ALxU/ D0yh3OqaJtOqdJwYLidG7lLOC8Avg3U81O2w/g0FTarOuenIc11Aoj4yVxTZ1+2MMy EhdP045k5u9WZTNu/sja9/DBgLlFsGcY1ZBGVm/ytBuWpMo15Vm9xeWe9fZIPe9Z4G 5tj7G/5VsGEFw== Received: by mail-wm1-f69.google.com with SMTP id 187-20020a1c19c4000000b0037cc0d56524so1845794wmz.2 for ; Fri, 25 Feb 2022 09:17:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YMjCA5Cpq2PSP9WoY5v4GpYrf+b4Y/zYejYMjWlgVZo=; b=oTb9g/iHxlRyT504cImk6CHi53HIeSEQn6pF9JHt8cMJpT7NWeGgPyHLIalBQchrIL ooNA8wiaXgJ6DDSUJ0gA0SGGVadRansReyuDfZVVofUxQUcOI2cMZxS0x/ZqdJ2FAWAt YprI8sbgeoZCWQJMs+rzCqyYF/dDdlT0TcWZr1bGrkIlvXjNKHIzpQH7OYOoPLRJ1wMC T+sCWhEzQJXMoo713kPz6u/UOizwHBL/gYC0Rw43qLCVLaLMX1ufsB5AOKVXm6H8MgdS 48BEyS0g49zqdcyJMkj/4/CRACfa3vrjNh26iR23Sg07c4t/ddopZdJKNOwo9FpC/Lq1 2gXw== X-Gm-Message-State: AOAM532aW148nMf7jeHO8HbijLbEqP9SzvwwAOTUCiwhu1YrMDoYPmCl XVa2wAcePizkEAH596637MtSfGwf227BK+P4U3XNsNW4cAJUq92M5/0KObuABbjESzUOqZe3tEj rbRpX+dwvU5S+1Ch2ezOw9tza X-Received: by 2002:a05:6000:114b:b0:1ed:c1d5:95a8 with SMTP id d11-20020a056000114b00b001edc1d595a8mr6735349wrx.539.1645809475181; Fri, 25 Feb 2022 09:17:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwkY5m6eqcCGBavSBVZEjKxzsP99Gbq8PVECijlpHCF1VX8vRvQsKFo2qaAhh1ys7KbDzHO5Q== X-Received: by 2002:a05:6000:114b:b0:1ed:c1d5:95a8 with SMTP id d11-20020a056000114b00b001edc1d595a8mr6735327wrx.539.1645809474922; Fri, 25 Feb 2022 09:17:54 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id p18-20020adfba92000000b001e4ae791663sm2899611wrg.62.2022.02.25.09.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:17:54 -0800 (PST) From: christian.ehrhardt@canonical.com To: "Min Hu (Connor)" Cc: dpdk stable Subject: patch 'net/bonding: fix reference count on mbufs' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:35 +0100 Message-Id: <20220225171550.3499040-42-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 19.11.12 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/27/22. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/2e48567d11a67b37f231c94c37d28ea22e9c4c18 Thanks. Christian Ehrhardt --- >From 2e48567d11a67b37f231c94c37d28ea22e9c4c18 Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Fri, 28 Jan 2022 10:25:33 +0800 Subject: [PATCH] net/bonding: fix reference count on mbufs [ upstream commit 814e79f3afad8c45c6922617f26292af3221ae2b ] In bonding Tx broadcast mode, Packets should be sent by every slave, but only one mbuf exits. The solution is to increment reference count on mbufs, but it ignores multi segments. This patch fixed it by adding reference for every segment in multi segments Tx scenario. Fixes: 2efb58cbab6e ("bond: new link bonding library") Signed-off-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 95e8cbaa57..5b1507e817 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1322,7 +1322,7 @@ bond_ethdev_tx_burst_broadcast(void *queue, struct rte_mbuf **bufs, /* Increment reference count on mbufs */ for (i = 0; i < nb_pkts; i++) - rte_mbuf_refcnt_update(bufs[i], num_of_slaves - 1); + rte_pktmbuf_refcnt_update(bufs[i], num_of_slaves - 1); /* Transmit burst on each active slave */ for (i = 0; i < num_of_slaves; i++) { -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:45.854933062 +0100 +++ 0042-net-bonding-fix-reference-count-on-mbufs.patch 2022-02-25 16:58:44.268990437 +0100 @@ -1 +1 @@ -From 814e79f3afad8c45c6922617f26292af3221ae2b Mon Sep 17 00:00:00 2001 +From 2e48567d11a67b37f231c94c37d28ea22e9c4c18 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 814e79f3afad8c45c6922617f26292af3221ae2b ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index d2fcfad676..bfa931098e 100644 +index 95e8cbaa57..5b1507e817 100644 @@ -25 +26 @@ -@@ -1318,7 +1318,7 @@ bond_ethdev_tx_burst_broadcast(void *queue, struct rte_mbuf **bufs, +@@ -1322,7 +1322,7 @@ bond_ethdev_tx_burst_broadcast(void *queue, struct rte_mbuf **bufs,