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 BB42FA00C2 for ; Thu, 3 Nov 2022 10:31:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B770A40694; Thu, 3 Nov 2022 10:31:03 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id A875A4114E for ; Thu, 3 Nov 2022 10:31:02 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id o4so1721552wrq.6 for ; Thu, 03 Nov 2022 02:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8Wfsy9hHVbPGvCn+b59m7DF2ZArp6/WP37ROR0dihYM=; b=Slko9BZnZFMheN3vwTUcdCLGA3MKnSmCG+lADvFYJxi6mrbbXvMcOB5Se4m4et0NcP ur9B1w7ZlK0FjJwUODlXx0BX/qPkup5b5wJyG5LtT4LvlgUvv9q3KCC6MczhtSeIrGJo mKe/1gbeYEOX7iSxCd+jjqJWisAjymc6+G8Vri9gUjPICOaL68OMebylK0WiiqdEXs84 cr+PDsjrd8CrvqgrUlObtQ9i2sEUEvGsZM6HFy9FvnhKfgdynRRPOnMM8mbyzw1nYHyp X3e/lF87nkJT3BKKlQjpTb6UsYTTx5CzDUlc1nUik1KvzqWe8C1f88t3WjaNCemBgTPi XR+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8Wfsy9hHVbPGvCn+b59m7DF2ZArp6/WP37ROR0dihYM=; b=aCTToZkK/aP/zGyemMVDc+DCiza2MoOZWUF2H9WZ5vepZ4gH2gxHhTv4zFalRgS4qH 8cZEQLzbxYB4UMlTEOf4IytSfc11LnBQXb2gPDltbvxeeLFFuY/x4Ccjua/cIasIH3Ws 9GDl988d4SOAHO3cvbbz+fG98afrma97VjgKe+CowTga6sHV1zf6O9AhuhijoGiEMq7X 5Xb8q+4juBO/MeH9Dl32cjCeosqZ3VWeMcQawKoeaPeWLcSCAjC9fa7fIyPaeBUZZUE2 RraD8NXR+Iv5dZEhhp8A+TJk7W240zKVJix2LqsSyxLyRbgUpiZVw5000a+WDihzpeu8 2+3g== X-Gm-Message-State: ACrzQf0GcbMK0RQqRBciYzyhevfaGtri1qQrTwsqKTn6mv9asVV1S0BH /zL6h6vtpYIzWbMNZX20KJucVfddSG/O3Wnn X-Google-Smtp-Source: AMsMyM5IlgApGjgsgE0ueOJ5xpdWPgPjmvCluwm0KF8FIqQUu69c3NYv/n26myQ7CTATw/h7zzIFBQ== X-Received: by 2002:a05:6000:156e:b0:236:ed91:5354 with SMTP id 14-20020a056000156e00b00236ed915354mr5288158wrz.203.1667467862420; Thu, 03 Nov 2022 02:31:02 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id fc19-20020a05600c525300b003cf57329221sm6273611wmb.14.2022.11.03.02.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:31:02 -0700 (PDT) From: luca.boccassi@gmail.com To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: clear buffer on scattered Rx chaining failure' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:27:11 +0000 Message-Id: <20221103092758.1099402-53-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-1-luca.boccassi@gmail.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 20.11.7 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/05/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2f92b609867414b2821caf311d4994f5bbf1de49 Thanks. Luca Boccassi --- >From 2f92b609867414b2821caf311d4994f5bbf1de49 Mon Sep 17 00:00:00 2001 From: Bhagyada Modali Date: Wed, 7 Sep 2022 23:31:08 -0400 Subject: [PATCH] net/axgbe: clear buffer on scattered Rx chaining failure [ upstream commit 30ff4d00d92dd4126efc8236299126e199e92461 ] Clearing mbuf, first_seg when chaining mbufs fail. Increment the error count for the same. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali Acked-by: Chandubabu Namburu --- drivers/net/axgbe/axgbe_rxtx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 3875348f97..35925d3a7f 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -398,8 +398,10 @@ next_desc: if (first_seg != NULL) { if (rte_pktmbuf_chain(first_seg, mbuf) != 0) { - rte_mempool_put(rxq->mb_pool, - first_seg); + rte_pktmbuf_free(first_seg); + first_seg = NULL; + rte_pktmbuf_free(mbuf); + rxq->errors++; eop = 0; break; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:28.632232059 +0000 +++ 0053-net-axgbe-clear-buffer-on-scattered-Rx-chaining-fail.patch 2022-11-03 09:27:25.457424066 +0000 @@ -1 +1 @@ -From 30ff4d00d92dd4126efc8236299126e199e92461 Mon Sep 17 00:00:00 2001 +From 2f92b609867414b2821caf311d4994f5bbf1de49 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 30ff4d00d92dd4126efc8236299126e199e92461 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 4c16c59f37..f2136e30b0 100644 +index 3875348f97..35925d3a7f 100644 @@ -22 +23 @@ -@@ -418,8 +418,10 @@ next_desc: +@@ -398,8 +398,10 @@ next_desc: