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 B82D342D46 for ; Sun, 25 Jun 2023 08:43:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B33C840ED8; Sun, 25 Jun 2023 08:43:16 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id D355740A7F for ; Sun, 25 Jun 2023 08:43:14 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OahVSxC/CIhi62FsPDZJJwo8rPZaNb7P7tbryWTi90NFjsDYRlO2jM5N78neqOHdloirwfPBOwrpLFOoQ4kzdDR5P0eviUGUyKltIHFvZS73ooq6uIQvC3RGsaKQSVVBdDd3jZnB5F/oR/bO4cLlgDlQa/w2ipCJAhWE+x4z/KXFjCQfD9pucD4iELTiYOcBRuhnf3PBJyHjY+Hrz4CljOX8JTEYRDe9v0HyeVVPjC4I/BZABmKiTiwxBraIhI4wtSPssZ1XDGISiMNJV6RPbQKtjfK3qHij6zdXwaMFX4dPgz5y6xirL2iYFIOYIM3IdrB24hAazkEaTVnKQqrycw== 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=G8JG1P41r1PyQQiGt5fMTrqzdfLa5txNIP9GN2aAjqU=; b=A8qI8corjbH8wttdWJo+FB+vqpquO4RyXBjm41ZDHP5Pf3VdzoGs3QioTVJKsAxgjyhJqYEugiTRrWI8+8Uw0llWZeN8izk0N/kQHQR2S4yBOfQDQqK4DXnh/fGDRHxPdo8eREWfuC3E+thjOf62pmYyBgCD9GIF8cgEph3CyoPfSKLP1LSmmWm6JP3gM7B1y/aZnGt6NrXKhEkVK1ZR9RJ+b51Ku3gnxuXNkFIiQaqCSj3QIq5ZNMeG1TemGoLzMrsZepBvUsUYFsjmFXFiRwjkAwcpw1Y3f3TiOA5AFNmTzRJoxN9/mmrf2ZZe/C7lL5mmoVLBhBrwi4uTOC5HYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=oktetlabs.ru 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=G8JG1P41r1PyQQiGt5fMTrqzdfLa5txNIP9GN2aAjqU=; b=nAgJutEpKGogr+ys3VcEt1zma6riOqM7Xl/plkU6yehov49wysmf8NtYWRmBnaLBCkrn9/s5ODxkFcHjtI8Hd20NiqOQ9bz8LK82o0F6h7Y6RivLFWX2mx6pUbxe0bsJhgzF+fWwMfKdoQlusCK4J6a0Tj7vLeTA6snrhWWKeb3KN3acpmhMH/8L+vN4fuQMOK84NhO0vCquiztCnDbtbJNwuNLmAthXHerA7DviSDCf6j1HsfiGzlkwaZYGlmUTXYc+qAIaNZa0gtQJVMktmvnQ2HSAYtZPqfLDNfN4AKEON+AJhCs8ofiHl3b1GRK+cbUGRQ9x6AystcGgZVs5iA== Received: from MW4PR03CA0089.namprd03.prod.outlook.com (2603:10b6:303:b6::34) by MW4PR12MB7439.namprd12.prod.outlook.com (2603:10b6:303:22b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Sun, 25 Jun 2023 06:43:13 +0000 Received: from CO1NAM11FT101.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b6:cafe::75) by MW4PR03CA0089.outlook.office365.com (2603:10b6:303:b6::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:43:13 +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 CO1NAM11FT101.mail.protection.outlook.com (10.13.175.164) 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:43:12 +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.5; Sat, 24 Jun 2023 23:43:03 -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:43:02 -0700 From: Xueming Li To: Boleslav Stankevich CC: Andrew Rybchenko , Chenbo Xia , dpdk stable Subject: patch 'net/virtio: propagate interrupt configuration error values' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:02 +0800 Message-ID: <20230625063544.11183-85-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-Transfer-Encoding: 8bit Content-Type: text/plain 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: CO1NAM11FT101:EE_|MW4PR12MB7439:EE_ X-MS-Office365-Filtering-Correlation-Id: 5283fa1c-d97c-4367-a9a4-08db75477223 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WtZzfNNYmKqg8TtoOYqs+2zknW+xAWSELQRYWKA9s5X/8mzS4YfM6EzO9yAGssKTL7KJzUR8xPmHU3vdjvpdFxfufQ32YBNDi3lgprj1iZP0hpo/RV/JeYxxoeUfyMCbKqu0gOe7JGFfXEQYbecxCa1OO0u2444UH4y6trmOF0galJQdpqFz/eHWtnrWKuO/JfrZUDnF+TLt3hte67wEGO49WDugH09Tn6luzsUb5eX5s7imQKF84QIsIVtqzGN4FTAuzyelL8/iM/r/kUNrYbQKLjHwXn1LH+kyOwc3iiPF0sT9lQryZGebBMPxKsEPmvZ5pAMh7M+PQ9JT/p3TnGD/FgTD6y39TnZSA94Em22d0wIvaCV0lR8ZcDyPfF2suTX8XShxaRlPswMdaMqr5P2j5+3yM0xGVST50umyUiXi5kHs/aI1WPgwpaF6lc9fKr7h+oEAAE5Hf+1gKi2ev6/pe646L52iqD7q2x69z9Oa2p5W4u25k4Wdxmxsdaq2QYj6hj54srq79NZRsOEBq2aQrSHOjgpDZref7RUjDKt/XBw3yvCJezgk1P5wO0t9PVcyMOze1mllxYIfbI5PhFclO+v7fbDuOL5X3fyIcDRmY/Yp7R/sTG95402ViBeKUmoHrmuGkQqGCFccVPttrUjc7vu4D53nPnbtlzUk1aJGX7Zd55lScU0JCu+FMqigAZ122ay35jetAf3kPxKdFBPthlNOE40De43qFjVSF2IkI9+KIYfD5K4VgcmgmuMlWSFAyG2HoRHSRbvQ1qLd1Q== 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:(13230028)(4636009)(39860400002)(376002)(346002)(396003)(136003)(451199021)(36840700001)(40470700004)(46966006)(40460700003)(2906002)(7696005)(82310400005)(82740400003)(356005)(7636003)(2616005)(83380400001)(47076005)(336012)(426003)(1076003)(26005)(186003)(6286002)(16526019)(53546011)(966005)(36860700001)(55016003)(41300700001)(86362001)(54906003)(478600001)(40480700001)(316002)(70586007)(70206006)(36756003)(6916009)(4326008)(8936002)(8676002)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:43:12.0187 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5283fa1c-d97c-4367-a9a4-08db75477223 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: CO1NAM11FT101.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7439 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=a43f6d459a62bd5463e75a2bdc45580de690746b Thanks. Xueming Li --- >From a43f6d459a62bd5463e75a2bdc45580de690746b Mon Sep 17 00:00:00 2001 From: Boleslav Stankevich Date: Wed, 22 Mar 2023 13:23:24 +0300 Subject: [PATCH] net/virtio: propagate interrupt configuration error values Cc: Xueming Li [ upstream commit 5a475f73b084029444c7b83229aa9a4b6b3dac0c ] rte_intr_vec_list_alloc() may fail because of different reasons which are indicated by different negative errno values. Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle") Signed-off-by: Boleslav Stankevich Signed-off-by: Andrew Rybchenko Reviewed-by: Chenbo Xia --- drivers/net/virtio/virtio_ethdev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index b72334455e..0c0c7c78f9 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1797,6 +1797,7 @@ static int virtio_configure_intr(struct rte_eth_dev *dev) { struct virtio_hw *hw = dev->data->dev_private; + int ret; if (!rte_intr_cap_multiple(dev->intr_handle)) { PMD_INIT_LOG(ERR, "Multiple intr vector not supported"); @@ -1808,11 +1809,12 @@ virtio_configure_intr(struct rte_eth_dev *dev) return -1; } - if (rte_intr_vec_list_alloc(dev->intr_handle, "intr_vec", - hw->max_queue_pairs)) { + ret = rte_intr_vec_list_alloc(dev->intr_handle, "intr_vec", + hw->max_queue_pairs); + if (ret < 0) { PMD_INIT_LOG(ERR, "Failed to allocate %u rxq vectors", hw->max_queue_pairs); - return -ENOMEM; + return ret; } if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.744836400 +0800 +++ 0084-net-virtio-propagate-interrupt-configuration-error-v.patch 2023-06-25 14:31:58.455773900 +0800 @@ -1 +1 @@ -From 5a475f73b084029444c7b83229aa9a4b6b3dac0c Mon Sep 17 00:00:00 2001 +From a43f6d459a62bd5463e75a2bdc45580de690746b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5a475f73b084029444c7b83229aa9a4b6b3dac0c ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 07e53d2b97..a81110e70a 100644 +index b72334455e..0c0c7c78f9 100644 @@ -23 +25 @@ -@@ -1353,6 +1353,7 @@ static int +@@ -1797,6 +1797,7 @@ static int @@ -31 +33 @@ -@@ -1364,11 +1365,12 @@ virtio_configure_intr(struct rte_eth_dev *dev) +@@ -1808,11 +1809,12 @@ virtio_configure_intr(struct rte_eth_dev *dev)