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 AF645A054A for ; Tue, 25 Oct 2022 17:08:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ABC0942C4F; Tue, 25 Oct 2022 17:08:31 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7C28442C1D for ; Tue, 25 Oct 2022 17:08:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710510; 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=d/9/TY8O6gx7Z2YNs53xiDuRSVW03Yd2FxK2ZU3OhxU=; b=YoAtPF0BTLg1xV7FXKwx3S3fzDNQ+Jv+6UOcZugItmxeuuCDbGstpzHvmBZFj3jq9bFs0q MeaykCWlUHUhGooLb5oaZ4nOHg0AVXhQLNf/k8OtItZugr7Po3GP7vsw0bM6gvuLlBXbqq smNbMatKlor7h8yKSOoAFXXgUjOj4js= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-408-lOCXISOUObOJ8c62qK5egQ-1; Tue, 25 Oct 2022 11:08:20 -0400 X-MC-Unique: lOCXISOUObOJ8c62qK5egQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7735238149AE; Tue, 25 Oct 2022 15:08:18 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6ED044A9255; Tue, 25 Oct 2022 15:08:17 +0000 (UTC) From: Kevin Traynor To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: remove freeing buffer in scattered Rx' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:09 +0100 Message-Id: <20221025150734.142189-14-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.3 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/01/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/88eb5f06dd1c4833126fcc91565b2bfb4b5c7d27 Thanks. Kevin --- >From 88eb5f06dd1c4833126fcc91565b2bfb4b5c7d27 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 7a95a1c437..7bac482e92 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -460,12 +460,9 @@ err_set: 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; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:58.890199468 +0100 +++ 0014-net-axgbe-remove-freeing-buffer-in-scattered-Rx.patch 2022-10-25 14:18:58.363797919 +0100 @@ -1 +1 @@ -From e867021dadd7976758b4892cb64b19078a1855e0 Mon Sep 17 00:00:00 2001 +From 88eb5f06dd1c4833126fcc91565b2bfb4b5c7d27 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 7a95a1c437..7bac482e92 100644 @@ -21 +22 @@ -@@ -459,12 +459,9 @@ err_set: +@@ -460,12 +460,9 @@ err_set: