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 83343A00C2 for ; Thu, 3 Nov 2022 10:28:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F02540694; Thu, 3 Nov 2022 10:28:42 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id E73EA40693 for ; Thu, 3 Nov 2022 10:28:40 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id j15so1732827wrq.3 for ; Thu, 03 Nov 2022 02:28:40 -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=dAXAqbt3xsRsnF0l37/OiNWwx4ZKgKFEy03N8oaiOo4=; b=oIyszQOhj9Md1zJVg1kE7enOVEFrycGagsQ/+trL2GDISv3wB02YSLuUKpZ5pEPda9 VNn67ye//ZMzHsnKlb5yVCAkWXiVBpMlJSF+mcTFyYvvsataP3uv4hTozAIWdYeOAM/l RVqN+w/U/Jp6ilOU3UyvQsD3PAXuQGwlAEShNXleQNPlTR6axddrl/Va2Lt5efwwKL33 YjULzk9uemfo1N6kRG5QDtg3fEI0brRA9A6Id/G1yPYh7mIsLaID8JlK5JdAR5ej4AIV 5jdQ/R/7b84NwgrBiQ9WMAulchRnna3pTe30Rpgf4LmBaNtsOyKMiZ3TnIWpolBO/fhQ 575g== 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=dAXAqbt3xsRsnF0l37/OiNWwx4ZKgKFEy03N8oaiOo4=; b=K5fpbP0DSGM5bFA6OJq5dN6EYi5fsWtZeik2AskWhgTZIdbgwqSZZGG7DzGLT3kYfd zbpl/HslO+uzzSuvhJXCSTKt5kW/GTjNBodqESEEIvDbKxcR8sBnjY0pdi+Lx6IAr9zV tHjelVGMN4pZfRQ8cRb0OI4Td3GBpTznaoQfIzjTDIhTDFaeJsyfPphJ3K6Mfohp9HVa sJnxPmb/U6nOdnBPnn9tNw/B0CHaS5fzQlpTJY5BrBOJ2dIQSWrAz8b/56nhNKNiDl3N SfrAAiYVkkh+sdzqq++WlYxgi3DMgUFYjs2pifr0KD4eeeicAkj8Nn94fWG6UUaivAhF 6ucg== X-Gm-Message-State: ACrzQf0x6x6oWf3dcz5vyK63DmZiXmlmO8+ejpBnCTPqWx0leNWRBOwz ixk5wtLAZZTTEld0vx1TlQNPAWLbTWygWQ== X-Google-Smtp-Source: AMsMyM6jYn8CYkKDjO5VOQ8VaeG7untFTpXAnzrHqkEKi4SPP2lL21UYNNsZtrSN7BN/U/xrJTq33A== X-Received: by 2002:a5d:4d12:0:b0:236:751a:9c90 with SMTP id z18-20020a5d4d12000000b00236751a9c90mr17885302wrt.609.1667467720681; Thu, 03 Nov 2022 02:28:40 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id e7-20020a05600c448700b003c64c186206sm632598wmo.16.2022.11.03.02.28.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:28:40 -0700 (PDT) From: luca.boccassi@gmail.com To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: remove freeing buffer in scattered Rx' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:26:29 +0000 Message-Id: <20221103092758.1099402-11-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/0e99be3de1489b6b2f01ae0ff4c4e43864d51e54 Thanks. Luca Boccassi --- >From 0e99be3de1489b6b2f01ae0ff4c4e43864d51e54 Mon Sep 17 00:00:00 2001 From: Bhagyada Modali Date: Thu, 8 Sep 2022 08:42:15 -0400 Subject: [PATCH] net/axgbe: remove freeing buffer in scattered Rx [ upstream commit e867021dadd7976758b4892cb64b19078a1855e0 ] Removed freeing of mbuf in scattered Rx as it should not be freed in rx. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali Acked-by: Chandubabu Namburu --- drivers/net/axgbe/axgbe_rxtx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 8449eb9b63..55aed1e73b 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -416,14 +416,11 @@ err_set: memset((void *)(&desc->read.desc2), 0, 8); AXGMAC_SET_BITS_LE(desc->read.desc3, RX_NORMAL_DESC3, OWN, 1); - if (!eop) { - rte_pktmbuf_free(mbuf); + if (!eop) goto next_desc; - } first_seg->pkt_len = pkt_len; rxq->bytes += pkt_len; - mbuf->next = NULL; first_seg->port = rxq->port_id; if (rxq->pdata->rx_csum_enable) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:26.171519806 +0000 +++ 0011-net-axgbe-remove-freeing-buffer-in-scattered-Rx.patch 2022-11-03 09:27:25.309421202 +0000 @@ -1 +1 @@ -From e867021dadd7976758b4892cb64b19078a1855e0 Mon Sep 17 00:00:00 2001 +From 0e99be3de1489b6b2f01ae0ff4c4e43864d51e54 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e867021dadd7976758b4892cb64b19078a1855e0 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 8b43e8160b..d4224992ee 100644 +index 8449eb9b63..55aed1e73b 100644 @@ -21 +22 @@ -@@ -458,14 +458,11 @@ err_set: +@@ -416,14 +416,11 @@ err_set: