From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 3369CA00E6 for ; Tue, 16 Apr 2019 16:38:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 179E51B4D3; Tue, 16 Apr 2019 16:38:32 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 9D2411B4F7 for ; Tue, 16 Apr 2019 16:38:28 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 11E8981229; Tue, 16 Apr 2019 14:38:28 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-214.ams2.redhat.com [10.36.117.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 057CF1001E92; Tue, 16 Apr 2019 14:38:26 +0000 (UTC) From: Kevin Traynor To: Tiwei Bie Cc: Maxime Coquelin , dpdk stable Date: Tue, 16 Apr 2019 15:36:50 +0100 Message-Id: <20190416143719.21601-32-ktraynor@redhat.com> In-Reply-To: <20190416143719.21601-1-ktraynor@redhat.com> References: <20190416143719.21601-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 16 Apr 2019 14:38:28 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio: add barrier in interrupt enable' has been queued to LTS release 18.11.2 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 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/24/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. Kevin Traynor --- >From 4d06e68e88a603eb8ca13e815498eedefd12c748 Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Tue, 19 Mar 2019 14:43:05 +0800 Subject: [PATCH] net/virtio: add barrier in interrupt enable [ upstream commit 8f66bc4ac3c0d4a11252d860f495abd806aa871f ] Typically, after enabling Rx interrupt, a check should be done to make sure that there is no new incoming packets before going to sleep. So a barrier is needed to make sure that any following check won't happen before the interrupt is actually enabled. Fixes: c056be239db5 ("net/virtio: add Rx interrupt enable/disable functions") Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_ethdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index a1096287e..1767140b7 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -729,4 +729,5 @@ virtio_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) virtqueue_enable_intr(vq); + virtio_mb(); return 0; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-16 15:34:26.617302709 +0100 +++ 0032-net-virtio-add-barrier-in-interrupt-enable.patch 2019-04-16 15:34:25.179179972 +0100 @@ -1,35 +1,31 @@ -From 8f66bc4ac3c0d4a11252d860f495abd806aa871f Mon Sep 17 00:00:00 2001 +From 4d06e68e88a603eb8ca13e815498eedefd12c748 Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Tue, 19 Mar 2019 14:43:05 +0800 Subject: [PATCH] net/virtio: add barrier in interrupt enable +[ upstream commit 8f66bc4ac3c0d4a11252d860f495abd806aa871f ] + Typically, after enabling Rx interrupt, a check should be done to make sure that there is no new incoming packets before going to sleep. So a barrier is needed to make sure that any following check won't happen before the interrupt is actually enabled. Fixes: c056be239db5 ("net/virtio: add Rx interrupt enable/disable functions") -Cc: stable@dpdk.org Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin --- - drivers/net/virtio/virtio_ethdev.c | 2 ++ - 1 file changed, 2 insertions(+) + drivers/net/virtio/virtio_ethdev.c | 1 + + 1 file changed, 1 insertion(+) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c -index 78ba7bd29..ff16fb63e 100644 +index a1096287e..1767140b7 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c -@@ -851,8 +851,10 @@ static int - virtio_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) - { -+ struct virtio_hw *hw = dev->data->dev_private; - struct virtnet_rx *rxvq = dev->data->rx_queues[queue_id]; - struct virtqueue *vq = rxvq->vq; +@@ -729,4 +729,5 @@ virtio_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) virtqueue_enable_intr(vq); -+ virtio_mb(hw->weak_barriers); ++ virtio_mb(); return 0; } --