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 B00BBA04F3 for ; Thu, 19 Dec 2019 15:36:14 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A4E7D1BF7B; Thu, 19 Dec 2019 15:36:14 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 195401BF7D for ; Thu, 19 Dec 2019 15:36:14 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id d16so6183617wre.10 for ; Thu, 19 Dec 2019 06:36:14 -0800 (PST) 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=9LkginxxVtn4fX2ifqHGUiWtuLdklKJEj6sh3oti5do=; b=BdEcXlSB3eCREhVaMFZBbLaCE9C6GxHxSQ2Nzs00NAbnX0UeFd7Mgm30JjRWPRMkTu IL5ahon6GMWP7VIuN5Wr2/eFkRN2sIO9grZEG5+qUuknUkOIhKKYiAEiXXerM2H9zPqy x/FjjJdQ2GU6wPosXrb0vOTsRQ+VotYNgDDPfeKVzEJr6Iqo3uu4MZJv/g7YAhE6j0Yh oy8hkLbbZSN6KSRnzgdoqpzBeD/2BedqoWuN/O7+6SRX6dljNtq3NlQ/J60Qed7oJx+X P07+Ey4DliXeAlb5uqOg+ZNgHoNGPuD9ITVzolIIhV9Yi9Z1EL7aNM1XxHBSIAXGiW2n eniA== 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=9LkginxxVtn4fX2ifqHGUiWtuLdklKJEj6sh3oti5do=; b=jT5iiqrb03EXlFIOQgNqb6RF9XoSZDau4jdiC+LdlcQslrbrR3S5QJ4K7E8e/cmtGH oTtLKt/MJkiXOSvVaYv0T8sVqtjObyiSZO9s0Jlbu5iOdWxe2sFkkC6hF4Q61Xu57JDj xgpUgdj44RtNzDPr05xrEEMZs2xZjyzIw8y6Ki2d1fM9GvKl9t0QhP7BYvZ4nH5fnVBg Eb9HkZUhtwUu+HS+RzY/N1b5oV/UpgEE5cJHVgLScKgbse6+fV0Ks4zYxpx4RxdggZHY faKJxYvbxVcYppAVmo55LvVgdWTKwsPT1uqUZDDNmEHrRS2TQuteiaUpHxrouj7RvkUg 2cYg== X-Gm-Message-State: APjAAAUeKouufwFMLMk6gnW8kuTcvPKAI5/XYVGVgHy26X8oY16udeGR 6nf9aYmZ49rX8c+qOSNRLbA= X-Google-Smtp-Source: APXvYqyqjayIpjhITpGWq7WqWh7vZmzvqkBKoVRvv70rH0I7B8zK1U+Aim37Aa7+HHWOz6pRd5eJ9Q== X-Received: by 2002:a5d:51c6:: with SMTP id n6mr9429130wrv.250.1576766173812; Thu, 19 Dec 2019 06:36:13 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u13sm6332681wmd.36.2019.12.19.06.36.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:36:13 -0800 (PST) From: luca.boccassi@gmail.com To: Noa Ezra Cc: Matan Azrad , Maxime Coquelin , dpdk stable Date: Thu, 19 Dec 2019 14:33:00 +0000 Message-Id: <20191219143447.21506-33-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/vhost: fix redundant queue state event' has been queued to LTS release 17.11.10 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 LTS release 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. 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 fb36c3728ea5174c45d180b50dca85c07ef864a6 Mon Sep 17 00:00:00 2001 From: Noa Ezra Date: Thu, 20 Jun 2019 06:33:03 +0000 Subject: [PATCH] net/vhost: fix redundant queue state event [ upstream commit f2f0577eff3d13e761996c7390a244963b433bdc ] In some situations, when a virtual machine is starting, vring_state_changed can be called while there was no change in the queue state. This fix makes sure that there was really a change in the queue state before calling the callback for EVENT_QUEUE_STATE. Fixes: ee584e9710b9 ("vhost: add driver on top of the library") Signed-off-by: Noa Ezra Reviewed-by: Matan Azrad Reviewed-by: Maxime Coquelin --- drivers/net/vhost/rte_eth_vhost.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 7b7780c9c4..1f3b271743 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -705,6 +705,10 @@ vring_state_changed(int vid, uint16_t vring, int enable) /* won't be NULL */ state = vring_states[eth_dev->data->port_id]; rte_spinlock_lock(&state->lock); + if (state->cur[vring] == enable) { + rte_spinlock_unlock(&state->lock); + return 0; + } state->cur[vring] = enable; state->max_vring = RTE_MAX(vring, state->max_vring); rte_spinlock_unlock(&state->lock); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:27.661772986 +0000 +++ 0033-net-vhost-fix-redundant-queue-state-event.patch 2019-12-19 14:32:25.797291718 +0000 @@ -1,15 +1,16 @@ -From f2f0577eff3d13e761996c7390a244963b433bdc Mon Sep 17 00:00:00 2001 +From fb36c3728ea5174c45d180b50dca85c07ef864a6 Mon Sep 17 00:00:00 2001 From: Noa Ezra Date: Thu, 20 Jun 2019 06:33:03 +0000 Subject: [PATCH] net/vhost: fix redundant queue state event +[ upstream commit f2f0577eff3d13e761996c7390a244963b433bdc ] + In some situations, when a virtual machine is starting, vring_state_changed can be called while there was no change in the queue state. This fix makes sure that there was really a change in the queue state before calling the callback for EVENT_QUEUE_STATE. Fixes: ee584e9710b9 ("vhost: add driver on top of the library") -Cc: stable@dpdk.org Signed-off-by: Noa Ezra Reviewed-by: Matan Azrad @@ -19,10 +20,10 @@ 1 file changed, 4 insertions(+) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c -index c3ba602767..5de21f1434 100644 +index 7b7780c9c4..1f3b271743 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c -@@ -853,6 +853,10 @@ vring_state_changed(int vid, uint16_t vring, int enable) +@@ -705,6 +705,10 @@ vring_state_changed(int vid, uint16_t vring, int enable) /* won't be NULL */ state = vring_states[eth_dev->data->port_id]; rte_spinlock_lock(&state->lock);