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 21C73A034F for ; Wed, 10 Nov 2021 07:58:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C44B40142; Wed, 10 Nov 2021 07:58:42 +0100 (CET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08on2084.outbound.protection.outlook.com [40.107.101.84]) by mails.dpdk.org (Postfix) with ESMTP id 2E39841100 for ; Wed, 10 Nov 2021 07:58:41 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CUlIXAKuJMHlEO/jGpn3OegUnpVZaEjabojHVz0wUUnEppYNq5hArtWg+geW1JittUwFBp77wuFs1cPxZOLmqrnBgT23Bllx/D+mkF4lVZdsngek9uZB+CeZAX4GvcCj4KE/8JkZIhVFsptX9acweqOPuQiQHdRfp9B+qSLJlpK2QK6dyLTu66NXh1qTQ2eV9GHr2rnEgz9ex4JI9Fmcq9tqRmTs1FoGIKHb3ilQQ5Fb9tnX6Z+CZSXWhDyPgycyli+H4QJojz8H3KDvqdf4zBKnc5hlz0Bx8bOwvMlqT7WrbLUccEQ4+0kC8Gv2NE0k0QD1yMUGw3m+qoDhiR7GRg== 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=DTvA/BQvL5Pct7vdt7RhqOH7StV4WcBIB095WSXWAOU=; b=hQXFhpx0bEI5YT6V0U7Dp+X3QQ0+zsp97YSnYygwozYxQFGC++WEjPVicTxQ5xbyw0P61ePg14Vfm9JRXDwFU77NbvozDd7bPzP4DwULsrXLGVmoqOn+jXKPukZVR0/4FDm3lE0FR1G3v+vvx+QxxIT0AAClCERfd8PBnCLbDzZRNZcnnFEo0S4autPnRzus41Ziatl5rgugJIJgeVhM6xxdWiNJrFRWLb08uZ8uCyp11WpKLAinc23yTD9DmFfSIcjWiic7Myzk3pZHZlGxX4yfFs6vjidG4y6UoS1VO8TpJAPmEMCcjhKw0CV3iXuIeAVI4+yBxDEpWLPlLmcjdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=DTvA/BQvL5Pct7vdt7RhqOH7StV4WcBIB095WSXWAOU=; b=QtdqNHkpvsL2uIA57VEwrmLnpjRq+v7VewrgmoLISJox1+1wnVg4A5uVfjiv68dcgvgOHVR3R20dCdVS0yBZhemo0zjPGbgOrq7djc/v1b6fRpLmrNHtQcx2IntELIp2atdttOPIo0tkYVwU1mIdSoevFbBm8oBXQsK2R9XFZfnHgI6pbHvYe4DZrytIOgAlVC4FuoOSnUIIXIO8FFkB+VK23EiI9CxPSo3nz9fMqzZBPQec3j/UF9lpLsZfOly/QUwZ0odxlTcstxq0Yfj5hBPP1/roLe7pnPcGnAX1u4KI/i6n/ipM7Rwm0R0ppBygeJjbklmH5XdJxwHWmuCKZA== Received: from DS7PR06CA0026.namprd06.prod.outlook.com (2603:10b6:8:54::16) by DM5PR1201MB0122.namprd12.prod.outlook.com (2603:10b6:4:57::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:58:37 +0000 Received: from DM6NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:8:54:cafe::bd) by DS7PR06CA0026.outlook.office365.com (2603:10b6:8:54::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:58:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT056.mail.protection.outlook.com (10.13.173.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:58:37 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:58:34 +0000 From: Xueming Li To: Xueming Li CC: Luca Boccassi , Viacheslav Ovsiienko , dpdk stable Date: Wed, 10 Nov 2021 14:32:01 +0800 Message-ID: <20211110063216.2744012-238-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f76f788e-20b6-4f09-cc25-08d9a4178529 X-MS-TrafficTypeDiagnostic: DM5PR1201MB0122: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nOqOlcXRwJ8HbcCzODygKfFI8teYH/XsT5I9PI5vAm6mHd4hp47WNT/rsbfeNeHvYKWPQGLjuu4mtP8W90p/1UHskoBdBy7i9eBaJOzPbDarHq4lj1RSIybyiB9z77ZxBEsFxUbTmyUZjcJww6f+s/dKkxTlwk1aFnY8VL4o2YZHWVs4UsxAOYXNuaMTY/p97icDjpwK5fO7JJ9ZRa3LQobzuNFg/qbeUDQAZeTBpJcyxX5meVgFvfGZiGOHaM9rKrh8JKiE9ACPlnXrL+eFqQDpHoqKVmIyN4wsVfJLD7A2SFWuYoN8C5nN+y7PUcuY/Q2G9bVHIZRpFHFN7u+K3f5JiH+s60Gm1CwE5E1s5V6OQXLctqvxWq0B9oTecanlFvZrg1gB8UYw1iCUl/RszatUtbyK9eR6K/xlnk3mbPLoY+o0jTywxQjaUkmr7uoMEKST5BUMKNKEPD4U5UkW2AVlDdMChJnweNwpjKjEG7N2oSMkX2YPLCz2D+ipUhZPCw8QHJmYQyx17EAQB3R93Rqs91gLs2BeTOU4Hgg67onV2XiPJPsibfxVKf3YbaQd6Al2XZ3QhuDndysfUH6M2gcjq181RYGsQweKb42+yGE2CtKGqTmIWM448whokkiPWGGxriY23S7Wp23wV2fxGCLtrcDGHLTWFztDr0m7OcTvphySjusVI7zK20WDOyquSMwoFBRr4X10lMeiDZKKaUErXJrQEQPl0e9bNF8Jomw9IQq8O1JcMD91vPm/eDezmxex+yXE+1UYMvDUMMLa94fTPDBY5sK0whDqX5xCJ0AupTr9EAZnx/C9iQqi2lwKKfkiXJNbj1G5FKyI+uqEAQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(82310400003)(36860700001)(8936002)(4001150100001)(53546011)(4326008)(7049001)(36756003)(7696005)(55016002)(356005)(83380400001)(54906003)(7636003)(47076005)(86362001)(70586007)(426003)(1076003)(6200100001)(36906005)(6666004)(966005)(6862004)(2906002)(6286002)(70206006)(5660300002)(508600001)(8676002)(316002)(16526019)(336012)(26005)(37006003)(186003)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:58:37.3758 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f76f788e-20b6-4f09-cc25-08d9a4178529 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0122 Subject: [dpdk-stable] patch 'net/mlx5: fix Rx queue memory allocation return value' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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/12/21. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/2d734fb867e06e6622ae632eda8d2d6c16bd0ff9 Thanks. Xueming Li --- >From 2d734fb867e06e6622ae632eda8d2d6c16bd0ff9 Mon Sep 17 00:00:00 2001 From: Xueming Li Date: Thu, 4 Nov 2021 20:33:11 +0800 Subject: [PATCH] net/mlx5: fix Rx queue memory allocation return value Cc: Xueming Li [ upstream commit fdb67b84a52970ae06b54464a449b6f503f5a7ab ] If error happened during Rx queue mbuf allocation, boolean value returned. From description, return value should be error number. This patch returns negative error number. Fixes: 0f20acbf5eda ("net/mlx5: implement vectorized MPRQ burst") Signed-off-by: Xueming Li Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxq.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index b5268df57d..ed38c1eea0 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -198,7 +198,7 @@ error: * Pointer to RX queue structure. * * @return - * 0 on success, errno value on failure. + * 0 on success, negative errno value on failure. */ static int rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl) @@ -289,7 +289,7 @@ error: * Pointer to RX queue structure. * * @return - * 0 on success, errno value on failure. + * 0 on success, negative errno value on failure. */ int rxq_alloc_elts(struct mlx5_rxq_ctrl *rxq_ctrl) @@ -302,7 +302,9 @@ rxq_alloc_elts(struct mlx5_rxq_ctrl *rxq_ctrl) */ if (mlx5_rxq_mprq_enabled(&rxq_ctrl->rxq)) ret = rxq_alloc_elts_mprq(rxq_ctrl); - return (ret || rxq_alloc_elts_sprq(rxq_ctrl)); + if (ret == 0) + ret = rxq_alloc_elts_sprq(rxq_ctrl); + return ret; } /** -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:12.332042781 +0800 +++ 0237-net-mlx5-fix-Rx-queue-memory-allocation-return-value.patch 2021-11-10 14:17:02.070744455 +0800 @@ -1 +1 @@ -From fdb67b84a52970ae06b54464a449b6f503f5a7ab Mon Sep 17 00:00:00 2001 +From 2d734fb867e06e6622ae632eda8d2d6c16bd0ff9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fdb67b84a52970ae06b54464a449b6f503f5a7ab ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 9220bb2c15..4567b43c1b 100644 +index b5268df57d..ed38c1eea0 100644 @@ -24 +26 @@ -@@ -129,7 +129,7 @@ error: +@@ -198,7 +198,7 @@ error: @@ -33 +35 @@ -@@ -220,7 +220,7 @@ error: +@@ -289,7 +289,7 @@ error: @@ -42 +44 @@ -@@ -233,7 +233,9 @@ rxq_alloc_elts(struct mlx5_rxq_ctrl *rxq_ctrl) +@@ -302,7 +302,9 @@ rxq_alloc_elts(struct mlx5_rxq_ctrl *rxq_ctrl)