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 9CC5F4301F for ; Thu, 10 Aug 2023 02:11:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 960A540DD8; Thu, 10 Aug 2023 02:11:20 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2054.outbound.protection.outlook.com [40.107.244.54]) by mails.dpdk.org (Postfix) with ESMTP id C8A2B406B6 for ; Thu, 10 Aug 2023 02:11:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GZbXYtf/iwBsaVSDxVwECf/aqBPRa3DJ23QJpPAqBb5uU1r/FCKd55fHoMbQUfUx/8v4+cYgoYEZNrDwyQ7/auIMgpYnJMHZOyojPR3awRSNwOcgFC7omf0+YLnD4h2F27SwBscxD2PvfnpFR+gLVzy/EK7bQjwPEeoBZILDOLDFfnevoQmu2Q80EK7wS2YhVSY5uBXo12UbgjyX41MyK1Uy3t/fMeEL2IhH2sjQELugq1rqCxCBtPGwK7FIl/PHkyCF+/7paJRx+IZFwoPsBikstND2t+wVqp9Iw/ClgDWlCUwvk4UVypHjom9Ov7cpXk/kyLyNwudi2ETf3zefvw== 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=QW8ZSHpxzBZFrY4vP7nlKfWXG18HLaIqfZ7Imd7Kocc=; b=C+9NCZS8bDOOfitjpF7LMhLWICJiGKJVm/AWiZCygnjc1BbQp7RREOyeIOOAsVdeON3fGOq28SasCL8B0wrzk9s6FTPRXZUc5cvbHAtRaEuOy1ck6UgJ0/3InGA2Exf+Hhm38bUy0glrs22e3X2+TGAmjr2xz86G1Mc/TkFSe+8caBIgt/1YADoth9vaiFF2gdHUAUM1BaWju4PMHBmi70BzCmTPq6b149snvAcZnobtIu9U6/aOb8bCrbl9J2/cxJdU6zz1RrXqk8y/xTONO3dPj6E1K5wrSCn9TbIllondyGEoLZvHp4TZL6IUuVHJqyGo1Sf9p/KVbrqMoMuszw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=arm.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=QW8ZSHpxzBZFrY4vP7nlKfWXG18HLaIqfZ7Imd7Kocc=; b=IS4JonxwnGJSGDzMK/E2uAyQ8ODCOamCRTK4XFOv/6kSqzKcVVTJEldha0N1c2v0mHhKcvxKX+OrfbkIH3lOabdGwP0fwA0DJKjEmyoBazJweegdwQvvUSVgMBleOiAjvp79uECX8JdRhVsn6VQ1ThpQYeRpz/a3varEUx9tlmsDlpoYKMIPAn+753RtiRbq7L66HncsrHYMVWtski7nVX3NmMQKyZLZFlKCe0wENs1AmjiZhViKmS9I2rIK8yw4ZGG4DbcCZPcOHLQ8EFsbJwxf5JchO2LVziOi2qdCVIeCs+8myT2tdpnEH0vXChn9Zdnhcr9Emk89TzfKrNR70w== Received: from PH7PR17CA0035.namprd17.prod.outlook.com (2603:10b6:510:323::16) by IA1PR12MB8553.namprd12.prod.outlook.com (2603:10b6:208:44e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Thu, 10 Aug 2023 00:11:12 +0000 Received: from SA2PEPF000015C9.namprd03.prod.outlook.com (2603:10b6:510:323:cafe::66) by PH7PR17CA0035.outlook.office365.com (2603:10b6:510:323::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Thu, 10 Aug 2023 00:11:11 +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 SA2PEPF000015C9.mail.protection.outlook.com (10.167.241.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.20 via Frontend Transport; Thu, 10 Aug 2023 00:11:11 +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.5; Wed, 9 Aug 2023 17:10:57 -0700 Received: from nvidia.com (10.126.231.37) 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.37; Wed, 9 Aug 2023 17:10:56 -0700 From: Xueming Li To: Jieqiang Wang CC: Ruifeng Wang , dpdk stable Subject: patch 'net/i40e: fix comments' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 08:10:23 +0800 Message-ID: <20230810001045.2662-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230810001045.2662-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230810001045.2662-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015C9:EE_|IA1PR12MB8553:EE_ X-MS-Office365-Filtering-Correlation-Id: 58b68000-a94b-4b30-a27e-08db99364dec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tqws9bjbue6KFYEaHJOuoILkPJu3Y5CM7VAwLm8aZto8JBPUwrXxx9MDgSxj+MFCWf4HvtOK/S4hcOtKuj2akk/sByqmIBJuyqBWm++kUJajmZva1N6wHMRiO805fNkrlBMYPqXUZ2+KTLdaUcHP4hscOnzI0ETrJvX3oPNPSi61sT2rYy1HQGTSHyTzVV/a1OKcLay0sKTXBtrie0+OYnAWn46wbeWinLS2yMbjCGyykf68AyPbZQAd3VBgIT/AJtc8/ArO3cNhzApREmDH/VjT/4X3cGXuqOstXoVXy/xV3qR8EwYFqr5x3mhSxBHxbFKEFIEDKrau66MS8H5lCWbUHaY33hc2epWLGYrj2QxP/dCQxDzYq2XOCMRkKyqIkX1qeDVPhtgWwr8iFvYHkMFGT0SHvLKCJePI2XjdhVn9V2gSCAcqd3T0EAkQwfQT0b4/d9dj4kGd2krKzyTzwSYlzqPbMh9w+930FxBSPT3shIV255B9tmnsO6bK7uVi9REY1C+vIGM7qeHWAILLc/nVGz50agcOC4Ux2/G4o7KjGjCAnxP7jxSvuCCj81Uf5DidVOJX2hYBP64FDg7Phj59oslM2HvWth9sQ4yMoxBI1aQ3mb8kdzYmGQnEvJhc4X3tts6dsGffchTSSMy5HDMzZhCaN3n8miN6hro3xanuxHUaUOC+qIxwGKr+7+1EhK+WzZ2+a1ZYWAiadWor2Ynf3R7esPi9UGLsLkW3JfXG14Etm9YQjCYfWCPHDlNLMhLVxbTjed/XbOSq/bJ4Iw== 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:(13230028)(4636009)(136003)(376002)(396003)(39860400002)(346002)(1800799006)(186006)(451199021)(82310400008)(46966006)(40470700004)(36840700001)(478600001)(45080400002)(6286002)(16526019)(2616005)(426003)(86362001)(83380400001)(40480700001)(966005)(2906002)(55016003)(6666004)(36756003)(7696005)(336012)(26005)(40460700003)(1076003)(53546011)(41300700001)(356005)(7636003)(316002)(82740400003)(4326008)(70586007)(70206006)(6916009)(36860700001)(5660300002)(47076005)(8676002)(8936002)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:11:11.6132 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 58b68000-a94b-4b30-a27e-08db99364dec 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: SA2PEPF000015C9.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8553 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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=c9092597017b397ec4a0b206ac24032312a2b287 Thanks. Xueming Li --- >From c9092597017b397ec4a0b206ac24032312a2b287 Mon Sep 17 00:00:00 2001 From: Jieqiang Wang Date: Wed, 12 Jul 2023 18:07:32 +0800 Subject: [PATCH] net/i40e: fix comments Cc: Xueming Li [ upstream commit 5267a2ae78e873d3a7e175944dcedffdadab6483 ] The limitation of burst size in i40e vector rx has been removed, but the comment lines have not been updated to reflect the code changes. Remove those lines to avoid confusion. Additionally, fix a typo in i40e_tx_queue. Fixes: 9e27f00f3a61 ("net/i40e: fix vector Rx") Signed-off-by: Jieqiang Wang Reviewed-by: Ruifeng Wang --- .mailmap | 1 + drivers/net/i40e/i40e_rxtx.h | 2 +- drivers/net/i40e/i40e_rxtx_vec_altivec.c | 2 -- drivers/net/i40e/i40e_rxtx_vec_neon.c | 2 -- drivers/net/i40e/i40e_rxtx_vec_sse.c | 2 -- 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index a20c942643..e74bf83b77 100644 --- a/.mailmap +++ b/.mailmap @@ -610,6 +610,7 @@ Jie Liu Jie Pan Jie Wang Jie Zhou +Jieqiang Wang Jijiang Liu Jilei Chen Jim Harris diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h index 0376c219be..a8686224e5 100644 --- a/drivers/net/i40e/i40e_rxtx.h +++ b/drivers/net/i40e/i40e_rxtx.h @@ -169,7 +169,7 @@ struct i40e_tx_queue { bool q_set; /**< indicate if tx queue has been configured */ bool tx_deferred_start; /**< don't start this queue in dev start */ uint8_t dcb_tc; /**< Traffic class of tx queue */ - uint64_t offloads; /**< Tx offload flags of RTE_ETH_RX_OFFLOAD_* */ + uint64_t offloads; /**< Tx offload flags of RTE_ETH_TX_OFFLOAD_* */ const struct rte_memzone *mz; }; diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c b/drivers/net/i40e/i40e_rxtx_vec_altivec.c index 2dfa04599c..da4a1bc03b 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c +++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c @@ -448,8 +448,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, /* Notice: * - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet - * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST - * numbers of DD bits */ uint16_t i40e_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/i40e/i40e_rxtx_vec_neon.c index 12e6f1cbcb..90e388ae27 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_neon.c +++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c @@ -573,8 +573,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq, /* * Notice: * - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet - * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST - * numbers of DD bits */ uint16_t i40e_recv_pkts_vec(void *__rte_restrict rx_queue, diff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c b/drivers/net/i40e/i40e_rxtx_vec_sse.c index bdc979a839..79029ab433 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_sse.c +++ b/drivers/net/i40e/i40e_rxtx_vec_sse.c @@ -595,8 +595,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, /* * Notice: * - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet - * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST - * numbers of DD bits */ uint16_t i40e_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:20.881693800 +0800 +++ 0106-net-i40e-fix-comments.patch 2023-08-09 21:51:18.274352000 +0800 @@ -1 +1 @@ -From 5267a2ae78e873d3a7e175944dcedffdadab6483 Mon Sep 17 00:00:00 2001 +From c9092597017b397ec4a0b206ac24032312a2b287 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5267a2ae78e873d3a7e175944dcedffdadab6483 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 6eccf0c555..670d312f84 100644 +index a20c942643..e74bf83b77 100644 @@ -28 +30 @@ -@@ -628,6 +628,7 @@ Jie Liu +@@ -610,6 +610,7 @@ Jie Liu @@ -50 +52 @@ -index 8672ad1c41..4cd78f4e58 100644 +index 2dfa04599c..da4a1bc03b 100644 @@ -53 +55 @@ -@@ -449,8 +449,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, +@@ -448,8 +448,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, @@ -63 +65 @@ -index 49391fe4c7..d873e30972 100644 +index 12e6f1cbcb..90e388ae27 100644 @@ -66 +68 @@ -@@ -574,8 +574,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq, +@@ -573,8 +573,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq, @@ -76 +78 @@ -index baf83cb3df..b94c37cbb8 100644 +index bdc979a839..79029ab433 100644 @@ -79 +81 @@ -@@ -596,8 +596,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, +@@ -595,8 +595,6 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,