linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
To: Minchan Kim <minchan@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	linux-kernel@vger.kernel.org, linux-mm@kvack.org,
	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Subject: Re: [PATCH v5 09/12] zsmalloc: separate free_zspage from putback_zspage
Date: Mon, 16 May 2016 12:15:32 +0900	[thread overview]
Message-ID: <20160516031532.GE504@swordfish> (raw)
In-Reply-To: <1462760433-32357-10-git-send-email-minchan@kernel.org>

On (05/09/16 11:20), Minchan Kim wrote:
> Currently, putback_zspage does free zspage under class->lock
> if fullness become ZS_EMPTY but it makes trouble to implement
> locking scheme for new zspage migration.
> So, this patch is to separate free_zspage from putback_zspage
> and free zspage out of class->lock which is preparation for
> zspage migration.
> 
> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
> Signed-off-by: Minchan Kim <minchan@kernel.org>


Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

	-ss

> ---
>  mm/zsmalloc.c | 27 +++++++++++----------------
>  1 file changed, 11 insertions(+), 16 deletions(-)
> 
> diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
> index 162a598a417a..5ccd83732a14 100644
> --- a/mm/zsmalloc.c
> +++ b/mm/zsmalloc.c
> @@ -1685,14 +1685,12 @@ static struct zspage *isolate_zspage(struct size_class *class, bool source)
>  
>  /*
>   * putback_zspage - add @zspage into right class's fullness list
> - * @pool: target pool
>   * @class: destination class
>   * @zspage: target page
>   *
>   * Return @zspage's fullness_group
>   */
> -static enum fullness_group putback_zspage(struct zs_pool *pool,
> -			struct size_class *class,
> +static enum fullness_group putback_zspage(struct size_class *class,
>  			struct zspage *zspage)
>  {
>  	enum fullness_group fullness;
> @@ -1701,15 +1699,6 @@ static enum fullness_group putback_zspage(struct zs_pool *pool,
>  	insert_zspage(class, zspage, fullness);
>  	set_zspage_mapping(zspage, class->index, fullness);
>  
> -	if (fullness == ZS_EMPTY) {
> -		zs_stat_dec(class, OBJ_ALLOCATED, get_maxobj_per_zspage(
> -			class->size, class->pages_per_zspage));
> -		atomic_long_sub(class->pages_per_zspage,
> -				&pool->pages_allocated);
> -
> -		free_zspage(pool, zspage);
> -	}
> -
>  	return fullness;
>  }
>  
> @@ -1755,23 +1744,29 @@ static void __zs_compact(struct zs_pool *pool, struct size_class *class)
>  			if (!migrate_zspage(pool, class, &cc))
>  				break;
>  
> -			putback_zspage(pool, class, dst_zspage);
> +			putback_zspage(class, dst_zspage);
>  		}
>  
>  		/* Stop if we couldn't find slot */
>  		if (dst_zspage == NULL)
>  			break;
>  
> -		putback_zspage(pool, class, dst_zspage);
> -		if (putback_zspage(pool, class, src_zspage) == ZS_EMPTY)
> +		putback_zspage(class, dst_zspage);
> +		if (putback_zspage(class, src_zspage) == ZS_EMPTY) {
> +			zs_stat_dec(class, OBJ_ALLOCATED, get_maxobj_per_zspage(
> +					class->size, class->pages_per_zspage));
> +			atomic_long_sub(class->pages_per_zspage,
> +					&pool->pages_allocated);
> +			free_zspage(pool, src_zspage);
>  			pool->stats.pages_compacted += class->pages_per_zspage;
> +		}
>  		spin_unlock(&class->lock);
>  		cond_resched();
>  		spin_lock(&class->lock);
>  	}
>  
>  	if (src_zspage)
> -		putback_zspage(pool, class, src_zspage);
> +		putback_zspage(class, src_zspage);
>  
>  	spin_unlock(&class->lock);
>  }
> -- 
> 1.9.1
> 
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@kvack.org.  For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
> 

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  reply	other threads:[~2016-05-16  3:15 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-09  2:20 [PATCH v5 00/13] Support non-lru page migration Minchan Kim
2016-05-09  2:20 ` [PATCH v5 01/12] mm: use put_page to free page instead of putback_lru_page Minchan Kim
2016-05-09  2:20 ` [PATCH v5 02/12] mm: migrate: support non-lru movable page migration Minchan Kim
2016-05-16  7:04   ` Sergey Senozhatsky
2016-05-17  1:16     ` Minchan Kim
2016-05-16  7:17   ` Sergey Senozhatsky
2016-05-17  1:18     ` Minchan Kim
2016-05-17  1:30       ` Sergey Senozhatsky
2016-05-09  2:20 ` [PATCH v5 03/12] mm: balloon: use general non-lru movable page feature Minchan Kim
2016-05-16 19:16   ` kbuild test robot
2016-05-09  2:20 ` [PATCH v5 04/12] zsmalloc: keep max_object in size_class Minchan Kim
2016-05-09  2:20 ` [PATCH v5 05/12] zsmalloc: use bit_spin_lock Minchan Kim
2016-05-16  1:17   ` Sergey Senozhatsky
2016-05-09  2:20 ` [PATCH v5 06/12] zsmalloc: use accessor Minchan Kim
2016-05-16  1:48   ` Sergey Senozhatsky
2016-05-09  2:20 ` [PATCH v5 07/12] zsmalloc: factor page chain functionality out Minchan Kim
2016-05-16  2:14   ` Sergey Senozhatsky
2016-05-17  1:02     ` Minchan Kim
2016-05-09  2:20 ` [PATCH v5 08/12] zsmalloc: introduce zspage structure Minchan Kim
2016-05-16  3:09   ` Sergey Senozhatsky
2016-05-17  1:14     ` Minchan Kim
2016-05-17  1:27       ` Sergey Senozhatsky
2016-05-09  2:20 ` [PATCH v5 09/12] zsmalloc: separate free_zspage from putback_zspage Minchan Kim
2016-05-16  3:15   ` Sergey Senozhatsky [this message]
2016-05-09  2:20 ` [PATCH v5 10/12] zsmalloc: use freeobj for index Minchan Kim
2016-05-09  2:20 ` [PATCH v5 11/12] zsmalloc: page migration support Minchan Kim
2016-05-16 19:33   ` kbuild test robot
2016-05-09  2:20 ` [PATCH v5 12/12] zram: use __GFP_MOVABLE for memory allocation Minchan Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160516031532.GE504@swordfish \
    --to=sergey.senozhatsky.work@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=minchan@kernel.org \
    --cc=sergey.senozhatsky@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).