On Sat, Jul 25, 2020 at 6:00 AM Alex Shi <alex.shi@xxxxxxxxxxxxxxxxx> wrote:
>
> It's a clean up patch w/o function changes.
>
> Signed-off-by: Alex Shi <alex.shi@xxxxxxxxxxxxxxxxx>
> Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Cc: linux-mm@xxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
Reviewed-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxxxxxxxx>
> ---
> mm/memory.c | 3 ---
> mm/swap.c | 2 ++
> mm/swap_state.c | 2 --
> mm/workingset.c | 2 --
> 4 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/mm/memory.c b/mm/memory.c
> index 87ec87cdc1ff..dafc5585517e 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -3150,10 +3150,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
> * XXX: Move to lru_cache_add() when it
> * supports new vs putback
> */
> - spin_lock_irq(&page_pgdat(page)->lru_lock);
> lru_note_cost_page(page);
> - spin_unlock_irq(&page_pgdat(page)->lru_lock);
> -
> lru_cache_add(page);
> swap_readpage(page, true);
> }
> diff --git a/mm/swap.c b/mm/swap.c
> index dc8b02cdddcb..b88ca630db70 100644
> --- a/mm/swap.c
> +++ b/mm/swap.c
> @@ -298,8 +298,10 @@ void lru_note_cost(struct lruvec *lruvec, bool file, unsigned int nr_pages)
>
> void lru_note_cost_page(struct page *page)
> {
> + spin_lock_irq(&page_pgdat(page)->lru_lock);
> lru_note_cost(mem_cgroup_page_lruvec(page, page_pgdat(page)),
> page_is_file_lru(page), hpage_nr_pages(page));
> + spin_unlock_irq(&page_pgdat(page)->lru_lock);
> }
>
> static void __activate_page(struct page *page, struct lruvec *lruvec)
> diff --git a/mm/swap_state.c b/mm/swap_state.c
> index 05889e8e3c97..080be52db6a8 100644
> --- a/mm/swap_state.c
> +++ b/mm/swap_state.c
> @@ -440,9 +440,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
> }
>
> /* XXX: Move to lru_cache_add() when it supports new vs putback */
> - spin_lock_irq(&page_pgdat(page)->lru_lock);
> lru_note_cost_page(page);
> - spin_unlock_irq(&page_pgdat(page)->lru_lock);
>
> /* Caller will initiate read into locked page */
> SetPageWorkingset(page);
> diff --git a/mm/workingset.c b/mm/workingset.c
> index 50b7937bab32..337d5b9ad132 100644
> --- a/mm/workingset.c
> +++ b/mm/workingset.c
> @@ -372,9 +372,7 @@ void workingset_refault(struct page *page, void *shadow)
> if (workingset) {
> SetPageWorkingset(page);
> /* XXX: Move to lru_cache_add() when it supports new vs putback */
> - spin_lock_irq(&page_pgdat(page)->lru_lock);
> lru_note_cost_page(page);
> - spin_unlock_irq(&page_pgdat(page)->lru_lock);
> inc_lruvec_state(lruvec, WORKINGSET_RESTORE);
> }
> out:
> --
> 1.8.3.1
>
