lightnvm: remove targets when corresponding nvm device exit
diff mbox

Message ID 1448380988-3988-1-git-send-email-ww.tao0320@gmail.com
State New
Headers show

Commit Message

Wenwei Tao Nov. 24, 2015, 4:03 p.m. UTC
the target should be unreachable when underlying device was gone.

Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
---
 drivers/lightnvm/core.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Comments

Matias Bjørling Nov. 24, 2015, 6:51 p.m. UTC | #1
On 11/24/2015 05:03 PM, Wenwei Tao wrote:
> the target should be unreachable when underlying device was gone.
>
> Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
> ---
>   drivers/lightnvm/core.c | 12 ++++++++++--
>   1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
> index f659e60..b95c6c4 100644
> --- a/drivers/lightnvm/core.c
> +++ b/drivers/lightnvm/core.c
> @@ -278,10 +278,18 @@ err:
>   	return ret;
>   }
>
> +static void nvm_remove_target(struct nvm_target *t);
> +

You can move the hole declaration up here.

>   static void nvm_exit(struct nvm_dev *dev)
>   {
> +	struct nvm_target *t, *n;
> +
>   	if (dev->ppalist_pool)
>   		dev->ops->destroy_dma_pool(dev->ppalist_pool);
> +	down_write(&nvm_lock);
> +	list_for_each_entry_safe(t, n, &dev->online_targets, list)
> +		nvm_remove_target(t);
> +	up_write(&nvm_lock);

list_for_each_entry_safe should be enough here.

Actually, we should properly block any creations of new targets when 
nvm_exit is called. To prevent new ones to be created while we clean up.

Let me know if you want to submit a patch for this. Else I'll just apply 
this one with the suggested changes. Thanks Tao.

>   	nvm_free(dev);
>
>   	pr_info("nvm: successfully unloaded\n");
> @@ -496,13 +504,13 @@ static int __nvm_configure_create(struct nvm_ioctl_create *create)
>
>   static int __nvm_configure_remove(struct nvm_ioctl_remove *remove)
>   {
> -	struct nvm_target *t = NULL;
> +	struct nvm_target *n, *t = NULL;
>   	struct nvm_dev *dev;
>   	int ret = -1;
>
>   	down_write(&nvm_lock);
>   	list_for_each_entry(dev, &nvm_devices, devices)
> -		list_for_each_entry(t, &dev->online_targets, list) {
> +		list_for_each_entry_safe(t, n, &dev->online_targets, list) {
>   			if (!strcmp(remove->tgtname, t->disk->disk_name)) {
>   				nvm_remove_target(t);
>   				ret = 0;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-block" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Wenwei Tao Nov. 25, 2015, 9:23 a.m. UTC | #2
I will send a patch for that.

2015-11-25 2:51 GMT+08:00 Matias <mb@lightnvm.io>:
> On 11/24/2015 05:03 PM, Wenwei Tao wrote:
>>
>> the target should be unreachable when underlying device was gone.
>>
>> Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
>> ---
>>   drivers/lightnvm/core.c | 12 ++++++++++--
>>   1 file changed, 10 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
>> index f659e60..b95c6c4 100644
>> --- a/drivers/lightnvm/core.c
>> +++ b/drivers/lightnvm/core.c
>> @@ -278,10 +278,18 @@ err:
>>         return ret;
>>   }
>>
>> +static void nvm_remove_target(struct nvm_target *t);
>> +
>
>
> You can move the hole declaration up here.
>
>>   static void nvm_exit(struct nvm_dev *dev)
>>   {
>> +       struct nvm_target *t, *n;
>> +
>>         if (dev->ppalist_pool)
>>                 dev->ops->destroy_dma_pool(dev->ppalist_pool);
>> +       down_write(&nvm_lock);
>> +       list_for_each_entry_safe(t, n, &dev->online_targets, list)
>> +               nvm_remove_target(t);
>> +       up_write(&nvm_lock);
>
>
> list_for_each_entry_safe should be enough here.
>
> Actually, we should properly block any creations of new targets when
> nvm_exit is called. To prevent new ones to be created while we clean up.
>
> Let me know if you want to submit a patch for this. Else I'll just apply
> this one with the suggested changes. Thanks Tao.
>
>
>>         nvm_free(dev);
>>
>>         pr_info("nvm: successfully unloaded\n");
>> @@ -496,13 +504,13 @@ static int __nvm_configure_create(struct
>> nvm_ioctl_create *create)
>>
>>   static int __nvm_configure_remove(struct nvm_ioctl_remove *remove)
>>   {
>> -       struct nvm_target *t = NULL;
>> +       struct nvm_target *n, *t = NULL;
>>         struct nvm_dev *dev;
>>         int ret = -1;
>>
>>         down_write(&nvm_lock);
>>         list_for_each_entry(dev, &nvm_devices, devices)
>> -               list_for_each_entry(t, &dev->online_targets, list) {
>> +               list_for_each_entry_safe(t, n, &dev->online_targets, list)
>> {
>>                         if (!strcmp(remove->tgtname, t->disk->disk_name))
>> {
>>                                 nvm_remove_target(t);
>>                                 ret = 0;
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-block" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index f659e60..b95c6c4 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -278,10 +278,18 @@  err:
 	return ret;
 }
 
+static void nvm_remove_target(struct nvm_target *t);
+
 static void nvm_exit(struct nvm_dev *dev)
 {
+	struct nvm_target *t, *n;
+
 	if (dev->ppalist_pool)
 		dev->ops->destroy_dma_pool(dev->ppalist_pool);
+	down_write(&nvm_lock);
+	list_for_each_entry_safe(t, n, &dev->online_targets, list)
+		nvm_remove_target(t);
+	up_write(&nvm_lock);
 	nvm_free(dev);
 
 	pr_info("nvm: successfully unloaded\n");
@@ -496,13 +504,13 @@  static int __nvm_configure_create(struct nvm_ioctl_create *create)
 
 static int __nvm_configure_remove(struct nvm_ioctl_remove *remove)
 {
-	struct nvm_target *t = NULL;
+	struct nvm_target *n, *t = NULL;
 	struct nvm_dev *dev;
 	int ret = -1;
 
 	down_write(&nvm_lock);
 	list_for_each_entry(dev, &nvm_devices, devices)
-		list_for_each_entry(t, &dev->online_targets, list) {
+		list_for_each_entry_safe(t, n, &dev->online_targets, list) {
 			if (!strcmp(remove->tgtname, t->disk->disk_name)) {
 				nvm_remove_target(t);
 				ret = 0;