Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <81d2df40-c955-b88d-e29f-7f09796f5deb@suse.cz>
Date:   Fri, 17 Jun 2022 09:55:37 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.10.0
Subject: Re: [PATCH 7/7] mm/page_alloc: Replace local_lock with normal
 spinlock
Content-Language: en-US
To:     Yu Zhao <yuzhao@google.com>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Marek Szyprowski <m.szyprowski@samsung.com>,
        Mel Gorman <mgorman@techsingularity.net>,
        Nicolas Saenz Julienne <nsaenzju@redhat.com>,
        Marcelo Tosatti <mtosatti@redhat.com>,
        Michal Hocko <mhocko@kernel.org>,
        Hugh Dickins <hughd@google.com>,
        LKML <linux-kernel@vger.kernel.org>,
        Linux-MM <linux-mm@kvack.org>
References: <20220613125622.18628-1-mgorman@techsingularity.net>
 <20220613125622.18628-8-mgorman@techsingularity.net>
 <CGME20220615224855eucas1p1ea6d90c23ec9423dfe04b267f6dddd2a@eucas1p1.samsung.com>
 <e1c73640-3f29-bf57-b98d-84b1800cf4e3@samsung.com>
 <20220615160446.be1f75fd256d67e57b27a9fc@linux-foundation.org>
 <Yqqd5nHeAT77C4D0@google.com>
From:   Vlastimil Babka <vbabka@suse.cz>
In-Reply-To: <Yqqd5nHeAT77C4D0@google.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 6/16/22 05:05, Yu Zhao wrote:
> On Wed, Jun 15, 2022 at 04:04:46PM -0700, Andrew Morton wrote:
> 
> While we are at it, please consider this cleanup:

I suspect Mel had further plans for the API beynd this series.

...

>  #define pcp_spin_trylock_irqsave(ptr, flags)				\
> -	pcpu_spin_trylock_irqsave(struct per_cpu_pages, lock, ptr, flags)
> -
> -#define pcp_spin_unlock(ptr)						\
> -	pcpu_spin_unlock(lock, ptr)
> +({									\
> +	struct per_cpu_pages *_ret;					\
> +	pcpu_task_pin();						\
> +	_ret = this_cpu_ptr(ptr);					\
> +	if (!spin_trylock_irqsave(&_ret->lock, flags))			\

Also missing the unpin?

> +		_ret = NULL;						\
> +	_ret;								\
> +})
>  
>  #define pcp_spin_unlock_irqrestore(ptr, flags)				\
> -	pcpu_spin_unlock_irqrestore(lock, ptr, flags)
> +({									\
> +	spin_unlock_irqrestore(&ptr->lock, flags);			\
> +	pcpu_task_unpin();						\
> +})
> +
>  #ifdef CONFIG_USE_PERCPU_NUMA_NODE_ID
>  DEFINE_PER_CPU(int, numa_node);
>  EXPORT_PER_CPU_SYMBOL(numa_node);
> @@ -3488,7 +3458,7 @@ void free_unref_page(struct page *page, unsigned int order)
>  
>  	zone = page_zone(page);
>  	pcp_trylock_prepare(UP_flags);
> -	pcp = pcpu_spin_trylock_irqsave(struct per_cpu_pages, lock, zone->per_cpu_pageset, flags);
> +	pcp = pcp_spin_trylock_irqsave(zone->per_cpu_pageset, flags);
>  	if (pcp) {
>  		free_unref_page_commit(pcp, zone, page, migratetype, order);
>  		pcp_spin_unlock_irqrestore(pcp, flags);