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 D960B41D53 for ; Thu, 23 Feb 2023 16:07:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9D6E04327D; Thu, 23 Feb 2023 16:07:54 +0100 (CET) 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 04C5743274 for ; Thu, 23 Feb 2023 16:07:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164872; 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=BFbz59lvcL2zo31VxQI6Oi/TuGGTCJplNCYC/3OYOUI=; b=aI5CQauLsc0Bk1XtkuDhunfe0B9p2eF8qZIj6JRb20cB2lDNKkEtq7GPHnfAY9un/tl069 my/LLzO0qYvrXmShpD0UjGksCuwFrQEVmOSoIUokKFsMc46j/j4HaG3p55EclA3XixySgT Pcf1TWz7ccTGajsfaVbeO6buNanMpEU= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-472-eI2tEILmPtGiqGlOsCx4SA-1; Thu, 23 Feb 2023 10:07:48 -0500 X-MC-Unique: eI2tEILmPtGiqGlOsCx4SA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 521723C0D1A7; Thu, 23 Feb 2023 15:07:46 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B4BC2166B29; Thu, 23 Feb 2023 15:07:45 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Chenbo Xia , dpdk stable Subject: patch 'net/virtio-user: fix device starting failure handling' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:39 +0000 Message-Id: <20230223150631.723699-48-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.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 02/28/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/fd950290d121a773a25b75fbc4644764c82570ef Thanks. Kevin --- >From fd950290d121a773a25b75fbc4644764c82570ef Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 9 Feb 2023 10:17:01 +0100 Subject: [PATCH] net/virtio-user: fix device starting failure handling [ upstream commit c1a6f787b04e470ebe9b5a3891022195eb2bc555 ] If the device fails to start, read the status from the device and return early. Fixes: 57912824615f ("net/virtio-user: support vhost status setting") Signed-off-by: Maxime Coquelin Reviewed-by: Chenbo Xia --- drivers/net/virtio/virtio_user_ethdev.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index 16eca2f940..9ba4ea3b33 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -90,8 +90,13 @@ virtio_user_set_status(struct virtio_hw *hw, uint8_t status) ~old_status & VIRTIO_CONFIG_STATUS_FEATURES_OK) virtio_user_dev_set_features(dev); - if (status & VIRTIO_CONFIG_STATUS_DRIVER_OK) - virtio_user_start_device(dev); - else if (status == VIRTIO_CONFIG_STATUS_RESET) + + if (status & VIRTIO_CONFIG_STATUS_DRIVER_OK) { + if (virtio_user_start_device(dev)) { + virtio_user_dev_update_status(dev); + return; + } + } else if (status == VIRTIO_CONFIG_STATUS_RESET) { virtio_user_reset(hw); + } virtio_user_dev_set_status(dev, status); -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.974697814 +0000 +++ 0048-net-virtio-user-fix-device-starting-failure-handling.patch 2023-02-23 14:46:23.770235966 +0000 @@ -1 +1 @@ -From c1a6f787b04e470ebe9b5a3891022195eb2bc555 Mon Sep 17 00:00:00 2001 +From fd950290d121a773a25b75fbc4644764c82570ef Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c1a6f787b04e470ebe9b5a3891022195eb2bc555 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index d32abec327..78b1ed9ace 100644 +index 16eca2f940..9ba4ea3b33 100644 @@ -22 +23 @@ -@@ -91,8 +91,13 @@ virtio_user_set_status(struct virtio_hw *hw, uint8_t status) +@@ -90,8 +90,13 @@ virtio_user_set_status(struct virtio_hw *hw, uint8_t status)