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 367FE431D5 for ; Sun, 22 Oct 2023 16:29:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2CCEA40E6E; Sun, 22 Oct 2023 16:29:28 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2041.outbound.protection.outlook.com [40.107.223.41]) by mails.dpdk.org (Postfix) with ESMTP id 7E8A2402C8 for ; Sun, 22 Oct 2023 16:29:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DBwywbe/hFeuXyCuRvgCGyUO6bZ8gWQLwFWpLG6xuKJd2BK2e2KmU1JuompPV1YWkuXuOKGTtZQE2iZLRLU7N7UHAIWYSscLSPi7q0zBDZYI21kOq6eV8TDl6vx6AfO96DcbJmACFP2pV/cflechWkSxInHIK23H6xiH/vVQHePfotrMmFAi/QHNpJv4nImuI+rfNbZa/lBr5W43I8DRYS5zmAyxshXdvykpzgXjWasxUDdxkNR8Ex0OKAVFZfD2Bc21UVXz3QRLmp2wSO+jJyLugLoaSzVkRFDnSXwpI1LKlUqWEo1xv5vXtSbx9ST7sc2VP1Cn1dgm/tXmjkY6Pw== 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=FmKmhsItK1MNE08FH4d3ufYjzRpvFTt35ks+7G3yVeg=; b=KoSpN5fPZS4SvaxRL2aaj2o/1GIP0o40T6nHw9rM+ezqItTJlZkd12HqEw5LLvcoztvQLqPJk7yJQ2Ai5g/YgRyzXHjpvwg92NAdssOhN2gN+8TO3ni1KSEmeVW/skSIwk2XbIeHaIP6Y1qmUAEOL7x6aUzQNxZPdcAb8E4Lqg81BijceLyop9sFF5Mz4P2qMBTvKzhyabqSyiTs9B4+pa5G7D8ZKwFlaoEHPpqZiyDDxT0nvFeXPucQXidf0XXOXwuqa0lJps9k1Lp6Mjc/qEHae7lFelVzGaoqM9TGy7GlNNWr6mI/TtNGDvCQW1JUZxNxbV29yjeFCzW8wVB1pQ== 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=FmKmhsItK1MNE08FH4d3ufYjzRpvFTt35ks+7G3yVeg=; b=aOqGeqMAWF4b5VWcMWmyDLVt/LuZTlaY8OwEIcFHZLBItDT6QDfBGO31DHj/cEuqk5FHp7hZRfQttWWKrrjwZODRcRFOqdJdKEeAz3/EgkXGkCRdsMyfDcQB1AZ7WdjJxQyD6bUJFQo0hhPOsQtq8sDd1zWH5aXUmvPl7s+/mKrM7WgzcMhJxcufT9if6VWCfR+g76slBk9wkr3G3LR+XE1tHnqJ0QJWYM1rGjjtP9apld2Qb4MXOQ3KBeVU5iEaGD4XW1p2myu6MWN0oOi1cq4/m3g8J2/jcw/kGQkUQ9p/MiO5ia6/dVDdFx7HehLh0TAJkqEC+K/nBlYEf8YA6Q== Received: from DM6PR18CA0009.namprd18.prod.outlook.com (2603:10b6:5:15b::22) by PH7PR12MB7820.namprd12.prod.outlook.com (2603:10b6:510:268::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:24 +0000 Received: from DS1PEPF00017092.namprd03.prod.outlook.com (2603:10b6:5:15b:cafe::96) by DM6PR18CA0009.outlook.office365.com (2603:10b6:5:15b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31 via Frontend Transport; Sun, 22 Oct 2023 14:29:24 +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 DS1PEPF00017092.mail.protection.outlook.com (10.167.17.135) 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:24 +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; Sun, 22 Oct 2023 07:29:18 -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:16 -0700 From: Xueming Li To: Ashwin Sekhar T K CC: dpdk stable Subject: patch 'mempool/cnxk: fix alloc from non-EAL threads' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:42 +0800 Message-ID: <20231022142250.10324-74-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: DS1PEPF00017092:EE_|PH7PR12MB7820:EE_ X-MS-Office365-Filtering-Correlation-Id: 363e2563-c9cb-4429-f878-08dbd30b4a2e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ce2X8Y2VG9gofgLFhn+h+a4mHr11olQ/mh3IdIw1yB2hmPGtRG+zhgz8bV6YVqBcDcURj27IQv4htYJwmn9az5rJYvgcgFoVR9/xuldp69Tr5BZN5PMt2dLl3C5diV8ukOz8uY22ljwqBPPiBLPy2lMIT6MI6A/ZuTYCvsWa2QUeP5K2dmnlbSEQTqaMk34PYafID1abY9wPy0HSz5/t4SlH/jBe/2z105aVidWfjplSPaDKTSBF+z1Iy9F4r4FFRrGz7Za+2/wVCnT8PZTRizGMwkfK38tEijziiQwcF9dfloPabmtoaqACPxySWpfLEquh0BNoioJvKQ1GuDKgGXtgsjU4xb6f5PdcsfF14b3dYjygsfngBNlArHJ7wFCrvlZCTqxHidT7XxGTsDVeIwPBz+D9SaQIqWrkuYTFEk1ZG0uXzmW+zywYRIDlWbNhaqOQul0V9EBMnqUtC2b0Hdjr7QYFBoijl1KgRuUfpLAphKvKsQHK8m9oLO/X9rql1d+8PFHz72mjcS3Op9Nf/mu3AOpBr6Qpb3PO6eXJNQE6yvgY6OjhrrNHw3HhnH56Dh1txkHezmPHU1gQEVc6IlGN6qXq0rjcMVIAFLd8vytTj4ObsuyzcJsEQSj65K9yFMByi5CVmHL0KK3oN31uhg7aVxPyqkn0wACYVA7DlHP3PqjPRI/tcX1vVEYHFJEOORi26MCyfjQNdsA8jzvBxKGo1XBcBKhe53E2ygA7KXGof43dcEr8IsK8mn88z6ef 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)(376002)(39850400004)(136003)(346002)(396003)(230922051799003)(82310400011)(1800799009)(451199024)(64100799003)(186009)(36840700001)(46966006)(16526019)(4001150100001)(2906002)(55016003)(41300700001)(86362001)(5660300002)(36756003)(36860700001)(4326008)(8676002)(8936002)(7696005)(478600001)(6666004)(6286002)(26005)(7636003)(1076003)(356005)(82740400003)(2616005)(6916009)(316002)(70206006)(70586007)(966005)(40480700001)(53546011)(426003)(336012)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:29:24.4344 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 363e2563-c9cb-4429-f878-08dbd30b4a2e 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: DS1PEPF00017092.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7820 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=1ef99ed9dd5ecb32f1ebac1788045281ae3d59c8 Thanks. Xueming Li --- >From 1ef99ed9dd5ecb32f1ebac1788045281ae3d59c8 Mon Sep 17 00:00:00 2001 From: Ashwin Sekhar T K Date: Tue, 22 Aug 2023 22:31:57 +0530 Subject: [PATCH] mempool/cnxk: fix alloc from non-EAL threads Cc: Xueming Li [ upstream commit b3ddd649ad063eb90035836b64b22fb4d6fea8b7 ] For non-EAL pthreads, rte_lcore_id() will not be valid. So, batch allocation cannot be used as we won't have a dedicated alloc buffer for the thread. So, fallback to bulk alloc in such cases. Fixes: 91531e63f43b ("mempool/cnxk: add cn10k batch dequeue") 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 310624730b..9d6982fdab 100644 --- a/drivers/mempool/cnxk/cn10k_mempool_ops.c +++ b/drivers/mempool/cnxk/cn10k_mempool_ops.c @@ -257,6 +257,12 @@ cn10k_mempool_deq(struct rte_mempool *mp, void **obj_table, unsigned int n) } } + /* 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_deq(mp, obj_table, n); + if (unlikely(count != n)) { /* No partial alloc allowed. Free up allocated pointers */ cn10k_mempool_enq(mp, obj_table, count); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:37.056866500 +0800 +++ 0073-mempool-cnxk-fix-alloc-from-non-EAL-threads.patch 2023-10-22 22:17:34.296723700 +0800 @@ -1 +1 @@ -From b3ddd649ad063eb90035836b64b22fb4d6fea8b7 Mon Sep 17 00:00:00 2001 +From 1ef99ed9dd5ecb32f1ebac1788045281ae3d59c8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b3ddd649ad063eb90035836b64b22fb4d6fea8b7 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 2e46204c8d..2a5aad0008 100644 +index 310624730b..9d6982fdab 100644 @@ -23,3 +25,3 @@ -@@ -332,6 +332,12 @@ cn10k_mempool_deq(struct rte_mempool *mp, void **obj_table, unsigned int n) - struct batch_op_data *op_data; - unsigned int count = 0; +@@ -257,6 +257,12 @@ cn10k_mempool_deq(struct rte_mempool *mp, void **obj_table, unsigned int n) + } + } @@ -33,3 +35,3 @@ - op_data = batch_op_data_get(mp->pool_id); - if (op_data->max_async_batch) - count = mempool_deq_batch_async(mp, obj_table, n); + if (unlikely(count != n)) { + /* No partial alloc allowed. Free up allocated pointers */ + cn10k_mempool_enq(mp, obj_table, count);