diff mbox series

[02/10] net/virtio: fix interrupt helper for packed ring

Message ID	20190319064312.13743-3-tiwei.bie@intel.com (mailing list archive)
State	Accepted, archived
Delegated to:	Maxime Coquelin
Headers	From: Tiwei Bie <tiwei.bie@intel.com> To: maxime.coquelin@redhat.com, zhihong.wang@intel.com, dev@dpdk.org Cc: stable@dpdk.org Date: Tue, 19 Mar 2019 14:43:04 +0800 Message-Id: <20190319064312.13743-3-tiwei.bie@intel.com> In-Reply-To: <20190319064312.13743-1-tiwei.bie@intel.com> References: <20190319064312.13743-1-tiwei.bie@intel.com> Subject: [dpdk-dev] [PATCH 02/10] net/virtio: fix interrupt helper for packed ring Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	net/virtio: cleanups and fixes for packed/split ring \| [00/10] net/virtio: cleanups and fixes for packed/split ring [01/10] net/virtio: fix typo in packed ring init [02/10] net/virtio: fix interrupt helper for packed ring [03/10] net/virtio: add missing barrier in interrupt enable [04/10] net/virtio: optimize flags update for packed ring [05/10] net/virtio: refactor virtqueue structure [06/10] net/virtio: drop redundant suffix in packed ring structure [07/10] net/virtio: drop unused field in Tx region structure [08/10] net/virtio: add interrupt helper for split ring [09/10] net/virtio: add ctrl vq helper for split ring [10/10] net/virtio: improve batching in standard Rx path

Checks

Context	Check	Description
ci/Intel-compilation	success	Compilation OK
ci/checkpatch	success	coding style OK

Commit Message

Tiwei Bie March 19, 2019, 6:43 a.m. UTC

  When disabling interrupt, the shadow event flags should also be
updated accordingly. The unnecessary wmb is also dropped.

Fixes: e9f4feb7e622 ("net/virtio: add packed virtqueue helpers")
Cc: stable@dpdk.org

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
---
 drivers/net/virtio/virtqueue.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Maxime Coquelin March 19, 2019, 12:48 p.m. UTC | #1

On 3/19/19 7:43 AM, Tiwei Bie wrote:
> When disabling interrupt, the shadow event flags should also be
> updated accordingly. The unnecessary wmb is also dropped.
> 
> Fixes: e9f4feb7e622 ("net/virtio: add packed virtqueue helpers")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
> ---
>   drivers/net/virtio/virtqueue.h | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime

diff mbox series

Patch

diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index ca9d8e6e3..24fa873c3 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -321,12 +321,13 @@  vring_desc_init_split(struct vring_desc *dp, uint16_t n)
 static inline void
 virtqueue_disable_intr_packed(struct virtqueue *vq)
 {
-	uint16_t *event_flags = &vq->ring_packed.driver_event->desc_event_flags;
-
-	*event_flags = RING_EVENT_FLAGS_DISABLE;
+	if (vq->event_flags_shadow != RING_EVENT_FLAGS_DISABLE) {
+		vq->event_flags_shadow = RING_EVENT_FLAGS_DISABLE;
+		vq->ring_packed.driver_event->desc_event_flags =
+			vq->event_flags_shadow;
+	}
 }
 
-
 /**
  * Tell the backend not to interrupt us.
  */
@@ -348,7 +349,6 @@  virtqueue_enable_intr_packed(struct virtqueue *vq)
 	uint16_t *event_flags = &vq->ring_packed.driver_event->desc_event_flags;
 
 	if (vq->event_flags_shadow == RING_EVENT_FLAGS_DISABLE) {
-		virtio_wmb(vq->hw->weak_barriers);
 		vq->event_flags_shadow = RING_EVENT_FLAGS_ENABLE;
 		*event_flags = vq->event_flags_shadow;
 	}