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 ED3BD431D5 for ; Sun, 22 Oct 2023 16:31:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6994406FF; Sun, 22 Oct 2023 16:31:39 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2064.outbound.protection.outlook.com [40.107.93.64]) by mails.dpdk.org (Postfix) with ESMTP id AA7D640284 for ; Sun, 22 Oct 2023 16:31:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I1Z7vEXR4UR3wNe1V6rRESAyweP+8WJ4uxQuQ1VNjixxQnl7z3PGacA7wNDiLPftB5G1+mWJ4mBYkCPw23OVcbb/tSB4QluyjKEzs6wgnUteGG8dfK9aMYov8mhkQxB4H5NfzZIveA1dLYqjetL/TnhX7vo9hvszS9SqSfYF83taK3pUKj4NolBAcuFXfBfpRbrM/X9lqgAtmjE3CLKaxD1NfCXu4VnU/7Y8xQjJMknqbu+uxOXEsbBnf8CbbohNqXcV6w3uljRYi1/usC5zogUEjD6/2Vc++352LBUdrlx2YUnSNPeGTSOYmv9VddAbeH5g0QvC2h1T7dQXRTpVmA== 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=mE7jcoRnknidJAO6jyM2Q3ZLjW4zUpa89C7NeDNxRlI=; b=YW+qktl/KpnrKCTMV9l5nzpLQ3xSCnIWUi211qE/big6IdpPiq9yC8ZCkOVg8d95KY6nLWcEcsR1axiHVTRfrXyC108EELwODsw4CcQIAeIAYMGposOYWVSJayW74ZyH/DaB68z8+wZMvjEh6Qnz0oSEKaciE+VFMnVMv3W22aDqilS9eTjL6Kxg4xP1nAAxU+si4X+1VNxpUxSe1n3yWAx5me1fA4pky/q+oN2Ho/lD12phUPjxi8ZUq725OhSiuIa2rMvHlqKHVL9nDdWHyv8yWa43TDDkkl8jIMMMO/OGk3yiy6Q1T0YnAhrtfRoTy4IzDrULJDTXH6vG0OtpOg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=redhat.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 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=mE7jcoRnknidJAO6jyM2Q3ZLjW4zUpa89C7NeDNxRlI=; b=j17Nb9/PjR5zhZcDbfo7ATKx31f593JjPj53GhRwsYviT7g5bjZZZ5+WJAKouLDm0iAaK8q21MJQC7UZ7Bu9vw/obWVnMi5ooqGfCYmVTvqtUXGDAog3XDLsUEhmdfTnpZfrf3fi590LsLeqAq+anWPN6tsn+kwrTWdaCFBQZ1Bv9telFRsa/2UAOa2IRI3/fRBM5rt4JsqJ0J5INJe1+gO+9hA1at7BA8cfkSoNocq80Y46UuCCMuLoJYdcDWHUsmmFNq23JbBv1SIT93ICygLUEMGlcCb5VBfqEnEnXtuwucG68WfbuKKgY0KQNOVBQeNMfc5zERBOy0aiz3vsNQ== Received: from BLAPR03CA0096.namprd03.prod.outlook.com (2603:10b6:208:32a::11) by IA1PR12MB9061.namprd12.prod.outlook.com (2603:10b6:208:3ab::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.23; Sun, 22 Oct 2023 14:31:36 +0000 Received: from BL02EPF0001A0FB.namprd03.prod.outlook.com (2603:10b6:208:32a:cafe::81) by BLAPR03CA0096.outlook.office365.com (2603:10b6:208:32a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31 via Frontend Transport; Sun, 22 Oct 2023 14:31:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF0001A0FB.mail.protection.outlook.com (10.167.242.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:31:35 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:31:21 -0700 Received: from nvidia.com (10.126.230.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; Sun, 22 Oct 2023 07:31:20 -0700 From: Xueming Li To: David Marchand CC: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix TSO with big segments' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:22:04 +0800 Message-ID: <20231022142250.10324-96-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: BL02EPF0001A0FB:EE_|IA1PR12MB9061:EE_ X-MS-Office365-Filtering-Correlation-Id: 93d010aa-34ec-45c4-42eb-08dbd30b9882 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7KzWS3yZUoKfPSjxbk+cCkVr5CmkQ+GukE3WM9cVIqClRRKOjFyYcjgqN+RaIISf5q1sbRbRaxnQ9FFk368zzhC/i6zaB1u493nbXrOoD/pDR5X/kurSKTswZvYNo1cX0zeWel6DnoePj5uO1aC6f2quLb4B7imQFxqthxS3aWVfsFZb3dPbIWzx/SoPdXfxaJeCx2qPazXKkYHaRdZ5z5FWRmXLQS1p0qVJjlzPUaohPxozDtqYWiE+JgvPb9CDMh6TzUFhmh2ZzKD8oJAgv700m5vg20vfY7l2uVP6UjMcY7Zc/4O/dJh5adswStN6l21OXh2T0JvHyfLXiGzrxhN/fkVBJXxkTriNKW1nuv5R5M7gVHfINM6W3g9QBYiF5AtlEAOfwPH/jGxpjca3V9edWNPd4/aKdBi6Cc1HJrbWQG2jJBb7L1KquEAxe8CzkEHVNXP+ZEjUgf0xfqZoDOqgL2RK1meYy614Zx07CS7tRjvzzDAjM/F3/p+ie8mG2CPrk5GCAZ9KypWVSIvKV8BgRM8v9BL9CDuikdPYCAZ0LGxIzTZs0rXn0vCVHTlAQhAwkWhTQFflQeb6Zjb70Zphvyfno0KAiz00MsD4168DIvBTF7gR8Jfad1BcIQaRC+mZ9vvBQcmLkBtQSh1Gs1s1N6RpiTDEgvEuj3kNXbKao+isIRkxkxJ5pCZTSETP1FFY/CgDLENENUoti71XAr7bN/lMGWcwiIWKvfpRhNnFRjQ1jZKzmHxBirJuqArS X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(376002)(346002)(39860400002)(396003)(230922051799003)(451199024)(64100799003)(186009)(82310400011)(1800799009)(46966006)(36840700001)(55016003)(316002)(6916009)(6286002)(47076005)(336012)(1076003)(426003)(16526019)(2616005)(6666004)(26005)(36860700001)(70586007)(53546011)(2906002)(8676002)(83380400001)(70206006)(478600001)(4326008)(4001150100001)(8936002)(54906003)(356005)(5660300002)(41300700001)(7696005)(966005)(7636003)(36756003)(86362001)(82740400003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:31:35.7800 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93d010aa-34ec-45c4-42eb-08dbd30b9882 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A0FB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB9061 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 11/15/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=a7ff0ba143d6bc0d12c4f158a59bd94a44e2a508 Thanks. Xueming Li --- >From a7ff0ba143d6bc0d12c4f158a59bd94a44e2a508 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 Cc: Xueming Li [ 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 dc07a73b66..31434f0ee5 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3676,9 +3676,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]; @@ -3695,9 +3692,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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:37.861675000 +0800 +++ 0095-net-ice-fix-TSO-with-big-segments.patch 2023-10-22 22:17:34.366723700 +0800 @@ -1 +1 @@ -From d7b35f53cadd6f228b3787f8dceca5481c034740 Mon Sep 17 00:00:00 2001 +From a7ff0ba143d6bc0d12c4f158a59bd94a44e2a508 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d7b35f53cadd6f228b3787f8dceca5481c034740 ] @@ -19 +21,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index d5513e9e93..ee9cb7b955 100644 +index dc07a73b66..31434f0ee5 100644 @@ -31 +33 @@ -@@ -3685,9 +3685,6 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -3676,9 +3676,6 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -41 +43 @@ -@@ -3704,9 +3701,7 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -3695,9 +3692,7 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,