The patch titled Subject: include/linux/mm_inline.h: shuffle lru list addition and deletion functions has been added to the -mm tree. Its filename is mm-shuffle-lru-list-addition-and-deletion-functions.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-shuffle-lru-list-addition-and-deletion-functions.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-shuffle-lru-list-addition-and-deletion-functions.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Yu Zhao <yuzhao@xxxxxxxxxx> Subject: include/linux/mm_inline.h: shuffle lru list addition and deletion functions These functions will call page_lru() in the following patches. Move them below page_lru() to avoid the forward declaration. Link: https://lore.kernel.org/linux-mm/20201207220949.830352-3-yuzhao@xxxxxxxxxx/ Link: https://lkml.kernel.org/r/20210122220600.906146-3-yuzhao@xxxxxxxxxx Signed-off-by: Yu Zhao <yuzhao@xxxxxxxxxx> Cc: Alex Shi <alex.shi@xxxxxxxxxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxxxx> Cc: Roman Gushchin <guro@xxxxxx> Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx> Cc: Vlastimil Babka <vbabka@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/mm_inline.h | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) --- a/include/linux/mm_inline.h~mm-shuffle-lru-list-addition-and-deletion-functions +++ a/include/linux/mm_inline.h @@ -45,27 +45,6 @@ static __always_inline void update_lru_s #endif } -static __always_inline void add_page_to_lru_list(struct page *page, - struct lruvec *lruvec, enum lru_list lru) -{ - update_lru_size(lruvec, lru, page_zonenum(page), thp_nr_pages(page)); - list_add(&page->lru, &lruvec->lists[lru]); -} - -static __always_inline void add_page_to_lru_list_tail(struct page *page, - struct lruvec *lruvec, enum lru_list lru) -{ - update_lru_size(lruvec, lru, page_zonenum(page), thp_nr_pages(page)); - list_add_tail(&page->lru, &lruvec->lists[lru]); -} - -static __always_inline void del_page_from_lru_list(struct page *page, - struct lruvec *lruvec, enum lru_list lru) -{ - list_del(&page->lru); - update_lru_size(lruvec, lru, page_zonenum(page), -thp_nr_pages(page)); -} - /** * page_lru_base_type - which LRU list type should a page be on? * @page: the page to test @@ -125,4 +104,25 @@ static __always_inline enum lru_list pag } return lru; } + +static __always_inline void add_page_to_lru_list(struct page *page, + struct lruvec *lruvec, enum lru_list lru) +{ + update_lru_size(lruvec, lru, page_zonenum(page), thp_nr_pages(page)); + list_add(&page->lru, &lruvec->lists[lru]); +} + +static __always_inline void add_page_to_lru_list_tail(struct page *page, + struct lruvec *lruvec, enum lru_list lru) +{ + update_lru_size(lruvec, lru, page_zonenum(page), thp_nr_pages(page)); + list_add_tail(&page->lru, &lruvec->lists[lru]); +} + +static __always_inline void del_page_from_lru_list(struct page *page, + struct lruvec *lruvec, enum lru_list lru) +{ + list_del(&page->lru); + update_lru_size(lruvec, lru, page_zonenum(page), -thp_nr_pages(page)); +} #endif _ Patches currently in -mm which might be from yuzhao@xxxxxxxxxx are mm-swap-dont-setpageworkingset-unconditionally-during-swapin.patch mm-use-add_page_to_lru_list.patch mm-shuffle-lru-list-addition-and-deletion-functions.patch mm-dont-pass-enum-lru_list-to-lru-list-addition-functions.patch mm-dont-pass-enum-lru_list-to-trace_mm_lru_insertion.patch mm-dont-pass-enum-lru_list-to-del_page_from_lru_list.patch mm-add-__clear_page_lru_flags-to-replace-page_off_lru.patch mm-vm_bug_on-lru-page-flags.patch mm-fold-page_lru_base_type-into-its-sole-caller.patch mm-fold-__update_lru_size-into-its-sole-caller.patch mm-make-lruvec_lru_size-static.patch