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 D91F4433D8 for ; Mon, 11 Dec 2023 11:16:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CEB6340ED2; Mon, 11 Dec 2023 11:16:35 +0100 (CET) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2087.outbound.protection.outlook.com [40.107.95.87]) by mails.dpdk.org (Postfix) with ESMTP id E9FE0427E7 for ; Mon, 11 Dec 2023 11:16:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mEknm42YuPBCP4SRx05MqDWG3UKXkMQ6HGOvTgZkKKGu+qwD5b6DVZkUE5etwDwGfnawv7lJfAAO5fLkXp57G7O1jGsTlD1ZxWkCp3J3dDShy0J6n69umBlq2lgahO2cG7K9yBhhhyoVq4JrukKAe20GdKctOvdAoun92DbfcnjCoodViaDw2/LdP855H5V7ElXSfndmoXG78dDF8zbeiAWQGQeyj760mbn0yi33GQoB/dN871sWAqY5028z2DiYLlJg8fiC6JgUVH66jx3g4XAHeCauoYlSZAWlBXf4gaZ+SPNovNa5QZb50DZuiMLoP+OMmyMz16M/h44V260WiA== 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=OT3xzklYJdOkuFkflr2PJ2gEHk6D8z58HVY9Vf1dik8=; b=Ruk0YIzZUL0x9L8tsWYh41M7Z+T6oIQh1QK+ymD4IKfSffvuHLTj59ikWt5HDqjXuInIhXFW3Se6QM+2B8nx5Xf66PPuWj6apXOxYJNsxeZyU5Ag+YWYZDBQjMiOFMRPlvuw90/wacBt4yCwfiN2gNFFo5DJkHxa4D2/4xtydn4rDUogRiPeM2aUII+IxcwxM1kMEdiZ3T3yeYCP8D8I6nKD0qWXkiqnlLtETOigbs60TuEaXkycZSYKDJYAu7vTZIB4DVFqCZkHmwY3FQLCcdOjPVibg5xovG+dHHjFToFW2OgCOMRLpCJiyNVx3o/Swr7nJ1osxjgJSwv6MSvY4Q== 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 (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=OT3xzklYJdOkuFkflr2PJ2gEHk6D8z58HVY9Vf1dik8=; b=CT/8lr/iorYATCfKzmahyyH61r33BrjP3EOGGbyfn351vFY3rUkK93Pnk/BCIXyREDjUyC8lNURyg/dCOpeTBVdcS97f3q8tl5mh8d/sSRZVhQDF8uCxJHMkU6vS1M5vUpV0gIQnFS28GzjiYmbE0+3SiU5eE7UDJoqQQYyNpZ3eOdfSutSQ9QGGzXhK7IVpscTjxOKyCpm4dQDh2bMq0XldtwhanQ9RAs772py1JcGds3AoAixM26YvP2eQCaK1VIJw9w/V9IlAlEGzBC6L2NXAqg62sJSrsQZUPCT4Z9GKEtrm+eqLdjs2Vs43wgnxjtjDczvkjyXNCa60t9Wgwg== Received: from MN2PR18CA0026.namprd18.prod.outlook.com (2603:10b6:208:23c::31) by SJ0PR12MB5502.namprd12.prod.outlook.com (2603:10b6:a03:300::7) 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:16:31 +0000 Received: from MN1PEPF0000ECDA.namprd02.prod.outlook.com (2603:10b6:208:23c:cafe::bb) by MN2PR18CA0026.outlook.office365.com (2603:10b6:208:23c::31) 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:16:30 +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 MN1PEPF0000ECDA.mail.protection.outlook.com (10.167.242.134) 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:16:30 +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; Mon, 11 Dec 2023 02:16:15 -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:16:13 -0800 From: Xueming Li To: David Marchand CC: Ferruh Yigit , dpdk stable Subject: patch 'net/tap: fix IPv4 checksum offloading' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:07 +0800 Message-ID: <20231211101226.2122-43-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: MN1PEPF0000ECDA:EE_|SJ0PR12MB5502:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a7434e2-c437-4aba-d190-08dbfa323e78 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: myOEwUQk9EDaSfeJJBjFBg5zN+wGMt9aA85/Mq79V3kUihjtfWGR9O1btxX8UdJhnXvU+RUOuqVckP/cIojPPUKz3PANN2986sDPWuA6EvQAfaD3bBUd5wOgK7UU65l2nLZoVJsxV2HmB2GrfGskTO3jA8oMw9z9vGVO9vltXcZn7VNVbley5wcDu9oSujSRjmBMAoCYh7OCyzg9RPkkvLeS9JcaXWIqBuBT1P90bptQeWNdpNFOl0BkdyXADJPR2TXZjR7hB5/nzwW8SHHJZhrPbOd3Bc40h5HStdIoVMH/I+Do5lRV95r1mVJHUcNiFJx+B35Wjn+pI1FNjgRwMqI0c6ky9rttYdkikpx5YvguELkm8AkcV8TejJgLRIm8uSVP49DVc0S6Pu6qomocI61iG/ifnJoQLAitzn4fiw5/a/h2iyVma7uK/k8xLIcgqUqlS8QKc2dlAk2PXKi4Ng/6Vk07tXfprEk3ir4tn5lSsAct/Al2mkisuWjr/gItf4b/wuZj2NzMVXVX517FQnvz7aLR6gJ22lt9n3iPZbLQi/TVaY6te4u950d0ofMSV8czDwHc3UJOe7SdT+H60e+SWesdI6nYKocyRVV0sI3R7YioxykPyaU8WjnT7tG4PxOZNSbFmwO49rqWuuNth27qBLpsNaTKtqfX4y+7gXAYZqGt0pUlVhR2mFyRf1FzU/7L5XfBbBeAjUjJNWvQOuH4IwYgjYKoYIY5gnvYpG1685HZntTRh+N9p2t5HEEzkvICQF89lCDIcyJbD3d/7yJRRA9bklESzvd3vReZ+tI= 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)(39860400002)(396003)(136003)(376002)(346002)(230922051799003)(64100799003)(82310400011)(1800799012)(451199024)(186009)(40470700004)(36840700001)(46966006)(4001150100001)(6666004)(7696005)(2906002)(54906003)(70206006)(6916009)(53546011)(7636003)(356005)(36756003)(86362001)(316002)(8936002)(4326008)(8676002)(5660300002)(55016003)(40480700001)(70586007)(966005)(478600001)(40460700003)(41300700001)(36860700001)(82740400003)(47076005)(6286002)(26005)(336012)(426003)(1076003)(2616005)(83380400001)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:16:30.4596 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7a7434e2-c437-4aba-d190-08dbfa323e78 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: MN1PEPF0000ECDA.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5502 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=69d6a23bb15e18035bfe2f866da3e30124c5ca94 Thanks. Xueming Li --- >From 69d6a23bb15e18035bfe2f866da3e30124c5ca94 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 24 Aug 2023 09:18:21 +0200 Subject: [PATCH] net/tap: fix IPv4 checksum offloading Cc: Xueming Li [ upstream commit 3e9c82e88069b1e6e945479626b4c054edf8ba96 ] Checking that one of RTE_MBUF_F_TX_IPV4 or RTE_MBUF_F_TX_IP_CKSUM is present is not compliant with the offloading API which specifies that IP checksum requires RTE_MBUF_F_TX_IP_CKSUM. On the other hand, RTE_MBUF_F_TX_IP_CKSUM is invalid for IPv6 packets, so we can simply check for RTE_MBUF_F_TX_IP_CKSUM and assume this is an IPv4 packet. Fixes: 8ae3023387e9 ("net/tap: add Rx/Tx checksum offload support") Signed-off-by: David Marchand Acked-by: Ferruh Yigit --- drivers/net/tap/rte_eth_tap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index b65a23aed3..2fd46c6b0b 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -559,7 +559,7 @@ tap_tx_l3_cksum(char *packet, uint64_t ol_flags, unsigned int l2_len, { void *l3_hdr = packet + l2_len; - if (ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_IPV4)) { + if (ol_flags & RTE_MBUF_F_TX_IP_CKSUM) { struct rte_ipv4_hdr *iph = l3_hdr; uint16_t cksum; @@ -642,7 +642,7 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, nb_segs = mbuf->nb_segs; if (txq->csum && - ((mbuf->ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_IPV4) || + ((mbuf->ol_flags & RTE_MBUF_F_TX_IP_CKSUM || (mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == RTE_MBUF_F_TX_UDP_CKSUM || (mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == RTE_MBUF_F_TX_TCP_CKSUM))) { unsigned int l4_len = 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.510499300 +0800 +++ 0042-net-tap-fix-IPv4-checksum-offloading.patch 2023-12-11 17:56:22.987652300 +0800 @@ -1 +1 @@ -From 3e9c82e88069b1e6e945479626b4c054edf8ba96 Mon Sep 17 00:00:00 2001 +From 69d6a23bb15e18035bfe2f866da3e30124c5ca94 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3e9c82e88069b1e6e945479626b4c054edf8ba96 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 66335d2755..939c68db9a 100644 +index b65a23aed3..2fd46c6b0b 100644