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 54166A0557 for ; Wed, 16 Nov 2022 11:40:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 508C642D17; Wed, 16 Nov 2022 11:40:43 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 1888140E03 for ; Wed, 16 Nov 2022 11:40:42 +0100 (CET) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (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-1.canonical.com (Postfix) with ESMTPS id EF3EF3F0C0 for ; Wed, 16 Nov 2022 10:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668595241; bh=FsOY7y1Z4QZGbGUWpDctvQVPlahcaNdsDhdFDQSjaOM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=epuntKdAOYQ0J6RJcBCwMD5vFNH+gmquxlwxYKYd3Cwkf/fYXoeR1ZTAkSEsfsSK3 GdMGbiEMibRrENKNsoqpc6EpRJjUtYHjmHEslogdshXXN4orGnzTztszGmdOfQZZMA BpypBYFQXeaWTOGItDBlJBKveWPKFzXCwW4CPsOl6jHstPYxqPPEz3crPQ5abkqG/H WKPBHqiHh+rS9iHZsUQaWEtcdtg81+lBaX/9S6IO80DlFlRWrXYh7WlO1w2ZlRL0vK whIXCSq8h66Xc/1gZIo2exYB6RJdXqIyI6qCW+VBR/I288ni2F4VyUG7mChCbLQnhc Le8vFnj0Fo5RQ== Received: by mail-wm1-f70.google.com with SMTP id l32-20020a05600c1d2000b003cfefa531c9so808281wms.0 for ; Wed, 16 Nov 2022 02:40:41 -0800 (PST) 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=FsOY7y1Z4QZGbGUWpDctvQVPlahcaNdsDhdFDQSjaOM=; b=IrouwNWpvvPv301mNByFiX15ZBU4VJgd2EPjfsxuuHlf0u0iaBTUV0HPsnYbZ10w3/ ExITGdqbqSzrLfWV2g186iCwVBWRg2SdTntyp+XyeKkuGYyAmWT4+q2g+J4ACaDxJDZT KAKLYaGEauETSUw2PAqIxpTJqbbl0XkYWDgCevdFk+MI0xuZuMWmDWZgO6V5mAt/oRed nYvct5qb6BdnHpO897qsrETzEXMu6d8mb1WuwwyozuiiyjtEnYAwMOuHuUubmLKC0SS+ UZFeG2/bvZy1QtyJ38lM2drQzve9PS2Wvak85EH7a4lPVpIYvr585DbP+xj+yuIXlGiH /X/Q== X-Gm-Message-State: ANoB5pkAT+6Gx0GHUg12kTbFtIvjjxhWzZ4VZF6MgObDPsfBGdhf8jT4 ixDYU+P6KcaGOq+L4FX5Apb2InUjlJs5pP2oOP7FAljZqQLWWidhcOtP51cHNDVi7VR4heXSsRM sFHF2Nn4W38NbAXf9hHSjCpl2 X-Received: by 2002:a05:600c:6890:b0:3cf:497c:c4c1 with SMTP id fn16-20020a05600c689000b003cf497cc4c1mr1704400wmb.117.1668595241431; Wed, 16 Nov 2022 02:40:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf4XLk+s5y0LhugdUEc66O2rU/yob3T8Q43KqKz02yo9jXcodTBpCg1JnW7KTzvFK72h0in5LA== X-Received: by 2002:a05:600c:6890:b0:3cf:497c:c4c1 with SMTP id fn16-20020a05600c689000b003cf497cc4c1mr1704388wmb.117.1668595241171; Wed, 16 Nov 2022 02:40:41 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39e5:dd00:975:f38b:96af:696f]) by smtp.gmail.com with ESMTPSA id bt14-20020a056000080e00b002417e7f0685sm14359743wrb.9.2022.11.16.02.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 02:40:40 -0800 (PST) From: christian.ehrhardt@canonical.com To: Mingjin Ye Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix scalar Rx path segment' has been queued to stable release 19.11.14 Date: Wed, 16 Nov 2022 11:40:05 +0100 Message-Id: <20221116104012.2975036-10-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116104012.2975036-1-christian.ehrhardt@canonical.com> References: <20221116104012.2975036-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.14 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/23/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/dcad322034374223a5d514bf4eae2a554e542e90 Thanks. Christian Ehrhardt --- >From dcad322034374223a5d514bf4eae2a554e542e90 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 f97d93a78d..6dcb2f702a 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -1726,6 +1726,10 @@ ice_recv_scattered_pkts(void *rx_queue, } else 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; } first_seg->port = rxq->port_id; -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-16 11:36:50.797570481 +0100 +++ 0010-net-ice-fix-scalar-Rx-path-segment.patch 2022-11-16 11:36:50.420775502 +0100 @@ -1 +1 @@ -From 90ba4442058a14763e57ca96d03ab1e6044e3e5c Mon Sep 17 00:00:00 2001 +From dcad322034374223a5d514bf4eae2a554e542e90 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 f97d93a78d..6dcb2f702a 100644 @@ -26 +27 @@ -@@ -2113,6 +2113,10 @@ ice_recv_scattered_pkts(void *rx_queue, +@@ -1726,6 +1726,10 @@ ice_recv_scattered_pkts(void *rx_queue,