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 3C2A5A00C2 for ; Wed, 23 Nov 2022 19:04:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 376CD42DA3; Wed, 23 Nov 2022 19:04:57 +0100 (CET) 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 59B0D40E5A for ; Wed, 23 Nov 2022 19:04:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226693; 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=xEa9QHSQkUD2lfJu3WwFq/WBA8MPXvzoPKXsM1Lub4I=; b=UAErYtTKxq7qf30dtbNM4ntdzEoEvKPn/hfR+t5YCWPm6BfDxlKvVMOj1R3Duq8L97guXx YkHGSntK/dRmcF5BUiIPRppOXgfV35BjklrDF0MvUa3Sf8YW/5ccpO0D+ZoBAxnQgN0UJp eqkXFfRWLQJ/AdsQkxINJGE2IoTTT/4= 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-202-H6-Br9v_Ou2akyXcz-uEmQ-1; Wed, 23 Nov 2022 13:04:52 -0500 X-MC-Unique: H6-Br9v_Ou2akyXcz-uEmQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1FBC83810D2C; Wed, 23 Nov 2022 18:04:52 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E0A7492B07; Wed, 23 Nov 2022 18:04:51 +0000 (UTC) From: Kevin Traynor To: Mingjin Ye Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix scalar Rx path segment' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:03:36 +0000 Message-Id: <20221123180413.733554-23-ktraynor@redhat.com> In-Reply-To: <20221123180413.733554-1-ktraynor@redhat.com> References: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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/28/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/da678c35428a9e7fddc1495149ca8ad08cff35d7 Thanks. Kevin --- >From da678c35428a9e7fddc1495149ca8ad08cff35d7 Mon Sep 17 00:00:00 2001 From: Mingjin Ye Date: Fri, 11 Nov 2022 12:04:00 +0000 Subject: [PATCH] net/ice: fix scalar Rx path segment [ upstream commit 90ba4442058a14763e57ca96d03ab1e6044e3e5c ] CRC is stripped by the hardware in the scattered Rx path. The last buffer is invalid if it's packet length is zero. This patch adds a judgment for the last buffer length to fix this issue, it would free the mbuf associated to the last one if the last buffer is empty. Fixes: 6eac0b7fde95 ("net/ice: support advance Rx/Tx") Signed-off-by: Mingjin Ye Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 7675f8c405..b91e6eaad5 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -1967,4 +1967,8 @@ ice_recv_scattered_pkts(void *rx_queue, rxm->data_len = (uint16_t)(rx_packet_len - RTE_ETHER_CRC_LEN); + } else if (rx_packet_len == 0) { + rte_pktmbuf_free_seg(rxm); + first_seg->nb_segs--; + last_seg->next = NULL; } -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:57.648622457 +0000 +++ 0023-net-ice-fix-scalar-Rx-path-segment.patch 2022-11-23 09:55:57.061149287 +0000 @@ -1 +1 @@ -From 90ba4442058a14763e57ca96d03ab1e6044e3e5c Mon Sep 17 00:00:00 2001 +From da678c35428a9e7fddc1495149ca8ad08cff35d7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 90ba4442058a14763e57ca96d03ab1e6044e3e5c ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index cd046a3432..3224a02db2 100644 +index 7675f8c405..b91e6eaad5 100644 @@ -26 +27 @@ -@@ -2114,4 +2114,8 @@ ice_recv_scattered_pkts(void *rx_queue, +@@ -1967,4 +1967,8 @@ ice_recv_scattered_pkts(void *rx_queue,