[PATCH 1/2] raid5-cache: destroy mempool

[PATCH 1/2] raid5-cache: destroy mempool

[Shaohua Li]

io_unit mempool isn't destroied with recent changes.

Signed-off-by: Shaohua Li <shli@fb.com>
---
 drivers/md/raid5-cache.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index d992d62..55a905e 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -1257,6 +1257,7 @@ void r5l_exit_log(struct r5l_log *log)
 	md_unregister_thread(&log->reclaim_thread);
 	mempool_destroy(log->meta_pool);
 	bioset_free(log->bs);
+	mempool_destroy(log->io_pool);
 	kmem_cache_destroy(log->io_kc);
 	kfree(log);
 }
-- 
2.4.6

[PATCH 2/2] raid5-cache: correctly handle stripe with enough journal space

[Shaohua Li]

If there are spaces in journal, we do nothing. Likely a typo merging
recent io_unit mempool patch.

Signed-off-by: Shaohua Li <shli@fb.com>
---
 drivers/md/raid5-cache.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 55a905e..d242a36 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -494,19 +494,19 @@ int r5l_write_stripe(struct r5l_log *log, struct stripe_head *sh)
 	mutex_lock(&log->io_mutex);
 	/* meta + data */
 	reserve = (1 + write_disks) << (PAGE_SHIFT - 9);
-	if (!r5l_has_free_space(log, reserve)) {
-		spin_lock(&log->no_space_stripes_lock);
-		list_add_tail(&sh->log_list, &log->no_space_stripes);
-		spin_unlock(&log->no_space_stripes_lock);
-
-		r5l_wake_reclaim(log, reserve);
-
+	if (r5l_has_free_space(log, reserve)) {
 		ret = r5l_log_stripe(log, sh, data_pages, parity_pages);
 		if (ret) {
 			spin_lock_irq(&log->io_list_lock);
 			list_add_tail(&sh->log_list, &log->no_mem_stripes);
 			spin_unlock_irq(&log->io_list_lock);
 		}
+	} else {
+		spin_lock(&log->no_space_stripes_lock);
+		list_add_tail(&sh->log_list, &log->no_space_stripes);
+		spin_unlock(&log->no_space_stripes_lock);
+
+		r5l_wake_reclaim(log, reserve);
 	}
 
 	mutex_unlock(&log->io_mutex);
-- 
2.4.6

Re: [PATCH 1/2] raid5-cache: destroy mempool

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 750 bytes --]

On Tue, Jan 05 2016, Shaohua Li wrote:

> io_unit mempool isn't destroied with recent changes.
>
> Signed-off-by: Shaohua Li <shli@fb.com>
> ---
>  drivers/md/raid5-cache.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
> index d992d62..55a905e 100644
> --- a/drivers/md/raid5-cache.c
> +++ b/drivers/md/raid5-cache.c
> @@ -1257,6 +1257,7 @@ void r5l_exit_log(struct r5l_log *log)
>  	md_unregister_thread(&log->reclaim_thread);
>  	mempool_destroy(log->meta_pool);
>  	bioset_free(log->bs);
> +	mempool_destroy(log->io_pool);
>  	kmem_cache_destroy(log->io_kc);
>  	kfree(log);
>  }

Thanks!
I've merge that into the offending patch rather than adding it as a
separate patch.

NeilBrown

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]

Re: [PATCH 2/2] raid5-cache: correctly handle stripe with enough journal space

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 2327 bytes --]

On Tue, Jan 05 2016, Shaohua Li wrote:

> If there are spaces in journal, we do nothing. Likely a typo merging
> recent io_unit mempool patch.

Very likely.

I think the same effect as your patch can be achieved with

diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 55a905e56e8a..6d2b4789a928 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -500,7 +500,7 @@ int r5l_write_stripe(struct r5l_log *log, struct stripe_head *sh)
 		spin_unlock(&log->no_space_stripes_lock);
 
 		r5l_wake_reclaim(log, reserve);
-
+	} else {
 		ret = r5l_log_stripe(log, sh, data_pages, parity_pages);
 		if (ret) {
 			spin_lock_irq(&log->io_list_lock);

Are you OK with me just merging that into the offending patch?

Thanks,
NeilBrown

>
> Signed-off-by: Shaohua Li <shli@fb.com>
> ---
>  drivers/md/raid5-cache.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
> index 55a905e..d242a36 100644
> --- a/drivers/md/raid5-cache.c
> +++ b/drivers/md/raid5-cache.c
> @@ -494,19 +494,19 @@ int r5l_write_stripe(struct r5l_log *log, struct stripe_head *sh)
>  	mutex_lock(&log->io_mutex);
>  	/* meta + data */
>  	reserve = (1 + write_disks) << (PAGE_SHIFT - 9);
> -	if (!r5l_has_free_space(log, reserve)) {
> -		spin_lock(&log->no_space_stripes_lock);
> -		list_add_tail(&sh->log_list, &log->no_space_stripes);
> -		spin_unlock(&log->no_space_stripes_lock);
> -
> -		r5l_wake_reclaim(log, reserve);
> -
> +	if (r5l_has_free_space(log, reserve)) {
>  		ret = r5l_log_stripe(log, sh, data_pages, parity_pages);
>  		if (ret) {
>  			spin_lock_irq(&log->io_list_lock);
>  			list_add_tail(&sh->log_list, &log->no_mem_stripes);
>  			spin_unlock_irq(&log->io_list_lock);
>  		}
> +	} else {
> +		spin_lock(&log->no_space_stripes_lock);
> +		list_add_tail(&sh->log_list, &log->no_space_stripes);
> +		spin_unlock(&log->no_space_stripes_lock);
> +
> +		r5l_wake_reclaim(log, reserve);
>  	}
>  
>  	mutex_unlock(&log->io_mutex);
> -- 
> 2.4.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-raid" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]

Re: [PATCH 2/2] raid5-cache: correctly handle stripe with enough journal space

[Shaohua Li]

On Wed, Jan 06, 2016 at 12:54:28PM +1100, NeilBrown wrote:
> On Tue, Jan 05 2016, Shaohua Li wrote:
> 
> > If there are spaces in journal, we do nothing. Likely a typo merging
> > recent io_unit mempool patch.
> 
> Very likely.
> 
> I think the same effect as your patch can be achieved with
> 
> diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
> index 55a905e56e8a..6d2b4789a928 100644
> --- a/drivers/md/raid5-cache.c
> +++ b/drivers/md/raid5-cache.c
> @@ -500,7 +500,7 @@ int r5l_write_stripe(struct r5l_log *log, struct stripe_head *sh)
>  		spin_unlock(&log->no_space_stripes_lock);
>  
>  		r5l_wake_reclaim(log, reserve);
> -
> +	} else {
>  		ret = r5l_log_stripe(log, sh, data_pages, parity_pages);
>  		if (ret) {
>  			spin_lock_irq(&log->io_list_lock);
> 
> Are you OK with me just merging that into the offending patch?

sure, please go ahead