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 C5981431D5 for ; Sun, 22 Oct 2023 16:29:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD419402E2; Sun, 22 Oct 2023 16:29:24 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2060.outbound.protection.outlook.com [40.107.223.60]) by mails.dpdk.org (Postfix) with ESMTP id 4E80C402C8 for ; Sun, 22 Oct 2023 16:29:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N8C7KLjGiDrbxjZ0tqNm4nSOeOUBDv6C83JhMNQ7xx7nBPplTF65NQym6GuCjW7lKYPuY2XcH34Y+YtCM6VuRfHaSgoUR3X1wH26gYfoJ3IRQkxYi3QOzaakxITa8W/0QIxqQwMxVA697dmmP/D9Y/lFF6n/K01b253mAR0YPt0/VohIgdKr0ZNZI3JZ1C/0xQcfnkjItkswxRutpNyPEUqsT+ZSKdtW5SY0fl7XZWTTqbLHh2KnLHsxKd8vMhEksUnrscVISG4A99ReMfPucRJ4RxEfK2pSthY4Mo1sOXCzASw6NB/fb9qV8Uf9WAnN3N5GmdaLnaWgSTYGegGVvA== 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=nTS8H2BWPmSzr5wXfRnjdBPomexOdJCrSfDBloG1ecs=; b=iKWf/NcH+16u+FyolU7yu8t+A5kLZrzkeOYw1+MpdUXoOFoq1ctD+/G5xfi8qTGUPzcJvZ8/3qeVPgYDBbHx7/Zre8GjjBdcQt3PdWJRFekAN/KwrVBOz2s6APzpOCAdoTHBxBQja5JFs37ZeUm8UBbTUWNqu4uX2nIZemPa8qGdbAmRCwt4uH03r27ONTgZQ1/xd6M/2c8UsjvuKN0LfyTk1KxHjwWr+nb5q1ZRBtxiib1eiy52nuDbrE+LNWsLRXGz+0SpTTTrRBnU8NOQmw5WJrXy4spiF7VXb3tUtyUe8aS2RtrBJvWwM3UvFM96guVZ1l4tKhA+d0RV2/JUiQ== 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=nTS8H2BWPmSzr5wXfRnjdBPomexOdJCrSfDBloG1ecs=; b=YSpWxJVHN4ySIyEU3tCuAolfmgQq3yMuLB8nTGMlBAqmnxyqg2abM3zG/fLYgwu0d4gB4IMAvmJYAab3V2MqE6RMLOJMZQYAJaWVuA2PGxXUEzAYzqOFDvsuVWk/lS7IDXrpvjrRVFjO4eICV2JplEvxSJfZ6s1uha2oBswMiMp/4ppBRaNmFhsXICESeYnWQEqNjX6quVs9LN3PbI/EcbSizmC06pChKAVBmVc+UmVgxh0VbxRHMuMO3iHFQR4J4WMu4j2wGEcW5XcolJijj86zl8TBvTyfZhGOjng45YCrqqTH9fpDj8NWd8BLfq49PSI8XnlI2saMNxjvRXslVA== Received: from DM6PR18CA0032.namprd18.prod.outlook.com (2603:10b6:5:15b::45) by DM8PR12MB5429.namprd12.prod.outlook.com (2603:10b6:8:29::23) 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:21 +0000 Received: from DS1PEPF00017092.namprd03.prod.outlook.com (2603:10b6:5:15b:cafe::5a) by DM6PR18CA0032.outlook.office365.com (2603:10b6:5:15b::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33 via Frontend Transport; Sun, 22 Oct 2023 14:29:21 +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:21 +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:15 -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:13 -0700 From: Xueming Li To: Amit Prakash Shukla CC: dpdk stable Subject: patch 'dma/cnxk: fix chunk buffer failure return code' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:40 +0800 Message-ID: <20231022142250.10324-72-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_|DM8PR12MB5429:EE_ X-MS-Office365-Filtering-Correlation-Id: 9611976c-0999-43c8-998a-08dbd30b4848 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bohA9km5nJU6j8Bjtj+aTruz9qqO5VdV6Ky/f5ekN/DMLtZm9W3EUieU4zFEhQkaLRzZpgPTkFFFaQdPOUl0TM3KlQYIAl8/t0600rrNxOX80AodI5dEkMJtrJ2ngCdg7xQINhcCP4+2oQQKHvKkXy9reEYTdcNE6J/kpoYY1xwAdH8r94lqbTrI/CAZeRz8WypgUxFUm/Wq5lZYTF65+o5n5mhb3u0IIER/g1NdXGGnWCa3Z2nNi5xjUgAMxTVSiEfWMnf45zqoW3rDu6Y3BK3d31yjHYJfA2sajUYdBuiYMflcnKq5sCm2x0fprlBZQv9/34xhn87o4arYa1Wavr5kLhiDfx1jIgBar5FSEh88K7ujitvJHOWnGfsUt+DjZjetLrZ1kqX72ecWYbUv8oXuuAZ/7WFI68fu6RDYYSqIivQuh6a2Q/OHaMGGowJCxsApJJabOFBlPZVopA5nsGpABfUq2QGS4lpERLZiM50QPbIsQAaV9pCuk9vX3pRBthlXG0SqWE+NBj+7+wpKQsdPVckZ779r2qYM0lehhQnHSHOrG89CP7nMIcrKm/nLe60Y2A/GJW3HUTqObyZFJPVJkaYja/GbF9s6liAKlO6B7P4Og5WgSyWKt0fPLugWNrTwS/UHeUOBMTD5Tn/r1j5pYNE1Ilhc9uGNZKZSlx794S/YLIL+gaStH6XbXcdzRRfuyLAHblCftA3iBvE+UOeEIWlwmkY68yW9plIC9MTX4WsWyb/A68I5uK/nqEGKcICyAO0JVz+g6LZ4aDcqA3AHzyEjzyZgP3lQzwOOmDY= 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)(39850400004)(396003)(376002)(136003)(346002)(230922051799003)(64100799003)(1800799009)(451199024)(186009)(82310400011)(46966006)(36840700001)(40470700004)(53546011)(36756003)(7636003)(356005)(336012)(426003)(1076003)(2616005)(6286002)(26005)(7696005)(36860700001)(6666004)(82740400003)(316002)(70206006)(70586007)(6916009)(86362001)(55016003)(966005)(478600001)(16526019)(83380400001)(47076005)(41300700001)(4326008)(8676002)(8936002)(40460700003)(4001150100001)(2906002)(40480700001)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:29:21.2156 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9611976c-0999-43c8-998a-08dbd30b4848 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: DM8PR12MB5429 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=2b29a7975b23ec4b9750ce5b07a48ade68c94275 Thanks. Xueming Li --- >From 2b29a7975b23ec4b9750ce5b07a48ade68c94275 Mon Sep 17 00:00:00 2001 From: Amit Prakash Shukla Date: Wed, 23 Aug 2023 16:45:19 +0530 Subject: [PATCH] dma/cnxk: fix chunk buffer failure return code Cc: Xueming Li [ upstream commit 3dd31150782e32b538d6c1396701a1bc36dc2bd6 ] On chunk buffer alloc failure, ENOMEM is returned. As per DMA spec ENOSPC shall be returned on failure to allocate memory. This changeset fixes the same. Fixes: b56f1e2dad38 ("dma/cnxk: add channel operations") Signed-off-by: Amit Prakash Shukla --- drivers/dma/cnxk/cnxk_dmadev.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c index 95f47015dd..72dec60a9c 100644 --- a/drivers/dma/cnxk/cnxk_dmadev.c +++ b/drivers/dma/cnxk/cnxk_dmadev.c @@ -232,8 +232,7 @@ __dpi_queue_write(struct roc_dpi *dpi, uint64_t *cmds, int cmd_count) { uint64_t *ptr = dpi->chunk_base; - if ((cmd_count < DPI_MIN_CMD_SIZE) || (cmd_count > DPI_MAX_CMD_SIZE) || - cmds == NULL) + if ((cmd_count < DPI_MIN_CMD_SIZE) || (cmd_count > DPI_MAX_CMD_SIZE) || cmds == NULL) return -EINVAL; /* @@ -249,11 +248,15 @@ __dpi_queue_write(struct roc_dpi *dpi, uint64_t *cmds, int cmd_count) int count; uint64_t *new_buff = dpi->chunk_next; - dpi->chunk_next = - (void *)roc_npa_aura_op_alloc(dpi->aura_handle, 0); + dpi->chunk_next = (void *)roc_npa_aura_op_alloc(dpi->aura_handle, 0); if (!dpi->chunk_next) { - plt_err("Failed to alloc next buffer from NPA"); - return -ENOMEM; + plt_dp_dbg("Failed to alloc next buffer from NPA"); + + /* NPA failed to allocate a buffer. Restoring chunk_next + * to its original address. + */ + dpi->chunk_next = new_buff; + return -ENOSPC; } /* @@ -287,13 +290,17 @@ __dpi_queue_write(struct roc_dpi *dpi, uint64_t *cmds, int cmd_count) /* queue index may be greater than pool size */ if (dpi->chunk_head >= dpi->pool_size_m1) { new_buff = dpi->chunk_next; - dpi->chunk_next = - (void *)roc_npa_aura_op_alloc(dpi->aura_handle, - 0); + dpi->chunk_next = (void *)roc_npa_aura_op_alloc(dpi->aura_handle, 0); if (!dpi->chunk_next) { - plt_err("Failed to alloc next buffer from NPA"); - return -ENOMEM; + plt_dp_dbg("Failed to alloc next buffer from NPA"); + + /* NPA failed to allocate a buffer. Restoring chunk_next + * to its original address. + */ + dpi->chunk_next = new_buff; + return -ENOSPC; } + /* Write next buffer address */ *ptr = (uint64_t)new_buff; dpi->chunk_base = new_buff; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:36.992367500 +0800 +++ 0071-dma-cnxk-fix-chunk-buffer-failure-return-code.patch 2023-10-22 22:17:34.296723700 +0800 @@ -1 +1 @@ -From 3dd31150782e32b538d6c1396701a1bc36dc2bd6 Mon Sep 17 00:00:00 2001 +From 2b29a7975b23ec4b9750ce5b07a48ade68c94275 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3dd31150782e32b538d6c1396701a1bc36dc2bd6 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 0db74b454d..aa6f6c710c 100644 +index 95f47015dd..72dec60a9c 100644 @@ -22 +24 @@ -@@ -257,8 +257,7 @@ __dpi_queue_write(struct roc_dpi *dpi, uint64_t *cmds, int cmd_count) +@@ -232,8 +232,7 @@ __dpi_queue_write(struct roc_dpi *dpi, uint64_t *cmds, int cmd_count) @@ -32 +34 @@ -@@ -274,11 +273,15 @@ __dpi_queue_write(struct roc_dpi *dpi, uint64_t *cmds, int cmd_count) +@@ -249,11 +248,15 @@ __dpi_queue_write(struct roc_dpi *dpi, uint64_t *cmds, int cmd_count) @@ -52 +54 @@ -@@ -312,13 +315,17 @@ __dpi_queue_write(struct roc_dpi *dpi, uint64_t *cmds, int cmd_count) +@@ -287,13 +290,17 @@ __dpi_queue_write(struct roc_dpi *dpi, uint64_t *cmds, int cmd_count)