[PATCH 1/2] lightnvm: warn if irqs are disabled in lock laddr

[PATCH 1/2] lightnvm: warn if irqs are disabled in lock laddr

[Javier González]

Add a warning if irqs are disabled when locking a new address in rrpc.
The typical path to a new request does not disable irqs, but this is not
guaranteed in the future.

Signed-off-by: Javier González <javier@cnexlabs.com>
---
 drivers/lightnvm/rrpc.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/lightnvm/rrpc.h b/drivers/lightnvm/rrpc.h
index dfca5c4..c27283a 100644
--- a/drivers/lightnvm/rrpc.h
+++ b/drivers/lightnvm/rrpc.h
@@ -184,6 +184,8 @@ static int __rrpc_lock_laddr(struct rrpc *rrpc, sector_t laddr,
 	sector_t laddr_end = laddr + pages - 1;
 	struct rrpc_inflight_rq *rtmp;
 
+	WARN_ON(irqs_disabled());
+
 	spin_lock_irq(&rrpc->inflights.lock);
 	list_for_each_entry(rtmp, &rrpc->inflights.reqs, list) {
 		if (unlikely(request_intersects(rtmp, laddr, laddr_end))) {
-- 
2.1.4

[PATCH 2/2] lightnvm: fix request intersection locking in rrpc

[Javier González]

This patch fixes an error on the calculation of intersecting logical
addresses; it contemplates the case where a new request including
several addresses intersects with a single locked address. This case is
typical when multiple pages are sent in a new request, while GC - which
at the moment sends one address at the time - is running.

Signed-off-by: Javier González <javier@cnexlabs.com>
---
 drivers/lightnvm/rrpc.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/lightnvm/rrpc.h b/drivers/lightnvm/rrpc.h
index c27283a..3989d65 100644
--- a/drivers/lightnvm/rrpc.h
+++ b/drivers/lightnvm/rrpc.h
@@ -174,8 +174,7 @@ static inline sector_t rrpc_get_sector(sector_t laddr)
 static inline int request_intersects(struct rrpc_inflight_rq *r,
 				sector_t laddr_start, sector_t laddr_end)
 {
-	return (laddr_end >= r->l_start && laddr_end <= r->l_end) &&
-		(laddr_start >= r->l_start && laddr_start <= r->l_end);
+	return (laddr_end >= r->l_start) && (laddr_start <= r->l_end);
 }
 
 static int __rrpc_lock_laddr(struct rrpc *rrpc, sector_t laddr,
-- 
2.1.4

Re: [PATCH 2/2] lightnvm: fix request intersection locking in rrpc

[Matias Bjørling]

On 02/01/2016 11:34 AM, Javier González wrote:
> This patch fixes an error on the calculation of intersecting logical
> addresses; it contemplates the case where a new request including
> several addresses intersects with a single locked address. This case is
> typical when multiple pages are sent in a new request, while GC - which
> at the moment sends one address at the time - is running.
> 
> Signed-off-by: Javier González <javier@cnexlabs.com>
> ---
>  drivers/lightnvm/rrpc.h | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/lightnvm/rrpc.h b/drivers/lightnvm/rrpc.h
> index c27283a..3989d65 100644
> --- a/drivers/lightnvm/rrpc.h
> +++ b/drivers/lightnvm/rrpc.h
> @@ -174,8 +174,7 @@ static inline sector_t rrpc_get_sector(sector_t laddr)
>  static inline int request_intersects(struct rrpc_inflight_rq *r,
>  				sector_t laddr_start, sector_t laddr_end)
>  {
> -	return (laddr_end >= r->l_start && laddr_end <= r->l_end) &&
> -		(laddr_start >= r->l_start && laddr_start <= r->l_end);
> +	return (laddr_end >= r->l_start) && (laddr_start <= r->l_end);
>  }
>  
>  static int __rrpc_lock_laddr(struct rrpc *rrpc, sector_t laddr,
> 
Thanks, applied for next -rc.

Re: [PATCH 1/2] lightnvm: warn if irqs are disabled in lock laddr

[Matias Bjørling]

On 02/01/2016 11:34 AM, Javier González wrote:
> Add a warning if irqs are disabled when locking a new address in rrpc.
> The typical path to a new request does not disable irqs, but this is not
> guaranteed in the future.
> 
> Signed-off-by: Javier González <javier@cnexlabs.com>
> ---
>  drivers/lightnvm/rrpc.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/lightnvm/rrpc.h b/drivers/lightnvm/rrpc.h
> index dfca5c4..c27283a 100644
> --- a/drivers/lightnvm/rrpc.h
> +++ b/drivers/lightnvm/rrpc.h
> @@ -184,6 +184,8 @@ static int __rrpc_lock_laddr(struct rrpc *rrpc, sector_t laddr,
>  	sector_t laddr_end = laddr + pages - 1;
>  	struct rrpc_inflight_rq *rtmp;
>  
> +	WARN_ON(irqs_disabled());
> +
>  	spin_lock_irq(&rrpc->inflights.lock);
>  	list_for_each_entry(rtmp, &rrpc->inflights.reqs, list) {
>  		if (unlikely(request_intersects(rtmp, laddr, laddr_end))) {
> 

Thanks, applied for next -rc.