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 3ED49433D8 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 1EC9C40ED2; Mon, 11 Dec 2023 11:18:23 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id 033B040E0F for ; Mon, 11 Dec 2023 11:18:21 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=biNtLnJjEntHDlMYmiVlg9XQdiy8a25dwvOYXdlG15S7Nw/OqcJQMSkezOnkfROmxKl51DM3N2Vp+mblRNJnjtzpKFw7OYVVqrU2Rdry+QBCg2lSXABVwFcDfWI85yHtNaIn0TWapijIDErz+yIMjlh8wrT+ij12rCJFKqJhOaK2hNNcxy0YyTtlRTnBLUzjHVOSbfLfK1PREljbfS7fR1SEZ0P9Ii1J28l5c7BIleKo61MTWDZXE6ESKlyMcqSCOe4EsT+9b1gEOnVpTC3FxPoaUF0TOW1WqWY4BuuHBW16Y+wHweyBISsNurRXal+L8jHr023iCmEEbPrKIg5Img== 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=mDs2yTDrx16C2N6Zc3QZFZS+pZIaNhWczJ8KjW1q6A8=; b=oGg3fd8C7+DS4FpQE2RkuZuyibr3c0/GzHG9Ouu1ckLN4gUyjOKzdSa4XIbBB3JwmK3mJ9xTJAGMRt8Rjci5ja6rS5F4/32+3RussLDTKF2rmK/KwGr6JaMLNTnjkSim52URhphod8jXGQiEg+WLcBMTzvd0361chmGSt9X/1RbaNyXSHiuhUy4pa25n/QZNq3tkYdGJHi9IwH5rBYb3JXmW5UglqG0wCjpCEIJNQkV11XyFbGmOheIxYTXOvC6pur37ta7ShfNq1QtKFACk6KVALy29b99bWwCAmIOQegaNIaILIUWOoRNQKKj2jsrQ07dhWgZBs+mMRBwTp+JHEg== 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=mDs2yTDrx16C2N6Zc3QZFZS+pZIaNhWczJ8KjW1q6A8=; b=KBIpCo/kIRxKuExngkQ33evSuoTA0P6k8K8yz71Of6/QTvFQOdgRxl9H1+/8vXuY+uf2oevaKore1nWICJMqxw4PioRjU24NxdLmpc2gcHo44HSkliPXQa19kj8fQnslFUP5gbP9ZbaZo6FNAtKFaPuam3HWW1CUSCEtX7x41WfPV0wrHQCZIG6AYcHtFLOJgFSkp6f4KZCqDpcN85+s3xgfa/L7FZCEUiw+KIpFCBWMiNJeLRhRtE6JlIKmXJJdtVeEHzBIDhN7v60T4bGFl/pkfIVRAlBWGg0jAzVDq3WXRHs+MTCmHiLLTb4U4HHh7q1hb+FyuvpZaSOW1LjLoA== Received: from CH2PR14CA0007.namprd14.prod.outlook.com (2603:10b6:610:60::17) by IA0PR12MB9047.namprd12.prod.outlook.com (2603:10b6:208:402::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 10:18:17 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:610:60:cafe::d) by CH2PR14CA0007.outlook.office365.com (2603:10b6:610:60::17) 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:17 +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 DS3PEPF000099E2.mail.protection.outlook.com (10.167.17.201) 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:16 +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:08 -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:06 -0800 From: Xueming Li To: Qi Zhang CC: Qiming Yang , dpdk stable Subject: patch 'net/iavf: fix Tx preparation' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:26 +0800 Message-ID: <20231211101226.2122-62-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: DS3PEPF000099E2:EE_|IA0PR12MB9047:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c41c1d2-2cfa-4a44-04b2-08dbfa327df1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DhZIZTuYsWEoDr/p+jDaHMX8jYp1q91BeOA/MGtxvhjitjWCcKkCdCms9uEkO24R55X6sBt3q+vkLqK77ckeJNE49sUkkIX6NrCzD0kVxAb2wzbnemykTx6zfOP02VFoVgvB18oP8JtPdiDzQSNp8E2sV03UcmJtJbVTystfnaM9zcqVvPPooO+ShBABbiF5S7CpSZ0GUPiiuIkLUTubKZmm3f4vgAQQyZ8ZWDQ4Gv9nSX5hDDXqH9OBt+OXip5zdg4fQMq6OWPy/NGL4cNuKawtf5hzzAHzDSYXwX324qSIJNV+mARGRsHS7Ee4zEFi3wzgDTlnS1lAenVRW/RhNwp0rRjLcenI4EsuSfjyM8I/Rgwi7TQMnM0GSdZBlWGTZX2vskH2h1ObkCpBvF2WguErqDPpJCjQ/cNLtoU3fzWZJ2fN/PWQ3lGJxGHy1BgGOat0eBcguZejw44vcF5L6P5Ie7dTaLlzygk7P09RWaaAVxQwR2QWhiHb1tOOvo+DoclcVeh3Dk4UytRcb/GEhx198gYcSRv3bXWg2OpcidKel61I4GnxBkhFEUwZguPZU9eZ7ewh6FiQO0wpBmRBU5p6FhbpqOpMb8IA610He8qguR0O49pvqRM0qBgVB+iu8nWXvsLBz9ots0TAcVV8vzHSl6Qvj1jAF8qX3BOax/AxGUkskGr9K6UJrqn4S/a+ug6ncbKEKDjFda/mC6sp+KV4lbYCiS9GvAIFOhGRXSogvI8hIvp66dcOae8Aj1V+pPDjG/UKN0uYUYjt7RJgBv2W7Xp9qs5zrlWMMUKxv0w= 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)(39860400002)(136003)(376002)(346002)(396003)(230922051799003)(451199024)(64100799003)(82310400011)(1800799012)(186009)(36840700001)(46966006)(40470700004)(40460700003)(53546011)(36860700001)(5660300002)(6286002)(1076003)(47076005)(336012)(26005)(2616005)(16526019)(36756003)(55016003)(7636003)(4001150100001)(426003)(70586007)(70206006)(6916009)(54906003)(966005)(40480700001)(2906002)(83380400001)(82740400003)(41300700001)(356005)(478600001)(7696005)(86362001)(8676002)(8936002)(4326008)(316002)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:18:16.9907 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c41c1d2-2cfa-4a44-04b2-08dbfa327df1 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: DS3PEPF000099E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB9047 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=8dc1b42e316533093bf23e2dd1249f442a8ca2fc Thanks. Xueming Li --- >From 8dc1b42e316533093bf23e2dd1249f442a8ca2fc Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Thu, 2 Nov 2023 08:05:04 -0400 Subject: [PATCH] net/iavf: fix Tx preparation Cc: Xueming Li [ upstream commit 0f536bae86b30e82ba95c279f1d6f9095d7f5b6e ] 1. check nb_segs > Tx ring size for TSO case. 2. report nb_mtu_seg_max and nb_seg_max in dev_info. Fixes: a2b29a7733ef ("net/avf: enable basic Rx Tx") Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/iavf/iavf_ethdev.c | 2 ++ drivers/net/iavf/iavf_rxtx.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index fce56d33cc..62d72a0155 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1183,6 +1183,8 @@ iavf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) .nb_max = IAVF_MAX_RING_DESC, .nb_min = IAVF_MIN_RING_DESC, .nb_align = IAVF_ALIGN_RING_DESC, + .nb_mtu_seg_max = IAVF_TX_MAX_MTU_SEG, + .nb_seg_max = IAVF_MAX_RING_DESC, }; dev_info->err_handle_mode = RTE_ETH_ERROR_HANDLE_MODE_PASSIVE; diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 63e7de41c3..6a0cf31a4c 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2993,7 +2993,8 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } } else if ((m->tso_segsz < IAVF_MIN_TSO_MSS) || - (m->tso_segsz > IAVF_MAX_TSO_MSS)) { + (m->tso_segsz > IAVF_MAX_TSO_MSS) || + (m->nb_segs > txq->nb_tx_desc)) { /* MSS outside the range are considered malicious */ rte_errno = EINVAL; return i; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:25.097441900 +0800 +++ 0061-net-iavf-fix-Tx-preparation.patch 2023-12-11 17:56:23.057652300 +0800 @@ -1 +1 @@ -From 0f536bae86b30e82ba95c279f1d6f9095d7f5b6e Mon Sep 17 00:00:00 2001 +From 8dc1b42e316533093bf23e2dd1249f442a8ca2fc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0f536bae86b30e82ba95c279f1d6f9095d7f5b6e ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 98cc5c8ea8..0c6ab4ac5a 100644 +index fce56d33cc..62d72a0155 100644 @@ -23 +25 @@ -@@ -1207,6 +1207,8 @@ iavf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +@@ -1183,6 +1183,8 @@ iavf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) @@ -33 +35 @@ -index 610912f635..45f638c1d2 100644 +index 63e7de41c3..6a0cf31a4c 100644 @@ -36 +38 @@ -@@ -3656,7 +3656,8 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -2993,7 +2993,8 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,