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 F41BA42ECF for ; Thu, 20 Jul 2023 17:32:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F042842C54; Thu, 20 Jul 2023 17:32:30 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 62D89400D6 for ; Thu, 20 Jul 2023 17:32:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TtKfifMwysjqta0S8ajBrFDvr7d2Cb1P+0kFlfK8zJ4=; b=H3t0v++1/xAGFj3MDPcbD0jJ9zvO736mAn3hHGWFbvpJqQCL10+egB59kEA+ayT9i9jj63 5Nd8OM6adOUPZv9LUhijZ+3QW26B3qeIh/D9Cd4LDE58DfLijeJKadQmrw8jI7RxTHL6LN 1cVt6KB6GyyiibSSn9m7wT0lBnxjnL4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-615-_Zp2wRXgOCuXairpTc4Q9g-1; Thu, 20 Jul 2023 11:21:54 -0400 X-MC-Unique: _Zp2wRXgOCuXairpTc4Q9g-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 85C1C88719C; Thu, 20 Jul 2023 15:21:29 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E0254CD0E1; Thu, 20 Jul 2023 15:21:28 +0000 (UTC) From: Kevin Traynor 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 21.11.5 Date: Thu, 20 Jul 2023 16:18:08 +0100 Message-ID: <20230720151942.262154-57-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2c2d4e88a8a6e933f4969c34b8f2097e197fb35b Thanks. Kevin --- >From 2c2d4e88a8a6e933f4969c34b8f2097e197fb35b 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 [ 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 df9ee9fde6..8b9b3d951f 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1797,4 +1797,5 @@ 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)) { @@ -1808,9 +1809,10 @@ virtio_configure_intr(struct rte_eth_dev *dev) } - 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; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:01.924975202 +0100 +++ 0057-net-virtio-propagate-interrupt-configuration-error-v.patch 2023-07-20 16:17:54.777750981 +0100 @@ -1 +1 @@ -From 5a475f73b084029444c7b83229aa9a4b6b3dac0c Mon Sep 17 00:00:00 2001 +From 2c2d4e88a8a6e933f4969c34b8f2097e197fb35b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5a475f73b084029444c7b83229aa9a4b6b3dac0c ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 07e53d2b97..a81110e70a 100644 +index df9ee9fde6..8b9b3d951f 100644 @@ -23 +24 @@ -@@ -1354,4 +1354,5 @@ virtio_configure_intr(struct rte_eth_dev *dev) +@@ -1797,4 +1797,5 @@ virtio_configure_intr(struct rte_eth_dev *dev) @@ -29 +30 @@ -@@ -1365,9 +1366,10 @@ virtio_configure_intr(struct rte_eth_dev *dev) +@@ -1808,9 +1809,10 @@ virtio_configure_intr(struct rte_eth_dev *dev)