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 5EBC3431D5 for ; Sun, 22 Oct 2023 16:29:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5872B40EA5; Sun, 22 Oct 2023 16:29:30 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2047.outbound.protection.outlook.com [40.107.223.47]) by mails.dpdk.org (Postfix) with ESMTP id A770740EA5 for ; Sun, 22 Oct 2023 16:29:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gQKCLlGwDyAkeoK9O9j9EYOhP/4X0Gdl4qGriRBGDJtMNWWV4I6x6HKGEv3azbhqDJ/mcD6AsH+7qn3vHfgQDWtpT6XLIyYvTjpNgJHd4tUAjwtDTNbzwPmk7+Cw+Bu/FBH5u9erbZFyy3wIkVKKBO5VWRTiJhhLR7H+nkwmGow6V9t9SIqHnfsZKJGFs1TzNkLovNsUD/b7DzWxmF91qUnUy7Hslybi/6cTkCQqPJXvzqAhecmSUCgiTTVS0wfOBD8jvT1xBG2mzvIJatMhHphFAgXY2N/XDrg6RCykitI6eAWMt7r4CfNaH7LXFXxL+P28qVy8irfviqjEowbHjA== 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=q/f6Om5vFRr3ZNOOfdw7WzBbz/PR/2d+yXG3cegOwIc=; b=Xplz3TFJ6wgylfL4+MqZNhuBnziE0cc9ZzVCDW9KZJDfjLkKdwF0CFDM8U5dH0JqNIIGPu5pK9FSBbcod8xQ/sMlFjbS/9/i8gweaIrAuEQnn6w2aILq2wxkEGTvKZvUz7ZIKbvEBtGnhHSyUN7w/qNBR6N2vm6OsvcksyAOEPU/L0Dyynyp6R/P9WapYN9CpYEVAxW8onR4BaccJ4mp56vbTh9lzKrwlSIb7MK68ofu1r0Gi2Rpf0kd3tzJo7KeNjvtRmpz6DVvzRgS7a2ne+gs5pAi/TZTDR5eSWAqfccshWDezyNwTA9IqGAld5j0qQhUiutRpQ14292woaOIKg== 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=q/f6Om5vFRr3ZNOOfdw7WzBbz/PR/2d+yXG3cegOwIc=; b=jDszEJvA4JE2fvpUpsHRFbPXean00+SeGleFXZA30qZj8urqvXx9mbEG4gd+rv783OnRtXtrccIq+kfCWmujd9lJFPThO+tS2Krxa6PzklkOEPCn4hB03Pb6waTVDM2GHLDyaIu+zGNK7YQxipBhaXDKRD7f4NvgdIbaDUGsWzFLpjyVQ7ysRilBY2ZYPSOapHPtegjWaqDG1Pse5wBYlAw+uce5N/bLroIp2cqoXC3JYRCQ8x7NOtA3zxr1+VIunDQRANGhPr50Rfinb+MI8kAXxuIHG/bKHvU9R6tQ5v9fZ/GZuGLsAIi4e/vYVXV9Jsin+PsQhQzZ+fU2RX1oUw== Received: from SJ0PR05CA0151.namprd05.prod.outlook.com (2603:10b6:a03:339::6) by BL0PR12MB4916.namprd12.prod.outlook.com (2603:10b6:208:1ce::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31; Sun, 22 Oct 2023 14:29:26 +0000 Received: from CO1PEPF000044F3.namprd05.prod.outlook.com (2603:10b6:a03:339:cafe::e) by SJ0PR05CA0151.outlook.office365.com (2603:10b6:a03:339::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.14 via Frontend Transport; Sun, 22 Oct 2023 14:29:26 +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 CO1PEPF000044F3.mail.protection.outlook.com (10.167.241.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:29:25 +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; Sun, 22 Oct 2023 07:29:16 -0700 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; Sun, 22 Oct 2023 07:29:15 -0700 From: Xueming Li To: Harman Kalra CC: Ashwin Sekhar T K , dpdk stable Subject: patch 'mempool/cnxk: fix free from non-EAL threads' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:41 +0800 Message-ID: <20231022142250.10324-73-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-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: CO1PEPF000044F3:EE_|BL0PR12MB4916:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f8229e0-55a0-42ea-0780-08dbd30b4acf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y3iEd1EUVuyGrIK0S1bfFJuF92KO/GnpYlYTkYvbvUoY2A7ZQZ77JacLcPYFWwQyPz1oVJE2KIq3W4Kwt2+lTBJ43wyjpEbb4EhhByR+JsAoCqQ6eMQMCQKqM3Bmqt3J99RqDQI/PpqAPiUlztMbfJZziDhJxYByiGAC4TmPrYI0PzQcCGg3YI4WOUsY7t8RP30JTeLGkDK/VMHOVvgGhgnSPLXYeygiSyu9FvBwY0V5nIxBoZMm5ztAqWFgnvEk8EkV7AbETv7d9O2osQ6EvtKqa0RhuKZ7hUarkiVE3+kBWMFAYODJqCg9Y30VztRDQg6NasexPerbkho4S5ToJHu8l0G4q+VhFxazTWOClxp20QYvqmtGq3OR7vKGsnzBeGDHEtqCtH60Ifq6DpEVis63hbIDjsW7RH5mU9IxSp+BPGeUOvcM82X517Qr4pzNxVMOXcpSEKz9E9nrtZ3mueVASZXmpLtJ4AD+wEyzrDhe9Yxz4+Tq+NazjwHiHkDv8rJ4dxevNvJwubjuy+ybsuprayxnaERZDaKmmhp8e6qVXdxAjKa6oTs1AumCQvgcar/vfhy/Yjblug0zCyfRx41XDq7C+jQGeRd0yUb1krpf5iMmZWgGCzd4X6yjCjr4PS5Xxv1yTLwI/3LLvJXHepFKscRNc6cO5+CT9MoF7B+zCEkAl/KRH5hqsSUR5PetBg1UcQCma4tZrMdHuJLlBeQ0ly7OQbjeB9so1yNCV9FjSnC2DrAAMDcpLPUDQOsJH/RhDtCn64BFI8wBdoGU5w== 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)(4636009)(396003)(39850400004)(136003)(346002)(376002)(230922051799003)(82310400011)(1800799009)(64100799003)(451199024)(186009)(36840700001)(46966006)(40470700004)(55016003)(40460700003)(40480700001)(70586007)(54906003)(70206006)(86362001)(41300700001)(5660300002)(6916009)(316002)(6666004)(7696005)(966005)(478600001)(8936002)(36756003)(4326008)(8676002)(2906002)(4001150100001)(36860700001)(356005)(7636003)(16526019)(26005)(2616005)(426003)(336012)(6286002)(1076003)(53546011)(47076005)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:29:25.5302 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5f8229e0-55a0-42ea-0780-08dbd30b4acf 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: CO1PEPF000044F3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4916 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 11/15/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=0da4d859cda17cce000e86e3d2ccdf6680894e08 Thanks. Xueming Li --- >From 0da4d859cda17cce000e86e3d2ccdf6680894e08 Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Tue, 22 Aug 2023 22:31:56 +0530 Subject: [PATCH] mempool/cnxk: fix free from non-EAL threads Cc: Xueming Li [ upstream commit e97668dd1e34c7049a7a568bb945f739d7eff9da ] For non-EAL pthreads, rte_lcore_id() will not be valid. So, batch free cannot be used as those threads won't have dedicated lmtlines. So, fallback to bulk alloc in such cases. Fixes: ecbc731a2286 ("mempool/cnxk: add cn10k batch enqueue") Signed-off-by: Harman Kalra Signed-off-by: Ashwin Sekhar T K --- drivers/mempool/cnxk/cn10k_mempool_ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mempool/cnxk/cn10k_mempool_ops.c b/drivers/mempool/cnxk/cn10k_mempool_ops.c index ff0015d8de..310624730b 100644 --- a/drivers/mempool/cnxk/cn10k_mempool_ops.c +++ b/drivers/mempool/cnxk/cn10k_mempool_ops.c @@ -151,6 +151,12 @@ cn10k_mempool_enq(struct rte_mempool *mp, void *const *obj_table, */ rte_io_wmb(); + /* For non-EAL threads, rte_lcore_id() will not be valid. Hence + * fallback to bulk alloc + */ + if (unlikely(rte_lcore_id() == LCORE_ID_ANY)) + return cnxk_mempool_enq(mp, obj_table, n); + if (n == 1) { roc_npa_aura_op_free(mp->pool_id, 1, ptr[0]); return 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:37.025279200 +0800 +++ 0072-mempool-cnxk-fix-free-from-non-EAL-threads.patch 2023-10-22 22:17:34.296723700 +0800 @@ -1 +1 @@ -From e97668dd1e34c7049a7a568bb945f739d7eff9da Mon Sep 17 00:00:00 2001 +From 0da4d859cda17cce000e86e3d2ccdf6680894e08 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e97668dd1e34c7049a7a568bb945f739d7eff9da ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 41b755b52b..2e46204c8d 100644 +index ff0015d8de..310624730b 100644 @@ -23 +25 @@ -@@ -162,6 +162,12 @@ cn10k_mempool_enq(struct rte_mempool *mp, void *const *obj_table, +@@ -151,6 +151,12 @@ cn10k_mempool_enq(struct rte_mempool *mp, void *const *obj_table,