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 882E943E57 for ; Sat, 13 Apr 2024 14:53:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 839D1409FA; Sat, 13 Apr 2024 14:53:07 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2042.outbound.protection.outlook.com [40.107.93.42]) by mails.dpdk.org (Postfix) with ESMTP id 44EB7406B7 for ; Sat, 13 Apr 2024 14:53:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tr0ypXQ5S51qOR8HtjgrMMIkfvnjL/+G2a3xEpDKhW99y8nM24RydC3BsjeSzsR6OuxiVJ/5Qgyw+tGrH2m2Lywi1IC7YT/Q+PGypBKgCohAxplefLUsi8Zs3OuG+clf/uZ0pMC9Wysak9L0mglKJxbwOPf1LZ+v8taVOenvDo1oF5yhlDnNfwvT5tfECybrp3TbBUHBA+Xoc80aBp1BwbqP5/YoocqT/cqG1+8ruF27W0CY1TRHIG7dwUExRnKcBkj1i1RJpklZGmWx13UjhOppHslEDygp5Cj/wgqENlLXxUhyQ3q970cMzDJAReuPXJ0qURLzMgFFElfWsATfYg== 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=19xBns39M7jJIJpgEBNYIE2l9Cu8rWK1ype5yuVoMCU=; b=fiYz+wnHT4BlNizOD3gUrKleKSo+WZmCaaH8j0aakGkRPyfUkuZzp4MaRowK8yHqaesz4/b8I9gPChyEGFZQHzJ1vS+quTWaC1ib5/Z9KUPcMgTK33VurpMZNttXk6b+4qeRvCQMqNWC+xDRlyna2mTElUk8jITxghli4wu4SzBoF8dpb7rbUV5jY0Hyr80U3Nbv91efRVy/OyywLpIvsbz+9ezyv0pg0zPfrpUzucMaRXSB8SqFMSrjoR8r5/wPjBM5H9O4JfcuE6hhjJpNg5clfG3WpJbaxFuJIAV4nnPyeZvbp/24auSpu6Q689UYrxKi3gxOpI5NGyJuptdBLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.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=19xBns39M7jJIJpgEBNYIE2l9Cu8rWK1ype5yuVoMCU=; b=Y5Qqaa9IAZnHp/wYpyquef17CkS+Cj+/uO/dWp8EsI+WKJfp+v031NnIV/d96T3E2b+OAsLil8486sgCk3ZzLdVxgG+YxCQOqEGfl7aymtNkOcUH+DiD+zp2XKcFi7w+c1oNFS3jm+EmJaCsl3YX/1Q5w8qBjpp+zQTqS20kWeob7WXc0TeNutG+gZgPgdBml5B0YbQIKBuF80omhBv9jP6dA0XaO+qEnemtXbucowVkZZpwtzzFBwiZTIYwCuJExWk/tLOqkh0AJxL8pP5E8vRo8+e8XE0l9mfkzyoeM6kCyotbZYx4wUmRvPgy299RDkXl/L8Kdv+nZT0y64UlDg== Received: from CH2PR19CA0016.namprd19.prod.outlook.com (2603:10b6:610:4d::26) by CH3PR12MB7595.namprd12.prod.outlook.com (2603:10b6:610:14c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 12:53:01 +0000 Received: from DS3PEPF0000C37B.namprd04.prod.outlook.com (2603:10b6:610:4d:cafe::b0) by CH2PR19CA0016.outlook.office365.com (2603:10b6:610:4d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.26 via Frontend Transport; Sat, 13 Apr 2024 12:53:01 +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 DS3PEPF0000C37B.mail.protection.outlook.com (10.167.23.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:53:00 +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; Sat, 13 Apr 2024 05:52:44 -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.1258.12; Sat, 13 Apr 2024 05:52:43 -0700 From: Xueming Li To: Rahul Bhansali CC: dpdk stable Subject: patch 'net/cnxk: fix Rx packet format check condition' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:48:29 +0800 Message-ID: <20240413125005.725659-29-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-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: DS3PEPF0000C37B:EE_|CH3PR12MB7595:EE_ X-MS-Office365-Filtering-Correlation-Id: c7b45559-f86b-402f-ab58-08dc5bb8a692 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YiRpYYhTFAPhmdV5zDbiaTrMf024CAjUqCSBL/hqqpPgMteeSb2T9QM46dND7QBcq3wNTk4WIwDjiixVqo1F8G9+RZtPJBFuHYjD90gLS/5QzLs6pTmEBSZFigMZ/N4wBAFWBVDVWWAz5cbkTdcatj0vHdZo01XnTUpieLahrnFqbGLR5hYwtEqEfRaPRozEjur/VjjadAp3DiZQa0ZX8JfUHUJn0d5Ti5skSUvPyShdNM6iUxS9klwTa9YqCxXsTLs2jAlVpTkd3LmTIo/VrKJ9YfVGcuw7cwu+avnSwpskO2PYFARGnKTNxmHuBw/8hasBJzkTdmL0HrCoe9xt4h8UH1h769PSdvXzIY02fgRIVAMmy7Q0JIlMYbc+0GFfxgccRGiJpqK69HFGMiMoizkI6/LKx2bFegDna8QrLPV+cf/cRvLr5J+GUhIEqB4XLhN8PkxUdfIeaYk8Qp5KHZPcHeCys8+5CMGs8rbRF+CIKX1LG6PxA7xUkLym7cYq8DpihRABk1jBcrnzwavJ/JF4bext6JvXth2BBNqc7EsIk4MqWsF9uqyZmTKGHFx+EYjPdWTNIogupDCTN5cuwr0eRyHNGO4FXz9CqSmzEsaTs5NoNFLJPGXwjZaHV8HIDjEC4nnOsE34b9fPwRaxdS8xHu3nJ6gkp0/W1cUf48pn7Sa0Jw+K+Ym7VYxCxSdEa6izNA8kU9lUAP8M0CU/Knqm9oJXwqZBVyHerLKzcCtiPmabUYDXHgG0KOEDNLBC 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)(376005)(82310400014)(1800799015)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:53:00.5101 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c7b45559-f86b-402f-ab58-08dc5bb8a692 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: DS3PEPF0000C37B.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7595 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 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=2d11f389b0f8fe86387c2d7ddc33e9230dfedd11 Thanks. Xueming Li --- >From 2d11f389b0f8fe86387c2d7ddc33e9230dfedd11 Mon Sep 17 00:00:00 2001 From: Rahul Bhansali Date: Thu, 22 Feb 2024 15:37:28 +0530 Subject: [PATCH] net/cnxk: fix Rx packet format check condition Cc: Xueming Li [ upstream commit f9e6c013564967de5e76f45a81dc593361f2ccdd ] For IPsec decrypted packets, full packet format condition check is enabled for both reassembly and non-reassembly path as part of OOP handling. Instead, it should be only in reassembly path. To fix this, NIX_RX_REAS_F flag condition is added to avoid packet format check in non-reassembly fast path. Fixes: 5e9e008d0127 ("net/cnxk: support inline ingress out-of-place session") Signed-off-by: Rahul Bhansali --- drivers/net/cnxk/cn10k_rx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h index 7bb4c86d75..86e4233dc7 100644 --- a/drivers/net/cnxk/cn10k_rx.h +++ b/drivers/net/cnxk/cn10k_rx.h @@ -705,7 +705,7 @@ nix_cqe_xtract_mseg(const union nix_rx_parse_u *rx, struct rte_mbuf *mbuf, if (cq_w1 & BIT(11) && flags & NIX_RX_OFFLOAD_SECURITY_F) { const uint64_t *wqe = (const uint64_t *)(mbuf + 1); - if (hdr->w0.pkt_fmt != ROC_IE_OT_SA_PKT_FMT_FULL) + if (!(flags & NIX_RX_REAS_F) || hdr->w0.pkt_fmt != ROC_IE_OT_SA_PKT_FMT_FULL) rx = (const union nix_rx_parse_u *)(wqe + 1); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:06.011927707 +0800 +++ 0029-net-cnxk-fix-Rx-packet-format-check-condition.patch 2024-04-13 20:43:04.937754010 +0800 @@ -1 +1 @@ -From f9e6c013564967de5e76f45a81dc593361f2ccdd Mon Sep 17 00:00:00 2001 +From 2d11f389b0f8fe86387c2d7ddc33e9230dfedd11 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f9e6c013564967de5e76f45a81dc593361f2ccdd ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index c4ad1b64fe..89621af3fb 100644 +index 7bb4c86d75..86e4233dc7 100644 @@ -24,3 +26,3 @@ -@@ -734,7 +734,7 @@ nix_cqe_xtract_mseg(const union nix_rx_parse_u *rx, struct rte_mbuf *mbuf, - else - wqe = (const uint64_t *)(mbuf + 1); +@@ -705,7 +705,7 @@ nix_cqe_xtract_mseg(const union nix_rx_parse_u *rx, struct rte_mbuf *mbuf, + if (cq_w1 & BIT(11) && flags & NIX_RX_OFFLOAD_SECURITY_F) { + const uint64_t *wqe = (const uint64_t *)(mbuf + 1);