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 4D878433D8 for ; Mon, 11 Dec 2023 11:17:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 444CC42D2B; Mon, 11 Dec 2023 11:17:54 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2084.outbound.protection.outlook.com [40.107.92.84]) by mails.dpdk.org (Postfix) with ESMTP id 7188E40E0F for ; Mon, 11 Dec 2023 11:17:52 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mkATjVIsWaeWbE8scaJmqalZgYIOR6vRdKMKXy+40aNdH7767ddFtpiu1Ya9//SkHp4b5qy0MjSS6f1HA/WlqeQ1oEX2nl8EBAmJXyuzO9Tq+SPG9WyZDdgXHo4vbEapulLNpcf0HAucgQdeWjCUc6S7AXnQHrNrzS8CkM886CwwgoJh0H32+4rHCkyWYVEfHBFnoDeXYh2RRRzsrPrUBaMJzwJdJHz/DbW9gnWFcHvCV3Xy8wc26YgBw3vsitUGSKSWB0gZIhYEklbTdLdefb7twz+DibhHFtkWTDx1+iGpPVaQthh6wERRJnLHFkdWYl+wbR8JZa/1+J0bEQ3b8Q== 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=2jqR9ylW/hkn0l8lfOQiEifJ3HFA+h5Lf4qYb5G9dW0=; b=gYjQeDMQ7sXW5NY2T9WWDNndvX5p1NotS3LxACUL0muzJnJzGN9CdVXXHNFMAHmkVbHKKocIjfFAdrG4IJV2hI3MH9/woGcVPJqnviuv6Rvn32vDAZpHStE77vEVVV4QECcIFQuRMvsKoI8Q/AOplzvhKWmDDglSmPM31PXTn0NYMWMl0zOU5XomGDlZ5qLCgNXQwleDsf8zrDbLew2MoLCLSRHPPeADIz/d+v7WWZletbTU7YQrdm506/foq8y6mSPPyQxTTCTlnShHKRKliYunPmF6p73pFoZbiCytwFQfGJWT4U2FLnAqIDgZc6fcM0OWdnX9jB509WN+UPqycA== 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=2jqR9ylW/hkn0l8lfOQiEifJ3HFA+h5Lf4qYb5G9dW0=; b=e2eu7gyhZVuqzqj0RmZY/JcPF+MI50zxcHB5kCXJyxzJBunOpxZGuT8LLBd8JmTXsPOdD+xonfngZf3YxQEL6OcyLqb0BZBTX5NXo0ZXjQFYdDfa8SZimWm9vO7biPEy37PVcCo7+f3koAyJy80O4gS5+SPSWbgwfqOcCw0bNdHZDlI6u3vzPp+yECHZG+Qv/lBjj5rlGOsfCFD2rjcxWjDtgG/SE8q8sVkxRw5scLQf/cUprtWg5xM7pIwp480H8js4xv1ZLCJd8/2ojbvS32OnsOz66hPvaDSxGvRC7178/fdn0ueCf/WT+pTnbVHR0ivt2TWxJs7krO4DBaExHg== Received: from DS7PR05CA0006.namprd05.prod.outlook.com (2603:10b6:5:3b9::11) by MN0PR12MB5978.namprd12.prod.outlook.com (2603:10b6:208:37d::10) 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:17:50 +0000 Received: from CY4PEPF0000EE3E.namprd03.prod.outlook.com (2603:10b6:5:3b9:cafe::f9) by DS7PR05CA0006.outlook.office365.com (2603:10b6:5:3b9::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.23 via Frontend Transport; Mon, 11 Dec 2023 10:17:50 +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 CY4PEPF0000EE3E.mail.protection.outlook.com (10.167.242.18) 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:17:49 +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:17:36 -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:17:34 -0800 From: Xueming Li To: David Marchand CC: Radu Nicolau , dpdk stable Subject: patch 'net/iavf: fix indent in Tx path' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:21 +0800 Message-ID: <20231211101226.2122-57-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: CY4PEPF0000EE3E:EE_|MN0PR12MB5978:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c001fda-d7cd-4b81-d389-08dbfa326dc3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pKQdsE6mxhXhwqsPDEbO0hmwPfMJKUtPt5nu6lvNMYUp6v798G7333J+t1vnvQyWMXFlUHG/Sh5MeQ6LYDSvrYLPU4mC2l0oHH2C/KBcgr5DxDDuhgDkr56nTw7PjTkweLpnjQIIk2Guo5KfCmGvkftXZfhlvJ3cJsUbLsf5u0Erlzso2PHfnFX7Jpk/7YByVjRjrpJhuX0gwjim55Vp7nTnWweHJjvCpfrwAOJG+hx3pqWVd+zkBhwtRe+RsXbrDHIllz92sbW2X6UfWrO/5wPysXXt9KYkvcysDosWjBfVCAxGvn4dYhoqKTCe9fVnfrPPrF2PPzavpGyBY2rCRh0tGrHRj1NzisvCtaUCbQX1M4iUu9f52xX0ou9GFbsCLxPqZXqNPDD5TaBKwBDNDTlwpTvpPESdzqN+xnJouX+M3Ew1Ex/vFIflu/iTJJh97XqF1312wKjLNnB1MlIejQlHmEJhw0aSNCgirjjDJA6nw12vERswXUNQ3hcpJgbDkE/m8o/PeCPfZCm3kTQZSS9FwjSinRVUsycKRlBtyNdnxD//55B1RFsgXf8eO+vpZnCBdwxI14VF7gPrhd//H13cPhVheTjXiU4Z+RzN524PrW+lM4Q/tlHClNUf98BdUwU2/4MQqBhK7AJEeHoFIRwOzin5IObWBhZNBa6eThb93I7MZyqC6ehO/UCnCY2n1oCw0xtCklj7BKGoOAElRRIbO5oyqCzCptxFTnVPh6KBNYreSBSoq8QXaEuAtUoxfuIt6Q0cytYPf8F18PbJukcR3+Fa+zaRwzholUzpWwU= 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)(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:17:49.8509 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c001fda-d7cd-4b81-d389-08dbfa326dc3 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: CY4PEPF0000EE3E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5978 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=84c1679b72ba4c5d3f21700e098385b711a083b9 Thanks. Xueming Li --- >From 84c1679b72ba4c5d3f21700e098385b711a083b9 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 26 Oct 2023 10:06:16 +0200 Subject: [PATCH] net/iavf: fix indent in Tx path Cc: Xueming Li [ upstream commit dbdbb1310ff2a39e215d28d326ba2261d174eee9 ] Fix confusing indentations. Fixes: 1e728b01120c ("net/iavf: rework Tx path") Fixes: 6bc987ecb860 ("net/iavf: support IPsec inline crypto") Signed-off-by: David Marchand Acked-by: Radu Nicolau --- drivers/net/iavf/iavf_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index b6bc904228..35776e3cf8 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2829,7 +2829,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) txe->last_id = desc_idx_last; desc_idx = txe->next_id; txe = txn; - } + } if (nb_desc_ipsec) { volatile struct iavf_tx_ipsec_desc *ipsec_desc = @@ -2842,7 +2842,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) if (txe->mbuf) { rte_pktmbuf_free_seg(txe->mbuf); txe->mbuf = NULL; - } + } iavf_fill_ipsec_desc(ipsec_desc, ipsec_md, &ipseclen); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.945328900 +0800 +++ 0056-net-iavf-fix-indent-in-Tx-path.patch 2023-12-11 17:56:23.047652300 +0800 @@ -1 +1 @@ -From dbdbb1310ff2a39e215d28d326ba2261d174eee9 Mon Sep 17 00:00:00 2001 +From 84c1679b72ba4c5d3f21700e098385b711a083b9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit dbdbb1310ff2a39e215d28d326ba2261d174eee9 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 72263870a4..9890a31734 100644 +index b6bc904228..35776e3cf8 100644 @@ -22 +24 @@ -@@ -2898,7 +2898,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -2829,7 +2829,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) @@ -31 +33 @@ -@@ -2911,7 +2911,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -2842,7 +2842,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)