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 B22FD4301E for ; Thu, 10 Aug 2023 01:54:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A769C40DD8; Thu, 10 Aug 2023 01:54:44 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2071.outbound.protection.outlook.com [40.107.220.71]) by mails.dpdk.org (Postfix) with ESMTP id BBF9F406B6 for ; Thu, 10 Aug 2023 01:54:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z5fH3YCUWV+59fIIfXTY8I8IuiTXjDU7QcwctdNALVJAaVi+DKChyy9jRGdlvaPOR0nGh8m33bBN6FsJle+M86Pa+a9CZ22nO9sDvIttx71Y42P2SVShFxx1hzgiiEj2jaIcK8HA6/7hI4CYcPvj6L74Z6sOMvbrWZoIPrACXilxicXrUu6X1OMQAvNC6zXUHogkxzh/Y5RETpmDYYHBBmgl1j+zW6gJNe4UXZzxZjcxrM6BF/JArPp7iGZlH1cHzidQEolh/RAN/2xxHS1AOlP8FaT1TgeCSxSo4t9T2+W9nBKnvr0Tyn8SdmxbNFKFd0/xEcfQIEE3Uo968CmNFA== 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=tl5ejNlyeBknogSGNiOZvhbGt27UaLNvXZXHrtuJZks=; b=c28kWv5OE9/ZOaLxpIURxbNDX27J7x0k8bNUzib2PSwY9NSzl4evIdydChTCnWPZl7narwYqE9HPLG/DWnubgbEdZ4VwIo48chjA0v5FHVt3ksVgFreWDNrFi2fSWPS0XlAmmMyurmD5RO0F/SEyowJhETqc2947gScfCprAiKVvF6TTAsW7K6jeztpSvOxSW1UPxjZCxm7BJnC0jYzLm9Lwq4GiCbFE7grpO4tUEf6SRVZs9m6w6TYyc3kWuGrpIOJuYo4qVuM2xRp4vSqStVieAdcLU+W//vJwYOMs8abr3MhnP5Zir2y5VB2RF2Jg4vTDQJSiFASFmuGbIC/dXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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 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=tl5ejNlyeBknogSGNiOZvhbGt27UaLNvXZXHrtuJZks=; b=YQ0ZXIbcAJ6la+v75n/QqDlhif9SkQoahvT6zx2RWCKmv7kI5ixMCNBACJJPt0uXa2YJsHwJrnhz2zFqFIyvj4QtqbJrjIssbcf/C9WsFlHMPzf+25cKPzb4GPHBIjH9lUoP9Rgr3V0NDxEWKQKEzQ1tUm9ocF5tPU8p+2wL26eMhQnbW+RzLh2bs6D31HLPxDEpK7tVCEsk1EMf4JwnrbH8TMuehYpHh6GVRxlCKL3MK7k4QUohFwtUwPa58EBDc94eoT5+hlQrfMu86+4skGX3PvBr6XSEMbiJgE9+oUOPFjm6x80kVsfVxVzN4URBaEuvEm0g0FP8PBZ08rbB2g== Received: from CY5PR15CA0083.namprd15.prod.outlook.com (2603:10b6:930:18::30) by CH3PR12MB9395.namprd12.prod.outlook.com (2603:10b6:610:1ce::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:54:38 +0000 Received: from CY4PEPF0000E9D5.namprd05.prod.outlook.com (2603:10b6:930:18:cafe::c3) by CY5PR15CA0083.outlook.office365.com (2603:10b6:930:18::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:54:38 +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 CY4PEPF0000E9D5.mail.protection.outlook.com (10.167.241.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 23:54:38 +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 16:54:22 -0700 Received: from nvidia.com (10.126.230.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 16:54:20 -0700 From: Xueming Li To: Nithin Dabilpuram CC: dpdk stable Subject: patch 'net/cnxk: fix cookies check with security offload' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:48:11 +0800 Message-ID: <20230809234930.32424-50-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: CY4PEPF0000E9D5:EE_|CH3PR12MB9395:EE_ X-MS-Office365-Filtering-Correlation-Id: cd57bf50-f6a7-4023-2b8a-08db9933fdad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0+t71OCOEQPzHJPdPHnn07TgCkm2kxGQRMiLDUYlQ9TsRqiDEJl2rcnBgIK1z84lc07RYM6DJSkBN7KEYszF4lHwEXzWIxlkwgdzxMolJJKwdBRHVrM0EwWcBNzcA64UFq1+miYcl1K4I2VxW3+28nan383x5ACCNQ83pyTRAQlRziBp1Jpb0oYxC1XMgBx5w5+5fV3D73aoKo2yWEUh0l7HmxHS3pVwDodg36aHTrG0SwB/F8JX89mgUpPO9bHCmKiSGKVHJ0GSvu2GkIOWOb80UV0OP3jts/0ETsfKAZeb092d/rC+Mym9yV7VYFZIIuseQUsgXOZq/ki2BXM48BuWnJ8Udtreyiy/bkbMsKiFZOT23k9nj6gqNNyIC6BXw1/VX64yjCYcwMjBsJktcvSksl55vGjg96cpGeZhgGD3Acgy8FzJbuYBPEAV/vVZkzseT9UUD1E2dDgksAQLzukBndgwjk+85PUtUWk7ORjolCceXw29w0esCFuGlR8572xA6MrJwbkkWl0pUiCeQyYy8w4XYkadk8jcXsGKjahHztzxjDTa5LjNYiKRoOMAUrH6fsQC89fwea9PrtioMQQdafRLjjUU4PLI43P3TAP3jhzhX3JgbpgJNfVR0dKfpuvApujvhEnbe9kvm+sAZGHXn3UqtbOssoPL9AVJwxTueTLSdsQBx7DCzI5sNDiFawuuQZgJvapOjC7u+M3nrhPy91WE3VMyMOF12jNmywy4KuJRpqsUH2Sy4kKnjO9Cn8hoZ7sB+0scy/pEeRr+TA== 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)(39860400002)(346002)(376002)(136003)(396003)(451199021)(82310400008)(1800799006)(186006)(40470700004)(36840700001)(46966006)(426003)(40460700003)(83380400001)(7636003)(6286002)(16526019)(2906002)(336012)(2616005)(55016003)(40480700001)(86362001)(478600001)(36756003)(316002)(53546011)(82740400003)(1076003)(26005)(6666004)(5660300002)(41300700001)(7696005)(8936002)(8676002)(36860700001)(70586007)(966005)(356005)(15650500001)(6916009)(70206006)(4326008)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:54:38.0485 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd57bf50-f6a7-4023-2b8a-08db9933fdad 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: CY4PEPF0000E9D5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9395 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=cd88b5ff390862700e60e46185f3dc9fd8d46765 Thanks. Xueming Li --- >From cd88b5ff390862700e60e46185f3dc9fd8d46765 Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Thu, 15 Jun 2023 18:39:22 +0530 Subject: [PATCH] net/cnxk: fix cookies check with security offload Cc: Xueming Li [ upstream commit 7364015fefd308ac89565fc78a4b910e83546422 ] Fix missing/incorrect check cookies call's with security offload enabled on Rx and Tx. Fixes: 55bfac717c72 ("net/cnxk: support Tx security offload on cn10k") Fixes: 0ed7107373b4 ("net/cnxk: remove duplicate mempool debug checks") Signed-off-by: Nithin Dabilpuram --- drivers/net/cnxk/cn10k_rx.h | 12 ++++++------ drivers/net/cnxk/cn10k_tx.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h index 721127dddd..20384e64c7 100644 --- a/drivers/net/cnxk/cn10k_rx.h +++ b/drivers/net/cnxk/cn10k_rx.h @@ -1216,6 +1216,12 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts, mbuf2 = (struct rte_mbuf *)vgetq_lane_u64(mbuf23, 0); mbuf3 = (struct rte_mbuf *)vgetq_lane_u64(mbuf23, 1); + /* Mark mempool obj as "get" as it is alloc'ed by NIX */ + RTE_MEMPOOL_CHECK_COOKIES(mbuf0->pool, (void **)&mbuf0, 1, 1); + RTE_MEMPOOL_CHECK_COOKIES(mbuf1->pool, (void **)&mbuf1, 1, 1); + RTE_MEMPOOL_CHECK_COOKIES(mbuf2->pool, (void **)&mbuf2, 1, 1); + RTE_MEMPOOL_CHECK_COOKIES(mbuf3->pool, (void **)&mbuf3, 1, 1); + if (!(flags & NIX_RX_VWQE_F)) { /* Mask to get packet len from NIX_RX_SG_S */ const uint8x16_t shuf_msk = { @@ -1716,12 +1722,6 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts, vst1q_u64((uint64_t *)&mbufs[packets], mbuf01); vst1q_u64((uint64_t *)&mbufs[packets + 2], mbuf23); - /* Mark mempool obj as "get" as it is alloc'ed by NIX */ - RTE_MEMPOOL_CHECK_COOKIES(mbuf0->pool, (void **)&mbuf0, 1, 1); - RTE_MEMPOOL_CHECK_COOKIES(mbuf1->pool, (void **)&mbuf1, 1, 1); - RTE_MEMPOOL_CHECK_COOKIES(mbuf2->pool, (void **)&mbuf2, 1, 1); - RTE_MEMPOOL_CHECK_COOKIES(mbuf3->pool, (void **)&mbuf3, 1, 1); - nix_mbuf_validate_next(mbuf0); nix_mbuf_validate_next(mbuf1); nix_mbuf_validate_next(mbuf2); diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h index 815cd2ff1f..63cf6821d2 100644 --- a/drivers/net/cnxk/cn10k_tx.h +++ b/drivers/net/cnxk/cn10k_tx.h @@ -1696,10 +1696,12 @@ cn10k_nix_xmit_store(struct rte_mbuf *mbuf, uint8_t segdw, uintptr_t laddr, vst1q_u64(LMT_OFF(laddr, 0, 16), cmd2); vst1q_u64(LMT_OFF(laddr, 0, 32), cmd1); } + RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 0); } else { /* Store the prepared send desc to LMT lines */ vst1q_u64(LMT_OFF(laddr, 0, 0), cmd0); vst1q_u64(LMT_OFF(laddr, 0, 16), cmd1); + RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 0); } } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.481457200 +0800 +++ 0049-net-cnxk-fix-cookies-check-with-security-offload.patch 2023-08-09 21:51:18.194352000 +0800 @@ -1 +1 @@ -From 7364015fefd308ac89565fc78a4b910e83546422 Mon Sep 17 00:00:00 2001 +From cd88b5ff390862700e60e46185f3dc9fd8d46765 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7364015fefd308ac89565fc78a4b910e83546422 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index b7074906a6..8148866e44 100644 +index 721127dddd..20384e64c7 100644 @@ -23 +25 @@ -@@ -1241,6 +1241,12 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts, +@@ -1216,6 +1216,12 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts, @@ -36 +38 @@ -@@ -1753,12 +1759,6 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts, +@@ -1716,12 +1722,6 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts, @@ -50 +52 @@ -index 9f0af7248f..298d243aac 100644 +index 815cd2ff1f..63cf6821d2 100644 @@ -53 +55 @@ -@@ -1966,10 +1966,12 @@ cn10k_nix_xmit_store(struct cn10k_eth_txq *txq, +@@ -1696,10 +1696,12 @@ cn10k_nix_xmit_store(struct rte_mbuf *mbuf, uint8_t segdw, uintptr_t laddr,