From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F207FA0518 for ; Fri, 24 Jul 2020 14:09:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EA2CB1C1DB; Fri, 24 Jul 2020 14:09:10 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id E68521C1DB for ; Fri, 24 Jul 2020 14:09:09 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id r4so5130176wrx.9 for ; Fri, 24 Jul 2020 05:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yq9wao9coB6RTJ3cXqNsoUenWCh76dnvTivfvlIPEwc=; b=F/M+SLT3C7GtAhqZDKJY22x2GXeILRBJbM3/RxAdXJMuD2/5eA6YhHxedCbHlJXmxm tsLcKNRBJMUBsRIz81wSWPfBDre6J+OTXJAB1ZGM2nDzcUqxJIYR8YbTl6GsMc4T7mc+ pMJtzMimeuj4+VukC9waaIoSwrnGW9Y6v1CNMqdJWAkRlcx28tavf+CU87ELKksEII1C U1O2UXRjBUJ56kZ+XkP9+Km8QMjZvp69k2t6LGq5EQ78hUdc2G3aR6qabME7rGKxZsu0 4EOWtjeRCugCS9QxEOVhyBK6DuYwFKuGWFicGGQQrQ6dNiu7VvrNOdFFCuqhzeNcbjKc nkZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yq9wao9coB6RTJ3cXqNsoUenWCh76dnvTivfvlIPEwc=; b=f83MLPYnKLAtW/7pyMbfL3m/hs5l+v8D/LG+UfHe/A76Jk+ymEgqsWWJnOfleggT5k WC/MWc9KukaEkP3LuWdusL2U01a/1brBKb+wQEZGlRaOXSmSohVQM4DJi24yEY8ft3c+ qjWj+tcnaBfwfqqxEbhohzTz0rYlvxMZv+4dbyeiLENq1eGpTN8alZVc/VqgVionmUeW B0Lh1LqFr+ff+cSZ0leIqC4q2QEWw0pyWA7T5aLSMKE6EhUwW0NLS2tUs1g7N1nnS9my p2BWP82FPp4S0RLK9vR6KWplzqZgWXiYfRBBArZaDMWsdZgZ+d4S1iBz4ucvoMRos0S7 T/Aw== X-Gm-Message-State: AOAM530EwtKBXtoCG8/ECTIeH/oN1IRPC4+LRRP+W1z7IM/0/iKMEeWD 1yax0v1GljZFTg4BziKfPcxcjy399qeYbQ== X-Google-Smtp-Source: ABdhPJz6tyux9Mb7PTEzvAFFH5Q0arVuaPie14UzM0Q4asJ0614yqgF4Vyz4MgcryCGjZEAgMrtK9g== X-Received: by 2002:adf:dcc9:: with SMTP id x9mr9182248wrm.153.1595592549715; Fri, 24 Jul 2020 05:09:09 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h5sm1429497wrc.97.2020.07.24.05.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:09:09 -0700 (PDT) From: luca.boccassi@gmail.com To: Maxime Coquelin Cc: Chenbo Xia , dpdk stable Date: Fri, 24 Jul 2020 12:59:27 +0100 Message-Id: <20200724120030.1863487-129-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost: fix virtio ready flag check' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 19.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 07/26/20. 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. Thanks. Luca Boccassi --- >From 385684bc4e054f7119841a2503a79a393d5b5ea0 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Mon, 6 Jul 2020 13:24:45 +0200 Subject: [PATCH] vhost: fix virtio ready flag check [ upstream commit 1c3df72bda9893784267d02d2c6a3fd0047c38cd ] Before checking whether the device is ready is done a check on whether the RUNNING flag is set. Then the READY flag is set if virtio_is_ready() returns true. While it seems to not cause any issue, it makes more sense to check whether the READY flag is set and not the RUNNING one. Fixes: c0674b1bc898 ("vhost: move the device ready check at proper place") Signed-off-by: Maxime Coquelin Reviewed-by: Chenbo Xia --- lib/librte_vhost/vhost_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 31080be2b..82270c514 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -2792,7 +2792,7 @@ skip_to_post_handle: return -1; } - if (!(dev->flags & VIRTIO_DEV_RUNNING) && virtio_is_ready(dev)) { + if (!(dev->flags & VIRTIO_DEV_READY) && virtio_is_ready(dev)) { dev->flags |= VIRTIO_DEV_READY; if (!(dev->flags & VIRTIO_DEV_RUNNING)) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:53.502580306 +0100 +++ 0129-vhost-fix-virtio-ready-flag-check.patch 2020-07-24 12:53:48.423008994 +0100 @@ -1,8 +1,10 @@ -From 1c3df72bda9893784267d02d2c6a3fd0047c38cd Mon Sep 17 00:00:00 2001 +From 385684bc4e054f7119841a2503a79a393d5b5ea0 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Mon, 6 Jul 2020 13:24:45 +0200 Subject: [PATCH] vhost: fix virtio ready flag check +[ upstream commit 1c3df72bda9893784267d02d2c6a3fd0047c38cd ] + Before checking whether the device is ready is done a check on whether the RUNNING flag is set. Then the READY flag is set if virtio_is_ready() returns true. @@ -12,7 +14,6 @@ the RUNNING one. Fixes: c0674b1bc898 ("vhost: move the device ready check at proper place") -Cc: stable@dpdk.org Signed-off-by: Maxime Coquelin Reviewed-by: Chenbo Xia @@ -21,13 +22,13 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c -index aa8605523..bac3e8971 100644 +index 31080be2b..82270c514 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c -@@ -2842,7 +2842,7 @@ skip_to_post_handle: +@@ -2792,7 +2792,7 @@ skip_to_post_handle: + return -1; } - - if (!(dev->flags & VIRTIO_DEV_RUNNING) && virtio_is_ready(dev)) { + if (!(dev->flags & VIRTIO_DEV_READY) && virtio_is_ready(dev)) { dev->flags |= VIRTIO_DEV_READY;