[PATCH] lightnvm: do device max sectors boundary check first

[PATCH] lightnvm: do device max sectors boundary check first

[Wenwei Tao]

do device max_phys_sect boundary check first, otherwise
we will allocate dma_pools for devices whose max sectors
are beyond lightnvm support and register them.

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

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index f659e60..7ecf848 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -312,6 +312,11 @@ int nvm_register(struct request_queue *q, char *disk_name,
 	list_add(&dev->devices, &nvm_devices);
 	up_write(&nvm_lock);
 
+	if (dev->ops->max_phys_sect > 256) {
+		pr_info("nvm: max sectors supported is 256.\n");
+		return -EINVAL;
+	}
+
 	if (dev->ops->max_phys_sect > 1) {
 		dev->ppalist_pool = dev->ops->create_dma_pool(dev->q,
 								"ppalist");
@@ -319,9 +324,6 @@ int nvm_register(struct request_queue *q, char *disk_name,
 			pr_err("nvm: could not create ppa pool\n");
 			return -ENOMEM;
 		}
-	} else if (dev->ops->max_phys_sect > 256) {
-		pr_info("nvm: max sectors supported is 256.\n");
-		return -EINVAL;
 	}
 
 	return 0;
-- 
1.9.1

Re: [PATCH] lightnvm: do device max sectors boundary check first

[Matias]

On 11/22/2015 12:30 PM, Wenwei Tao wrote:
> do device max_phys_sect boundary check first, otherwise
> we will allocate dma_pools for devices whose max sectors
> are beyond lightnvm support and register them.
>
> Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
> ---
>   drivers/lightnvm/core.c | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
> index f659e60..7ecf848 100644
> --- a/drivers/lightnvm/core.c
> +++ b/drivers/lightnvm/core.c
> @@ -312,6 +312,11 @@ int nvm_register(struct request_queue *q, char *disk_name,
>   	list_add(&dev->devices, &nvm_devices);
>   	up_write(&nvm_lock);
>
> +	if (dev->ops->max_phys_sect > 256) {
> +		pr_info("nvm: max sectors supported is 256.\n");
> +		return -EINVAL;
> +	}
> +
>   	if (dev->ops->max_phys_sect > 1) {
>   		dev->ppalist_pool = dev->ops->create_dma_pool(dev->q,
>   								"ppalist");
> @@ -319,9 +324,6 @@ int nvm_register(struct request_queue *q, char *disk_name,
>   			pr_err("nvm: could not create ppa pool\n");
>   			return -ENOMEM;
>   		}
> -	} else if (dev->ops->max_phys_sect > 256) {
> -		pr_info("nvm: max sectors supported is 256.\n");
> -		return -EINVAL;
>   	}
>
>   	return 0;
>
Thanks, applied.

ps. also send it to linux-block@vger.kernel.org in the future. Then we 
can get a couple more eyes on it. Thanks.