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 68F8F433D8 for ; Mon, 11 Dec 2023 11:18:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6469A42D2A; Mon, 11 Dec 2023 11:18:23 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2082.outbound.protection.outlook.com [40.107.93.82]) by mails.dpdk.org (Postfix) with ESMTP id B366540E0F for ; Mon, 11 Dec 2023 11:18:22 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z9jENqoAK05szQYLO+odRYElmWS2PhGRqgmR00wQhbJrRi24EzZYyGeyf3yjes7HXqgoB3p39igzrEmGfvvyZTvTK9jkhAROW4e/W8OoUMUPF0mBjRwgZ6H3oHczpaRtLLp2gOxGwxV9gfusMiKO/vGo5ixKccIQRVVNMaIDJOllVeDXXjd9M2qR2jomIJojHo2U+Kwwhg9XcY2AwKpmbH2YBu07/RCPbBcJOsbdGIqrrwMQZBD0qFRuqU3Tr8DEQ/vReoFu9ciOiChM5zl04TtYoZGyAJiz2Cl4U3fKjMcBxh41+A5okuHNZ5Fc9ExVVeMKCMsznPyGDARxUtv9rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kIvXK+A6ZACFz9a8cZGgwc93AzGcYrTJnduoVZ905/E=; b=mAT80qEKtU8n+UT/Bw3J8ov+xm/8D/ZThShvf2AoyoogQJy1EAS9mMX7fwBHTWaNuuJPbF7vxzdxZIPe6p6fBxoX/QxDE7cXTloBpd3eCzxUjuIy6r/45ep0DaSvBaI7O/6/HzrLNT96/ltcdUM+QqjEZs+XEjPxBORJc1c8665vrLPzsLTibMe5/AgfMwG/oohsLKYhhty5ypH0bvZvj1Yc3piQU7HxhIYyh1hV9ghAJuSyb4rl6TExdIGBhpn0RX6mWMRLCwRpTqJUlfl17+snkWhHnvIf9xrqmutD/BrB1JHDTb5JODUPlekrEzlAkBwgvVg3qm4EaZgEEvAVsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kIvXK+A6ZACFz9a8cZGgwc93AzGcYrTJnduoVZ905/E=; b=J/Xy1qRPQWxez0w2ytmtssf0/ryT8/04wezkc40kf5awHM7NuzBSevDEXHnbf2JcnZW51CXJ2LYrtrYxW5SmK8NGbmu3wf07q9GCQM6nSfbnT3BkHccGKtRD9gR+cXIHf+MTB6eQubHi4BfzqFMVJ7OkhroSuUt0EJLnMB9UAsCWnKeKpawqdZ1ZxixDo7FNC8gXTv/C2QAuuyJ2Sk3R9OoDXgMP9IZbWQ6wWcxGlW5EC5EBlNWy890chcLVy+zY+4BsVMW/nDYJIUKUQiIcCdBdRtlG8ANkcElJeBfBprHTN8u1gD1drvE+Sp0gVcGteTRlehVpFBcrzYcler3dFg== Received: from CH0PR04CA0087.namprd04.prod.outlook.com (2603:10b6:610:74::32) by DS0PR12MB8561.namprd12.prod.outlook.com (2603:10b6:8:166::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:18:20 +0000 Received: from DS3PEPF000099DD.namprd04.prod.outlook.com (2603:10b6:610:74:cafe::41) by CH0PR04CA0087.outlook.office365.com (2603:10b6:610:74::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:18:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS3PEPF000099DD.mail.protection.outlook.com (10.167.17.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:18:20 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:18:10 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:18:08 -0800 From: Xueming Li To: Qi Zhang CC: Qiming Yang , dpdk stable Subject: patch 'net/ice: fix Tx preparation' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:27 +0800 Message-ID: <20231211101226.2122-63-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099DD:EE_|DS0PR12MB8561:EE_ X-MS-Office365-Filtering-Correlation-Id: 86f84fa4-43c4-42ca-000b-08dbfa328003 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iVeQJccbbA07mEh1PPVogP9+GOf1d75uD/m9dzsqWnf9YGsHWApDAdvcoq2f2McthFcxT6p1LqZWGOgf0uf4VIV+VCoVXzqUHSfxeWBu0azeVfmPqbuafbyO7myY429R5feQ8mpUn8urm2EYP+/VJRBacOf4gup7Vf54gKR2GgFEjIQQF5pbZb1homrc6mfFrcU3r5xF/7txJnaE4CYrZCfsfd0N3P22mYRfJQonfe0r2eP4BgqTghE83Z8kBY1lW5PaUcib6socItnMNe4qX5TXU3PDYuHof33riW6C98WCVSFkfp+YPfuhK1ok2QpMh79vO7L5wxR7f2+7VSfeH7Xq71VyrN2RhRwyLH/aXuuW0P2rzaNeSGKC+iI90od8BhOAURpDQwaSDy09rK91rlrkIH0+1jmbCqKNQnWwvcuI6dnxvMYfJ6fkf0sWpGEX2Z4TJR2OkjD/JiYVV+qgZiGtCvF4YTAQBeyFbqrj6pFAqUd4dyDgKV1WVb1li8dgw8m2fDfDdfutic/pXfUwWZD2aI26kwsSybN3jZ7xAGQ0M6sJKZnYDoPODpUsgc5UyzQlgOHM+idfMAqbiZx3fbLk3Qd+idHQl1HE1gGs/Ia39XQveOWlGOMzEzNahV6Z3LOMiZOKZdip9iZtT7YxkaZN+t5BqrWlr375sMHqPFDC+exksTvTNkFXCnd0a1gusc4T5Fhdv6gH+IvR9W5F5QXE3E7hvK+U6Td++dLPYCf947wGPmZFlFjIXowNiw5ZSNkcr523+crbXp2KNf8FG7cZlknJWv576Drr+TAJAII= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(346002)(39860400002)(376002)(396003)(230922051799003)(64100799003)(451199024)(82310400011)(1800799012)(186009)(36840700001)(40470700004)(46966006)(55016003)(40480700001)(41300700001)(4001150100001)(40460700003)(2906002)(5660300002)(316002)(4326008)(6916009)(8936002)(8676002)(70586007)(54906003)(70206006)(356005)(82740400003)(7636003)(2616005)(86362001)(36756003)(36860700001)(47076005)(966005)(83380400001)(426003)(26005)(478600001)(6666004)(6286002)(336012)(1076003)(16526019)(7696005)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:18:20.4483 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86f84fa4-43c4-42ca-000b-08dbfa328003 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099DD.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8561 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 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=e787872a59750a6577c0dfb89ff424b01b2594c1 Thanks. Xueming Li --- >From e787872a59750a6577c0dfb89ff424b01b2594c1 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Thu, 2 Nov 2023 10:22:07 -0400 Subject: [PATCH] net/ice: fix Tx preparation Cc: Xueming Li [ upstream commit 2f13ba5333b06589ba0e0e307dadcfaa95daf3dc ] 1. Check nb_segs > 8 for NO TSO case 2. Check nb_segs > Tx ring size for TSO case 3. report nb_mtu_seg_max and nb_seg_max in dev_info. Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx") Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/ice_ethdev.c | 2 ++ drivers/net/ice/ice_rxtx.c | 18 ++++++++++++++++-- drivers/net/ice/ice_rxtx.h | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 332af8eeb5..8ce7d0ebaa 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3886,6 +3886,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) .nb_max = ICE_MAX_RING_DESC, .nb_min = ICE_MIN_RING_DESC, .nb_align = ICE_ALIGN_RING_DESC, + .nb_mtu_seg_max = ICE_TX_MTU_SEG_MAX, + .nb_seg_max = ICE_MAX_RING_DESC, }; dev_info->speed_capa = RTE_ETH_LINK_SPEED_10M | diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 31434f0ee5..9a653cbc4a 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3670,7 +3670,7 @@ ice_check_empty_mbuf(struct rte_mbuf *tx_pkt) } uint16_t -ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +ice_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) { int i, ret; @@ -3681,9 +3681,23 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, m = tx_pkts[i]; ol_flags = m->ol_flags; - if (ol_flags & RTE_MBUF_F_TX_TCP_SEG && + if (!(ol_flags & RTE_MBUF_F_TX_TCP_SEG) && + /** + * No TSO case: nb->segs, pkt_len to not exceed + * the limites. + */ + (m->nb_segs > ICE_TX_MTU_SEG_MAX || + m->pkt_len > ICE_FRAME_SIZE_MAX)) { + rte_errno = EINVAL; + return i; + } else if (ol_flags & RTE_MBUF_F_TX_TCP_SEG && + /** TSO case: tso_segsz, nb_segs, pkt_len not exceed + * the limits. + */ (m->tso_segsz < ICE_MIN_TSO_MSS || m->tso_segsz > ICE_MAX_TSO_MSS || + m->nb_segs > + ((struct ice_tx_queue *)tx_queue)->nb_tx_desc || m->pkt_len > ICE_MAX_TSO_FRAME_SIZE)) { /** * MSS outside the range are considered malicious diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h index 268289716e..bd2c4abec9 100644 --- a/drivers/net/ice/ice_rxtx.h +++ b/drivers/net/ice/ice_rxtx.h @@ -56,6 +56,8 @@ extern int ice_timestamp_dynfield_offset; #define ICE_HEADER_SPLIT_ENA BIT(0) +#define ICE_TX_MTU_SEG_MAX 8 + typedef void (*ice_rx_release_mbufs_t)(struct ice_rx_queue *rxq); typedef void (*ice_tx_release_mbufs_t)(struct ice_tx_queue *txq); typedef void (*ice_rxd_to_pkt_fields_t)(struct ice_rx_queue *rxq, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:25.125330900 +0800 +++ 0062-net-ice-fix-Tx-preparation.patch 2023-12-11 17:56:23.067652300 +0800 @@ -1 +1 @@ -From 2f13ba5333b06589ba0e0e307dadcfaa95daf3dc Mon Sep 17 00:00:00 2001 +From e787872a59750a6577c0dfb89ff424b01b2594c1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 2f13ba5333b06589ba0e0e307dadcfaa95daf3dc ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 6ef06b9926..3ccba4db80 100644 +index 332af8eeb5..8ce7d0ebaa 100644 @@ -25 +27 @@ -@@ -3918,6 +3918,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +@@ -3886,6 +3886,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) @@ -35 +37 @@ -index ee9cb7b955..73e47ae92d 100644 +index 31434f0ee5..9a653cbc4a 100644 @@ -38 +40 @@ -@@ -3679,7 +3679,7 @@ ice_check_empty_mbuf(struct rte_mbuf *tx_pkt) +@@ -3670,7 +3670,7 @@ ice_check_empty_mbuf(struct rte_mbuf *tx_pkt) @@ -47 +49 @@ -@@ -3690,9 +3690,23 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -3681,9 +3681,23 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,