Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751921AbbKYPfT (ORCPT ); Wed, 25 Nov 2015 10:35:19 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:36238 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750964AbbKYPfQ (ORCPT ); Wed, 25 Nov 2015 10:35:16 -0500 Message-ID: <5655D531.3090809@bjorling.me> Date: Wed, 25 Nov 2015 16:35:13 +0100 From: =?windows-1252?Q?Matias_Bj=F8rling?= Organization: Paletta User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Wenwei Tao , mb@lightnvm.io, keith.busch@intel.com, axboe@fb.com CC: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-nvme@lists.infradead.org Subject: Re: [PATCH 1/3] lightnvm: missing nvm_lock acquire References: <1448455376-5020-1-git-send-email-ww.tao0320@gmail.com> <1448455376-5020-2-git-send-email-ww.tao0320@gmail.com> In-Reply-To: <1448455376-5020-2-git-send-email-ww.tao0320@gmail.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3132 Lines: 104 On 11/25/2015 01:42 PM, Wenwei Tao wrote: > To avoid race conditions, traverse dev, media manager, > and targeet lists and also register, unregister entries > to/from them, should be always under the nvm_lock control. > > Signed-off-by: Wenwei Tao > --- > drivers/lightnvm/core.c | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c > index f659e60..39aec3a 100644 > --- a/drivers/lightnvm/core.c > +++ b/drivers/lightnvm/core.c > @@ -333,19 +333,19 @@ EXPORT_SYMBOL(nvm_register); > > void nvm_unregister(char *disk_name) > { > + down_write(&nvm_lock); > struct nvm_dev *dev = nvm_find_nvm_dev(disk_name); > > if (!dev) { > pr_err("nvm: could not find device %s to unregister\n", > disk_name); > + up_write(&nvm_lock); > return; > } > > - nvm_exit(dev); > - > - down_write(&nvm_lock); > list_del(&dev->devices); > up_write(&nvm_lock); > + nvm_exit(dev); > } > EXPORT_SYMBOL(nvm_unregister); > > @@ -365,12 +365,15 @@ static int nvm_create_target(struct nvm_dev *dev, > void *targetdata; > int ret = 0; > > + down_write(&nvm_lock); > if (!dev->mt) { > /* register with device with a supported NVM manager */ > list_for_each_entry(mt, &nvm_mgrs, list) { > ret = mt->register_mgr(dev); > - if (ret < 0) > + if (ret < 0) { > + up_write(&nvm_lock); > return ret; /* initialization failed */ > + } > if (ret > 0) { > dev->mt = mt; > break; /* successfully initialized */ > @@ -379,6 +382,7 @@ static int nvm_create_target(struct nvm_dev *dev, > > if (!ret) { > pr_info("nvm: no compatible nvm manager found.\n"); > + up_write(&nvm_lock); > return -ENODEV; > } > } > @@ -386,10 +390,10 @@ static int nvm_create_target(struct nvm_dev *dev, > tt = nvm_find_target_type(create->tgttype); > if (!tt) { > pr_err("nvm: target type %s not found\n", create->tgttype); > + up_write(&nvm_lock); > return -EINVAL; > } > > - down_write(&nvm_lock); > list_for_each_entry(t, &dev->online_targets, list) { > if (!strcmp(create->tgtname, t->disk->disk_name)) { > pr_err("nvm: target name already exists.\n"); > @@ -472,8 +476,9 @@ static int __nvm_configure_create(struct nvm_ioctl_create *create) > { > struct nvm_dev *dev; > struct nvm_ioctl_create_simple *s; > - > + down_write(&nvm_lock); > dev = nvm_find_nvm_dev(create->dev); > + up_write(&nvm_lock); > if (!dev) { > pr_err("nvm: device not found\n"); > return -EINVAL; > @@ -532,7 +537,9 @@ static int nvm_configure_show(const char *val) > return -EINVAL; > } > > + down_write(&nvm_lock); > dev = nvm_find_nvm_dev(devname); > + up_write(&nvm_lock); > if (!dev) { > pr_err("nvm: device not found\n"); > return -EINVAL; > Thanks Tao, applied. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/