| Message ID | 20120120081658.50747.10625.stgit@amd-6168-8-1.englab.nay.redhat.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, Jan 20, 2012 at 04:16:59PM +0800, Jason Wang wrote: > Signed-off-by: Jason Wang <jasowang@redhat.com> Good catch. Note: this fixes a bug introduced by 7b21e34fd1c272e3a8c3846168f2f6287a4cd72b. It's probably a good idea to mention this is the commit log. Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > drivers/virtio/virtio_ring.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index 79e1b29..78428a8 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -35,7 +35,7 @@ > #define virtio_rmb(vq) \ > do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0) > #define virtio_wmb(vq) \ > - do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0) > + do { if ((vq)->weak_barriers) smp_wmb(); else wmb(); } while(0) > #else > /* We must force memory ordering even if guest is UP since host could be > * running on another CPU, but SMP barriers are defined to barrier() in that -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, 22 Jan 2012 13:47:46 +0200, "Michael S. Tsirkin" <mst@redhat.com> wrote: > On Fri, Jan 20, 2012 at 04:16:59PM +0800, Jason Wang wrote: > > Signed-off-by: Jason Wang <jasowang@redhat.com> > > Good catch. > Note: this fixes a bug introduced by > 7b21e34fd1c272e3a8c3846168f2f6287a4cd72b. > It's probably a good idea to mention > this is the commit log. > > Acked-by: Michael S. Tsirkin <mst@redhat.com> Thanks, applied! Cheers, Rusty. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 79e1b29..78428a8 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -35,7 +35,7 @@ #define virtio_rmb(vq) \ do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0) #define virtio_wmb(vq) \ - do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0) + do { if ((vq)->weak_barriers) smp_wmb(); else wmb(); } while(0) #else /* We must force memory ordering even if guest is UP since host could be * running on another CPU, but SMP barriers are defined to barrier() in that
Signed-off-by: Jason Wang <jasowang@redhat.com> --- drivers/virtio/virtio_ring.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html