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 ECA1842D46 for ; Sun, 25 Jun 2023 08:44:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E4BCD42BFE; Sun, 25 Jun 2023 08:44:32 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2059.outbound.protection.outlook.com [40.107.223.59]) by mails.dpdk.org (Postfix) with ESMTP id C612941143 for ; Sun, 25 Jun 2023 08:44:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LF0OfDW7H7y2qP2RLPl6cg+MoSjj004A7Hy0+lRId+TU57yhV+nape3tcLHpaLZBQSdNXl++CdYgeWeCgRMwOxQ6QACax1pMbseDf5kIYYbx1Hegyo+bGGfV7SU0SM4XJVQOz05dJtO1ERATIIvNnhMWDTzQLyBdeb0SXK47GKUSbUNRLE1TlKGYxoFLmxsymgRz4A4MmcnU0vIVF9B/AM3pBkS4V2xGNKQfA3eIlPyNCKTPQzh5bs8+f2bo1KRvY9mSTpA6b/iboreNSE0VWtlxArC+ldVLmep+lg5qjNvv8SDNEj2oVNOzTM1jnV3p2TLKG1l4c/ot5KdkCjgV0g== 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=FcbcBbGhmedFtQIB3UTpVOkjB2yE6ftZmWHbb31lnWQ=; b=BBfvvImxUcyM4A7YSQTywMXCxmYqsd3uuOWNwtOdIke5RniTVfq8J0LmE/lAGkii1zksAHMaqo7Bdcm6HoKYAeMlPezuJF5uJzBwN3fpzEEeiiohH4oRXQS6Tn64fi6Rd+XZrDDwT6nmM2f+M4tGFRplJ3eZPounXIZXBo/2RscY6f35EIzPukZFbhFU95akn7lkpm4SUvW8nr9LCqfYekmteFGjoyRnKZm4n/+w4rOK3Y3WHHPfOBBq4akzpIfm1wHbMnVmc6uSWufP6zlHxo44gpbRE1oZYtNuxh+8Pz3R1a2a5YLVHbzNvXpZIAg0dnHJBuD0RvYtXs2+oCyFKg== 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 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=FcbcBbGhmedFtQIB3UTpVOkjB2yE6ftZmWHbb31lnWQ=; b=jsaL1UEOkDc7MGsX274dqQfGKT7fMLxkhxA3frLv6xyAmc/5Omgx0O08kN4vVQEcDc+0D2M49PVDjx0R01lvSb8aaxWhicsG7QKXW12e6cc4JLpQTAqhl9G+l958WRXVqAUaA2/vg0ITnu9ZV2fbS3CCDvNCJWDxGzE0bhm5u+1kGzYQGGP+X+rjMibgEjrD1bNeslOgiE2axwjIwjbNOo1S0BcZu88DF96wH6SF0sa1qZgDXaITVL+pXnhORTWmnwneZq5o7F8W0Akhl/s5ZBG0lbpRgHcHEcK5iksbhCpMU6UruZazVLSB4fb11enc66N09+jqK7BVNHD3JA4YKg== Received: from BN8PR07CA0024.namprd07.prod.outlook.com (2603:10b6:408:ac::37) by IA0PR12MB8086.namprd12.prod.outlook.com (2603:10b6:208:403::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:44:30 +0000 Received: from BN8NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ac:cafe::32) by BN8PR07CA0024.outlook.office365.com (2603:10b6:408:ac::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:44:29 +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 BN8NAM11FT055.mail.protection.outlook.com (10.13.177.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:44:29 +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.5; Sat, 24 Jun 2023 23:44:14 -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.986.37; Sat, 24 Jun 2023 23:44:13 -0700 From: Xueming Li To: Rahul Bhansali CC: dpdk stable Subject: patch 'event/cnxk: fix mempool cookies check' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:14 +0800 Message-ID: <20230625063544.11183-97-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-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: 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: BN8NAM11FT055:EE_|IA0PR12MB8086:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b66b5cc-ca46-4ae0-1391-08db7547a040 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gxk90avD8WkjuE60ZjR9E2kM90LSUSfHzsKgK+MZhldcK9BPnEj6Gj9f3CGqwRHIVsmSofFj67Oq3nkI0y9fKmKuU0d/TB1RgodRRyinxblXsr4MylLt5I2sekwQ9/M8Za+IYMPwAqc3hWhqKTsj6vaJtYT8Lk/QilMBuTeXo9NRMZGmxVmavVa2jOn4CVr59sKgjCAatWcHLO/TV4y132tf2mjqIV8bUrLgj/xbElsgpRLc7E8hLotMW47cUS64AZCWg/HnqUgu6Y23XD2E7bKeolyjGnRXqdVhMT1yoT4mJ4yaOX/HaDWDJOcoj+yHmnd+guU2evUPFPUf/IWI0Ja+Z/1Eg37hTk0K3IVOviwK9hdfYVmwJ7mKZi6TgV5UdZa/+A3vxl1hr8aNQcKp33wkeC6I/lQf7wSyK2m6Ii95EPkUrWcNrsSz/tNd0hQaeHSqYR2w6CpvXUDV4K7B4g0R8op5OzvKkoDPEqkT2YKXZxCIpTgXkSkklJyrenj7ZX2TXQNFMDvFjs3Fby4N3ZBaiwFIb4TDOJCFemX0Z/8GaxC+JrOFz4RdjvR5XrTy7/CW3D3JmcgIJql7+L/I1dGibLrwmpXIzoCwVYF36CX/+oqsqwb9nMxAiiW7QAu2OMinOMP5RBzggIf7dEEcMo0LQsD3Tf4XdJgpprMsZgu1/w2yTt/xc4u2E5IxBW1mgJIe1cPmCndMsDJAJqCyE4G16HposYdZoaS3gLQ/qY0xFfcctaKSRNbsj6u0PPXotli5gj3jWM1t8h0+vu3Bqw== 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:(13230028)(4636009)(346002)(376002)(396003)(136003)(39860400002)(451199021)(40470700004)(46966006)(36840700001)(36860700001)(82310400005)(47076005)(966005)(478600001)(7696005)(2616005)(426003)(83380400001)(336012)(53546011)(1076003)(26005)(6286002)(186003)(16526019)(2906002)(5660300002)(40460700003)(36756003)(70206006)(356005)(4326008)(7636003)(70586007)(82740400003)(55016003)(40480700001)(8936002)(8676002)(41300700001)(316002)(86362001)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:44:29.2707 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9b66b5cc-ca46-4ae0-1391-08db7547a040 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: BN8NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8086 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 06/27/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=c1e167a07823cf4bbbb8cdd9df8113e0039eb18e Thanks. Xueming Li --- >From c1e167a07823cf4bbbb8cdd9df8113e0039eb18e Mon Sep 17 00:00:00 2001 From: Rahul Bhansali Date: Thu, 18 May 2023 21:19:01 +0530 Subject: [PATCH] event/cnxk: fix mempool cookies check Cc: Xueming Li [ upstream commit f575eda2c0dd72e6c6c76ed003e9bb652c571907 ] Fix for mempool cookies get mark to be done before meta to mbuf processing. Fixes: 7a709964d9bb ("net/cnxk: use NPA batch burst free for meta buffers") Signed-off-by: Rahul Bhansali --- drivers/event/cnxk/cn10k_worker.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn10k_worker.h index df37ab6380..a93d40ed40 100644 --- a/drivers/event/cnxk/cn10k_worker.h +++ b/drivers/event/cnxk/cn10k_worker.h @@ -100,9 +100,6 @@ cn10k_wqe_to_mbuf(uint64_t wqe, const uint64_t __mbuf, uint8_t port_id, (flags & NIX_RX_OFFLOAD_TSTAMP_F ? 8 : 0); struct rte_mbuf *mbuf = (struct rte_mbuf *)__mbuf; - /* Mark mempool obj as "get" as it is alloc'ed by NIX */ - RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1); - cn10k_nix_cqe_to_mbuf((struct nix_cqe_hdr_s *)wqe, tag, (struct rte_mbuf *)mbuf, lookup_mem, mbuf_init | ((uint64_t)port_id) << 48, flags); @@ -239,6 +236,10 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws, uint64_t *u64, mbuf = u64[1] - sizeof(struct rte_mbuf); rte_prefetch0((void *)mbuf); + + /* Mark mempool obj as "get" as it is alloc'ed by NIX */ + RTE_MEMPOOL_CHECK_COOKIES(((struct rte_mbuf *)mbuf)->pool, (void **)&mbuf, 1, 1); + if (flags & NIX_RX_OFFLOAD_SECURITY_F) { const uint64_t mbuf_init = 0x100010000ULL | RTE_PKTMBUF_HEADROOM | -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:01.092656400 +0800 +++ 0096-event-cnxk-fix-mempool-cookies-check.patch 2023-06-25 14:31:58.545773900 +0800 @@ -1 +1 @@ -From f575eda2c0dd72e6c6c76ed003e9bb652c571907 Mon Sep 17 00:00:00 2001 +From c1e167a07823cf4bbbb8cdd9df8113e0039eb18e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f575eda2c0dd72e6c6c76ed003e9bb652c571907 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -17 +19 @@ -index 071b216d33..24bdba6ffa 100644 +index df37ab6380..a93d40ed40 100644 @@ -20 +22 @@ -@@ -22,9 +22,6 @@ cn10k_wqe_to_mbuf(uint64_t wqe, const uint64_t __mbuf, uint8_t port_id, +@@ -100,9 +100,6 @@ cn10k_wqe_to_mbuf(uint64_t wqe, const uint64_t __mbuf, uint8_t port_id, @@ -30 +32 @@ -@@ -164,6 +161,10 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws, uint64_t *u64, +@@ -239,6 +236,10 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws, uint64_t *u64,