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 1BA3C431A0 for ; Thu, 19 Oct 2023 02:01:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 154EC40A7A; Thu, 19 Oct 2023 02:01:30 +0200 (CEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id 2B5ED4029E for ; Thu, 19 Oct 2023 02:01:28 +0200 (CEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-32003aae100so119269f8f.0 for ; Wed, 18 Oct 2023 17:01:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697673688; x=1698278488; darn=dpdk.org; 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=WHBaBrsQjB6q58YPka9xGNTwdFdOYEDx76QQdQC5ppc=; b=dyn37szeL8UDMU1SjLhYpBaIQB3BgUYt7mPz3O7A9rP/qnynun291yQRq+UttJiiA7 lF9CXjFviuZnWuz7EiL4tYwMJpITcA8s5+rBkdVzEoQs1SezEUSpf5QbvK2vsFycpCp1 DPZs+8W2vmm8fyRWPz1Gc++BymL/ouFqNEt3P7HD+FyPqL+RIFLEV8RgO69Ka3f6HknQ +L72GX4z8hMAEDTtddqn4t8zPJh44/C3jc4Vlt1sJZWAAxxnvcS/i1A3Cp+BD2Ah+/d/ DM1Y09zVBFMm1nWnQSyTdTnQ01fOMaDnZRov3x3jw/Oh2MUQqNFLJa016zpOWx1HhR0e rlKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697673688; x=1698278488; 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=WHBaBrsQjB6q58YPka9xGNTwdFdOYEDx76QQdQC5ppc=; b=T6sFX++TsiqDtVTcwr2GUE03gr2gVldMJaa1P6Rlf/RkTlbLrTZ8pOh7LazAa99Ycm Fuzm5b0Y2Ru+vavCoD8osvloDgxopoT6IshmWK2hEVaC4xsKLEtsL6CqV7/iFtggDjoL 1CChGksGULbhxs2HsstyxDRaDGS0iG3w8adQ37NF50g1QclXrIElyZs4JBgr51RpEJrK 0E1bpADODBeDFKoiT61XXmXVg1uZR4cguuJiAj91c6sbk61JeTUwkklq8xqJALcjlhom bbKm+G32pLCuFKvH6eLREAoFMWZLAiT3uOhO/9IwHjeANSupzvsVHfhM34eEsl6wBlrm zeWg== X-Gm-Message-State: AOJu0Yzy2VqKw6jdJRiV77jkn96udWObuTc5uELFgfQ4K2GrCzqli80K AVEmKj7qUJgAAwaXJOOXpnA= X-Google-Smtp-Source: AGHT+IFWf3KsFzWlgp4C5Q4sgW44hWanjKrzWhFSG5JO4rCWNdI++6FiqOBzEa1RSAXogo9RxVPIKQ== X-Received: by 2002:adf:a457:0:b0:32d:c573:16a5 with SMTP id e23-20020adfa457000000b0032dc57316a5mr349674wra.1.1697673687802; Wed, 18 Oct 2023 17:01:27 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id q14-20020a05600c46ce00b0040836519dd9sm2953245wmo.25.2023.10.18.17.01.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 17:01:27 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix TSO with big segments' has been queued to stable release 20.11.10 Date: Thu, 19 Oct 2023 00:59:25 +0100 Message-Id: <20231018235930.3144-36-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018235930.3144-1-luca.boccassi@gmail.com> References: <20231018235930.3144-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.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/21/23. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/cf1f681c64fffaf63d6c5085c7c1840e4b2c5346 Thanks. Luca Boccassi --- >From cf1f681c64fffaf63d6c5085c7c1840e4b2c5346 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 27 Sep 2023 11:41:48 +0200 Subject: [PATCH] net/ice: fix TSO with big segments [ upstream commit d7b35f53cadd6f228b3787f8dceca5481c034740 ] Packets to be segmented with TSO are usually larger than MTU. Plus, a single segment for the whole packet may be used: in OVS case, an external rte_malloc'd buffer is used for packets received from vhost-user ports. Before this fix, TSO packets were dropped by net/ice with the following message: 2023-09-18T13:34:31.064Z|00020|dpdk(pmd-c31/id:22)|ERR|ice_prep_pkts(): INVALID mbuf: bad data_len=[2962] Remove the check on data_len. Fixes: ccf33dccf7aa ("net/ice: check illegal packet sizes") Signed-off-by: David Marchand Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 11b0dee9f5..603136fa91 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3233,9 +3233,6 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, int i, ret; uint64_t ol_flags; struct rte_mbuf *m; - struct ice_tx_queue *txq = tx_queue; - struct rte_eth_dev *dev = &rte_eth_devices[txq->port_id]; - uint16_t max_frame_size = dev->data->mtu + ICE_ETH_OVERHEAD; for (i = 0; i < nb_pkts; i++) { m = tx_pkts[i]; @@ -3252,9 +3249,7 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } - /* check the data_len in mbuf */ - if (m->data_len < ICE_TX_MIN_PKT_LEN || - m->data_len > max_frame_size) { + if (m->pkt_len < ICE_TX_MIN_PKT_LEN) { rte_errno = EINVAL; return i; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-19 00:28:58.057138618 +0100 +++ 0036-net-ice-fix-TSO-with-big-segments.patch 2023-10-19 00:28:56.305806847 +0100 @@ -1 +1 @@ -From d7b35f53cadd6f228b3787f8dceca5481c034740 Mon Sep 17 00:00:00 2001 +From cf1f681c64fffaf63d6c5085c7c1840e4b2c5346 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d7b35f53cadd6f228b3787f8dceca5481c034740 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index d5513e9e93..ee9cb7b955 100644 +index 11b0dee9f5..603136fa91 100644 @@ -31 +32 @@ -@@ -3685,9 +3685,6 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -3233,9 +3233,6 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -41 +42 @@ -@@ -3704,9 +3701,7 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -3252,9 +3249,7 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,