lkml.org 
[lkml]   [2021]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 37/46] mm/workingset: Convert workingset_refault() to take a folio
    Date
    This nets us 178 bytes of savings from removing calls to compound_head.
    The three callers all grow a little, but each of them will be converted
    to use folios soon, so that's fine.

    Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    ---
    include/linux/swap.h | 4 ++--
    mm/filemap.c | 2 +-
    mm/memory.c | 3 ++-
    mm/swap.c | 6 +++---
    mm/swap_state.c | 2 +-
    mm/workingset.c | 34 +++++++++++++++++-----------------
    6 files changed, 26 insertions(+), 25 deletions(-)

    diff --git a/include/linux/swap.h b/include/linux/swap.h
    index d1cb67cdb476..35d3dba422a8 100644
    --- a/include/linux/swap.h
    +++ b/include/linux/swap.h
    @@ -323,7 +323,7 @@ static inline swp_entry_t folio_swap_entry(struct folio *folio)
    /* linux/mm/workingset.c */
    void workingset_age_nonresident(struct lruvec *lruvec, unsigned long nr_pages);
    void *workingset_eviction(struct page *page, struct mem_cgroup *target_memcg);
    -void workingset_refault(struct page *page, void *shadow);
    +void workingset_refault(struct folio *folio, void *shadow);
    void workingset_activation(struct folio *folio);

    /* Only track the nodes of mappings with shadow entries */
    @@ -344,7 +344,7 @@ extern unsigned long nr_free_buffer_pages(void);
    /* linux/mm/swap.c */
    extern void lru_note_cost(struct lruvec *lruvec, bool file,
    unsigned int nr_pages);
    -extern void lru_note_cost_page(struct page *);
    +extern void lru_note_cost_folio(struct folio *);
    extern void lru_cache_add(struct page *);
    void mark_page_accessed(struct page *);
    void folio_mark_accessed(struct folio *);
    diff --git a/mm/filemap.c b/mm/filemap.c
    index dd360721c72b..673094ce67da 100644
    --- a/mm/filemap.c
    +++ b/mm/filemap.c
    @@ -981,7 +981,7 @@ int add_to_page_cache_lru(struct page *page, struct address_space *mapping,
    */
    WARN_ON_ONCE(PageActive(page));
    if (!(gfp_mask & __GFP_WRITE) && shadow)
    - workingset_refault(page, shadow);
    + workingset_refault(page_folio(page), shadow);
    lru_cache_add(page);
    }
    return ret;
    diff --git a/mm/memory.c b/mm/memory.c
    index a8f0ddd9e84a..d37f0f898f65 100644
    --- a/mm/memory.c
    +++ b/mm/memory.c
    @@ -3364,7 +3364,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)

    shadow = get_shadow_from_swap_cache(entry);
    if (shadow)
    - workingset_refault(page, shadow);
    + workingset_refault(page_folio(page),
    + shadow);

    lru_cache_add(page);

    diff --git a/mm/swap.c b/mm/swap.c
    index 53422f6b7db1..2ed00cfd03ac 100644
    --- a/mm/swap.c
    +++ b/mm/swap.c
    @@ -313,10 +313,10 @@ void lru_note_cost(struct lruvec *lruvec, bool file, unsigned int nr_pages)
    } while ((lruvec = parent_lruvec(lruvec)));
    }

    -void lru_note_cost_page(struct page *page)
    +void lru_note_cost_folio(struct folio *folio)
    {
    - lru_note_cost(mem_cgroup_page_lruvec(page, page_pgdat(page)),
    - page_is_file_lru(page), thp_nr_pages(page));
    + lru_note_cost(mem_cgroup_folio_lruvec(folio),
    + folio_is_file_lru(folio), folio_nr_pages(folio));
    }

    static void __folio_activate(struct folio *folio, struct lruvec *lruvec)
    diff --git a/mm/swap_state.c b/mm/swap_state.c
    index 272ea2108c9d..1c8e8b3aa10b 100644
    --- a/mm/swap_state.c
    +++ b/mm/swap_state.c
    @@ -503,7 +503,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
    mem_cgroup_swapin_uncharge_swap(entry);

    if (shadow)
    - workingset_refault(page, shadow);
    + workingset_refault(page_folio(page), shadow);

    /* Caller will initiate read into locked page */
    lru_cache_add(page);
    diff --git a/mm/workingset.c b/mm/workingset.c
    index 37cdcda96afd..2c8f211daafe 100644
    --- a/mm/workingset.c
    +++ b/mm/workingset.c
    @@ -271,17 +271,17 @@ void *workingset_eviction(struct page *page, struct mem_cgroup *target_memcg)
    }

    /**
    - * workingset_refault - evaluate the refault of a previously evicted page
    - * @page: the freshly allocated replacement page
    - * @shadow: shadow entry of the evicted page
    + * workingset_refault - evaluate the refault of a previously evicted folio
    + * @page: the freshly allocated replacement folio
    + * @shadow: shadow entry of the evicted folio
    *
    * Calculates and evaluates the refault distance of the previously
    - * evicted page in the context of the node and the memcg whose memory
    + * evicted folio in the context of the node and the memcg whose memory
    * pressure caused the eviction.
    */
    -void workingset_refault(struct page *page, void *shadow)
    +void workingset_refault(struct folio *folio, void *shadow)
    {
    - bool file = page_is_file_lru(page);
    + bool file = folio_is_file_lru(folio);
    struct mem_cgroup *eviction_memcg;
    struct lruvec *eviction_lruvec;
    unsigned long refault_distance;
    @@ -299,10 +299,10 @@ void workingset_refault(struct page *page, void *shadow)
    rcu_read_lock();
    /*
    * Look up the memcg associated with the stored ID. It might
    - * have been deleted since the page's eviction.
    + * have been deleted since the folio's eviction.
    *
    * Note that in rare events the ID could have been recycled
    - * for a new cgroup that refaults a shared page. This is
    + * for a new cgroup that refaults a shared folio. This is
    * impossible to tell from the available data. However, this
    * should be a rare and limited disturbance, and activations
    * are always speculative anyway. Ultimately, it's the aging
    @@ -338,14 +338,14 @@ void workingset_refault(struct page *page, void *shadow)
    refault_distance = (refault - eviction) & EVICTION_MASK;

    /*
    - * The activation decision for this page is made at the level
    + * The activation decision for this folio is made at the level
    * where the eviction occurred, as that is where the LRU order
    - * during page reclaim is being determined.
    + * during folio reclaim is being determined.
    *
    - * However, the cgroup that will own the page is the one that
    + * However, the cgroup that will own the folio is the one that
    * is actually experiencing the refault event.
    */
    - memcg = page_memcg(page);
    + memcg = folio_memcg(folio);
    lruvec = mem_cgroup_lruvec(memcg, pgdat);

    inc_lruvec_state(lruvec, WORKINGSET_REFAULT_BASE + file);
    @@ -373,15 +373,15 @@ void workingset_refault(struct page *page, void *shadow)
    if (refault_distance > workingset_size)
    goto out;

    - SetPageActive(page);
    - workingset_age_nonresident(lruvec, thp_nr_pages(page));
    + folio_set_active_flag(folio);
    + workingset_age_nonresident(lruvec, folio_nr_pages(folio));
    inc_lruvec_state(lruvec, WORKINGSET_ACTIVATE_BASE + file);

    - /* Page was active prior to eviction */
    + /* Folio was active prior to eviction */
    if (workingset) {
    - SetPageWorkingset(page);
    + folio_set_workingset_flag(folio);
    /* XXX: Move to lru_cache_add() when it supports new vs putback */
    - lru_note_cost_page(page);
    + lru_note_cost_folio(folio);
    inc_lruvec_state(lruvec, WORKINGSET_RESTORE_BASE + file);
    }
    out:
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-06-22 14:51    [W:4.453 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site