Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752193AbcKYCkW (ORCPT ); Thu, 24 Nov 2016 21:40:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46664 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751347AbcKYCkM (ORCPT ); Thu, 24 Nov 2016 21:40:12 -0500 Subject: Re: [PATCH 2/3] vringh: kill off ACCESS_ONCE() To: Mark Rutland , linux-kernel@vger.kernel.org References: <1479983114-17190-1-git-send-email-mark.rutland@arm.com> <1479983114-17190-3-git-send-email-mark.rutland@arm.com> Cc: dave@stgolabs.net, dbueso@suse.de, dvyukov@google.com, kvm@vger.kernel.org, mst@redhat.com, netdev@vger.kernel.org, paulmck@linux.vnet.ibm.com, virtualization@lists.linux-foundation.org From: Jason Wang Message-ID: <73011d9f-a5be-6b80-448d-4fd169bb05f8@redhat.com> Date: Fri, 25 Nov 2016 10:40:05 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1479983114-17190-3-git-send-email-mark.rutland@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 25 Nov 2016 02:40:12 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1771 Lines: 52 On 2016年11月24日 18:25, Mark Rutland wrote: > Despite living under drivers/ vringh.c is also used as part of the userspace > virtio tools. Before we can kill off the ACCESS_ONCE()definition in the tools, > we must convert vringh.c to use {READ,WRITE}_ONCE(). > > This patch does so, along with the required include of for > the relevant definitions. The userspace tools provide their own definitions in > their own . > > Signed-off-by: Mark Rutland > Cc: Jason Wang > Cc: Michael S. Tsirkin > Cc: kvm@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: netdev@vger.kernel.org > Cc: virtualization@lists.linux-foundation.org > --- > drivers/vhost/vringh.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c > index 3bb02c6..bb8971f 100644 > --- a/drivers/vhost/vringh.c > +++ b/drivers/vhost/vringh.c > @@ -3,6 +3,7 @@ > * > * Since these may be in userspace, we use (inline) accessors. > */ > +#include > #include > #include > #include > @@ -820,13 +821,13 @@ EXPORT_SYMBOL(vringh_need_notify_user); > static inline int getu16_kern(const struct vringh *vrh, > u16 *val, const __virtio16 *p) > { > - *val = vringh16_to_cpu(vrh, ACCESS_ONCE(*p)); > + *val = vringh16_to_cpu(vrh, READ_ONCE(*p)); > return 0; > } > > static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val) > { > - ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val); > + WRITE_ONCE(*p, cpu_to_vringh16(vrh, val)); > return 0; > } > Reviewed-by: Jason Wang