From: Isaku Yamahata Subject: [PATCH 2/4] linux/blktap: fix racy memory refernce with ring_ok Date: Tue, 28 Apr 2009 12:01:18 +0900 Message-ID: <20090428030118.GA17992@nm.localhost.valinux.co.jp> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="BXVAT5kNtrzKuDFl" Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-ia64-devel-bounces@lists.xensource.com Errors-To: xen-ia64-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Isaku Yamahata , jbeulich@novell.com, xen-ia64-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --BXVAT5kNtrzKuDFl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline blktap: fix race memory refernce with ring_ok. fix race memory refernce with ring_ok. ring_ok is shared by mmapping process and blktap kernel thread. Signed-off-by: Isaku Yamahata diff --git a/drivers/xen/blktap/blktap.c b/drivers/xen/blktap/blktap.c --- a/drivers/xen/blktap/blktap.c +++ b/drivers/xen/blktap/blktap.c @@ -617,6 +617,9 @@ static int blktap_release(struct inode * if (!info) return 0; + info->ring_ok = 0; + smp_wmb(); + info->dev_inuse = 0; DPRINTK("Freeing device [/dev/xen/blktap%d]\n",info->minor); @@ -717,6 +720,7 @@ static int blktap_mmap(struct file *filp #endif info->vma = vma; + smp_wmb(); info->ring_ok = 1; return 0; fail: @@ -1390,6 +1394,7 @@ static void dispatch_rw_block_io(blkif_t WPRINTK("blktap: ring not ready for requests!\n"); goto fail_response; } + smp_rmb(); if (RING_FULL(&info->ufe_ring)) { WPRINTK("blktap: fe_ring is full, can't add " --BXVAT5kNtrzKuDFl Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="1-fix-race-in-blktap.patch" blktap: fix race memory refernce with ring_ok. fix race memory refernce with ring_ok. ring_ok is shared by mmapping process and blktap kernel thread. Signed-off-by: Isaku Yamahata diff --git a/drivers/xen/blktap/blktap.c b/drivers/xen/blktap/blktap.c --- a/drivers/xen/blktap/blktap.c +++ b/drivers/xen/blktap/blktap.c @@ -617,6 +617,9 @@ static int blktap_release(struct inode * if (!info) return 0; + info->ring_ok = 0; + smp_wmb(); + info->dev_inuse = 0; DPRINTK("Freeing device [/dev/xen/blktap%d]\n",info->minor); @@ -717,6 +720,7 @@ static int blktap_mmap(struct file *filp #endif info->vma = vma; + smp_wmb(); info->ring_ok = 1; return 0; fail: @@ -1390,6 +1394,7 @@ static void dispatch_rw_block_io(blkif_t WPRINTK("blktap: ring not ready for requests!\n"); goto fail_response; } + smp_rmb(); if (RING_FULL(&info->ufe_ring)) { WPRINTK("blktap: fe_ring is full, can't add " --BXVAT5kNtrzKuDFl Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-ia64-devel mailing list Xen-ia64-devel@lists.xensource.com http://lists.xensource.com/xen-ia64-devel --BXVAT5kNtrzKuDFl--