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 8499A42D46 for ; Sun, 25 Jun 2023 08:42:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 786DC40ED8; Sun, 25 Jun 2023 08:42:08 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2071.outbound.protection.outlook.com [40.107.212.71]) by mails.dpdk.org (Postfix) with ESMTP id 5041840A7F for ; Sun, 25 Jun 2023 08:42:07 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RVf2k/qamirfAPvPUkYyo6p36v3CHfRWiK13RwGUTmyhqaTsu65fz7z9D/Eha5v5aOD0e/LAlmMmU8KuD5fJfFaYyTMogZdjLvqUiPwIa8hE4pLzvZwtp8AjXxwnqVeaoEyd/DS2Q92xnBOZZmTIbADWG0uxqm00+6xcuYRvLYBiJ5v//LvvkyTEgyefisRW02t2tY3XLiywgXK6rPeNztr7O3e7ibRV+nVlC24kvrrqJZU6jEIV1IF4YlTxtYn3nG7Q3jqW2F3sc97MlzeRR2NHS8L3eXnj65ZaFEQnE50W10wDpj+rptM8aMtuCD3G6bxw319aTjV+SpBPkgFwtw== 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=+eERajECjS1jFQx0MHv0XFd6g9v0kfVMtf/J2a2PTXM=; b=oWHDGCWgnegn9YQ3onRque/py0n+/qMrDTJGydA6Fs2nonEDhv9vyHBWJ/41IDUsS5PeHrULxg6VQBVWJdm1UQIJZXcCD+MPTJ7Bno4eFSjC/hlsPe8h8+rODPgcSxmdN1FwLeBunedLYeakKdMkLaTd7Droo3xw/SvKRy4wPUNAArmXpHQi8IM5KxKISMo7LNWw4pYZz0WVALwv6GgL8rL4Adz8xGHAC8uRBelYhhPK6dGczPmp/RgyxtLv0fiAT0hkKpAS1WYy1z0wwwE6yGdKdmdr/cGmPl47cSkZSthkTC+8DmDS1NIp2HRjqandMixTTK5XH+kMWtYZxzmTxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=gmail.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=+eERajECjS1jFQx0MHv0XFd6g9v0kfVMtf/J2a2PTXM=; b=i1QpUsJf5rSY0fZZO5nQpMosqwZ1lYsNdOlgMbq6KkTqKct6lGKWxDFFuuSVmGfJ93ljSClqzAr8IFqkszphc+FDnamJuUaVHv7nQRlUcavz2T5a2cEUkz/3kYnaG7IzSuQVgeUwYyk9QTHANEw3lvyD82j3WrOigBC+275X/NCTuPancRU53QT1vMwo+ODr45L1L/l3zjnT7bODJUFD1eamiS66a4BIQnf+rEW1MArn8RH8dAWxoWGK7dNezn6+yZ9slMfj//LVgjKU2fEAz6f491Q4R4zmdQ4i0+3d3pr3h7WZtOkJbY/Nra1QIlLTsLyZMxIGZyHTHwKHqSkCzg== Received: from BN8PR15CA0023.namprd15.prod.outlook.com (2603:10b6:408:c0::36) by BY5PR12MB4226.namprd12.prod.outlook.com (2603:10b6:a03:203::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Sun, 25 Jun 2023 06:42:02 +0000 Received: from BN8NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:408:c0:cafe::3c) by BN8PR15CA0023.outlook.office365.com (2603:10b6:408:c0::36) 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:42:01 +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 BN8NAM11FT015.mail.protection.outlook.com (10.13.176.90) 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:42:01 +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:41:46 -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:41:45 -0700 From: Xueming Li To: Kaijun Zeng CC: Ferruh Yigit , dpdk stable Subject: patch 'net/vmxnet3: fix return code in initializing' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:47 +0800 Message-ID: <20230625063544.11183-70-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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: BN8NAM11FT015:EE_|BY5PR12MB4226:EE_ X-MS-Office365-Filtering-Correlation-Id: b439f2ef-d9b5-4b5f-5530-08db75474806 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xW5qBfdBbDPf2H9mG6t79ndRpdaetSz3t4OPTLvolLf4rgjZlei7hDbHJKxdhR7kVPlw6Pb5IqslsRmXBwczReBkjpDaOVroFQtsTHhcapdSCQAHHoX7hTjNSRddreg2gBCplKkvA/OAI5yyh4c6rBRz4Yjx+0/DQq5dcCJfH1zEWA7m7M/WBDU2nuiD++1Jg3F7ZvXYiMILQX04/nF7y3/ny+kImkMPw999RTbiyQO5WmlBpQOBUfWAjsqX/DHLWiAKHwAFW+BBkgPokhSd9SlPFtwoJO/ltElEWt9wOEUxc0nvmixaZiXZztpQt6V4H5lyrrIoYmPCgdZ4fv8kqAO71nD7t4d0B55ZcB6SM4KASHToP3kjcCCGtyWSLMIh1IAaa3jgaPP4thcu91L7m0MRZ96MaPzD+fqvaSWrmPV1lGfBkH9YALptC3cWeLQESO1wZHF9aLxIOC6jmpIAEhnY0oFyPEwb0eFUbBK+TAMcPfd5cHJaUaIpvcDU2WhlcC0Inl3k/Is44m/nhvNYjswz0TTVXF1sLKNobcCFskXFhrYun5gh4GC/TVEK1JLx9/GxSKuzaWXtPYJ+g7Vy6zKuX4Go3t44JD3q0hq+sgOgb3cL5e0obxxYpSY7BKveA0A9gGcfWc0hHJD09T+ehVGsZgNp8C9FkPJLJZuhDy5q04OIVOLnQ69FwdJ+JDS1fXNGZ4pdrHIYi9BrzzUPBUW53HTRS1vpkQ8gAOLT6U9As0F9mfT5eeQDh4+wDLsLlny39jcghOQ+AqBAUnckc7axZuoD249g0nN/ebmy0Fo= 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)(396003)(376002)(39850400004)(136003)(451199021)(36840700001)(46966006)(82310400005)(356005)(7636003)(82740400003)(55016003)(40480700001)(86362001)(1076003)(53546011)(5660300002)(2616005)(26005)(6286002)(16526019)(186003)(2906002)(478600001)(70586007)(70206006)(6916009)(54906003)(4326008)(8676002)(8936002)(316002)(966005)(7696005)(41300700001)(336012)(426003)(47076005)(83380400001)(36860700001)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:42:01.2528 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b439f2ef-d9b5-4b5f-5530-08db75474806 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: BN8NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4226 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=3a8502c73d11e7c2325a4e3db11244cc299fe5b7 Thanks. Xueming Li --- >From 3a8502c73d11e7c2325a4e3db11244cc299fe5b7 Mon Sep 17 00:00:00 2001 From: Kaijun Zeng Date: Wed, 7 Jun 2023 13:57:25 -0400 Subject: [PATCH] net/vmxnet3: fix return code in initializing Cc: Xueming Li [ upstream commit 8a2de735318b38ba93a041cb2f209889bde02689 ] Improve error handling Bugzilla ID: 1239 Fixes: dfaff37fc46d ("vmxnet3: import new vmxnet3 poll mode driver implementation") Signed-off-by: Kaijun Zeng Reviewed-by: Ferruh Yigit --- .mailmap | 1 + drivers/net/vmxnet3/vmxnet3_rxtx.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index 44d9bd97c6..79553991de 100644 --- a/.mailmap +++ b/.mailmap @@ -675,6 +675,7 @@ Jun Yang Junyu Jiang Juraj Linkeš Kai Ji +Kaijun Zeng Kaiwen Deng Kalesh AP Kamalakannan R diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index f4cade0954..14c6504505 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -1316,11 +1316,18 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev) for (j = 0; j < VMXNET3_RX_CMDRING_SIZE; j++) { /* Passing 0 as alloc_num will allocate full ring */ ret = vmxnet3_post_rx_bufs(rxq, j); - if (ret <= 0) { + + /* Zero number of descriptors in the configuration of the RX queue */ + if (ret == 0) { PMD_INIT_LOG(ERR, - "ERROR: Posting Rxq: %d buffers ring: %d", - i, j); - return -ret; + "Invalid configuration in Rx queue: %d, buffers ring: %d\n", + i, j); + return -EINVAL; + } + /* Return the error number */ + if (ret < 0) { + PMD_INIT_LOG(ERR, "Posting Rxq: %d buffers ring: %d", i, j); + return ret; } /* * Updating device with the index:next2fill to fill the -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.372827300 +0800 +++ 0069-net-vmxnet3-fix-return-code-in-initializing.patch 2023-06-25 14:31:58.425773900 +0800 @@ -1 +1 @@ -From 8a2de735318b38ba93a041cb2f209889bde02689 Mon Sep 17 00:00:00 2001 +From 3a8502c73d11e7c2325a4e3db11244cc299fe5b7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8a2de735318b38ba93a041cb2f209889bde02689 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 42f198f284..986ba9c988 100644 +index 44d9bd97c6..79553991de 100644 @@ -23 +25 @@ -@@ -687,6 +687,7 @@ Jun Yang +@@ -675,6 +675,7 @@ Jun Yang @@ -28 +29,0 @@ - Kaisen You @@ -30,0 +32 @@ + Kamalakannan R @@ -32 +34 @@ -index 148f65383e..380f41f98b 100644 +index f4cade0954..14c6504505 100644 @@ -35 +37 @@ -@@ -1337,11 +1337,18 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev) +@@ -1316,11 +1316,18 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev)