From: Alex Shi <alex.shi@linux.alibaba.com> To: akpm@linux-foundation.org, mgorman@techsingularity.net, tj@kernel.org, hughd@google.com, khlebnikov@yandex-team.ru, daniel.m.jordan@oracle.com, willy@infradead.org, hannes@cmpxchg.org, lkp@intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, shakeelb@google.com, iamjoonsoo.kim@lge.com, richard.weiyang@gmail.com, kirill@shutemov.name, alexander.duyck@gmail.com, rong.a.chen@intel.com, mhocko@suse.com, vdavydov.dev@gmail.com, shy828301@gmail.com Cc: "Mika Penttilä" <mika.penttila@nextfour.com> Subject: [PATCH v21 03/19] mm/thp: Simplify lru_add_page_tail() Date: Thu, 5 Nov 2020 16:55:33 +0800 [thread overview] Message-ID: <1604566549-62481-4-git-send-email-alex.shi@linux.alibaba.com> (raw) In-Reply-To: <1604566549-62481-1-git-send-email-alex.shi@linux.alibaba.com> Simplify lru_add_page_tail(), there are actually only two cases possible: split_huge_page_to_list(), with list supplied and head isolated from lru by its caller; or split_huge_page(), with NULL list and head on lru - because when head is racily isolated from lru, the isolator's reference will stop the split from getting any further than its page_ref_freeze(). So decide between the two cases by "list", but add VM_WARN_ON()s to verify that they match our lru expectations. [Hugh Dickins: rewrite commit log] Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com> Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Acked-by: Hugh Dickins <hughd@google.com> Cc: Kirill A. Shutemov <kirill@shutemov.name> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Matthew Wilcox <willy@infradead.org> Cc: Hugh Dickins <hughd@google.com> Cc: Mika Penttilä <mika.penttila@nextfour.com> Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- mm/huge_memory.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 60726eb26840..79318d7f7d5d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2356,24 +2356,16 @@ static void lru_add_page_tail(struct page *head, struct page *tail, VM_BUG_ON_PAGE(PageLRU(tail), head); lockdep_assert_held(&lruvec_pgdat(lruvec)->lru_lock); - if (!list) - SetPageLRU(tail); - - if (likely(PageLRU(head))) - list_add_tail(&tail->lru, &head->lru); - else if (list) { + if (list) { /* page reclaim is reclaiming a huge page */ + VM_WARN_ON(PageLRU(head)); get_page(tail); list_add_tail(&tail->lru, list); } else { - /* - * Head page has not yet been counted, as an hpage, - * so we must account for each subpage individually. - * - * Put tail on the list at the correct position - * so they all end up in order. - */ - add_page_to_lru_list_tail(tail, lruvec, page_lru(tail)); + /* head is still on lru (and we have it frozen) */ + VM_WARN_ON(!PageLRU(head)); + SetPageLRU(tail); + list_add_tail(&tail->lru, &head->lru); } } -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Alex Shi <alex.shi@linux.alibaba.com> To: akpm@linux-foundation.org, mgorman@techsingularity.net, tj@kernel.org, hughd@google.com, khlebnikov@yandex-team.ru, daniel.m.jordan@oracle.com, willy@infradead.org, hannes@cmpxchg.org, lkp@intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, shakeelb@google.com, iamjoonsoo.kim@lge.com, richard.weiyang@gmail.com, kirill@shutemov.name, alexander.duyck@gmail.com, rong.a.chen@intel.com, mhocko@suse.com, vdavydov.dev@gmail.com, shy828301@gmail.com Cc: "Mika Penttilä" <mika.penttila@nextfour.com> Subject: [PATCH v21 03/19] mm/thp: Simplify lru_add_page_tail() Date: Thu, 5 Nov 2020 16:55:33 +0800 [thread overview] Message-ID: <1604566549-62481-4-git-send-email-alex.shi@linux.alibaba.com> (raw) In-Reply-To: <1604566549-62481-1-git-send-email-alex.shi@linux.alibaba.com> Simplify lru_add_page_tail(), there are actually only two cases possible: split_huge_page_to_list(), with list supplied and head isolated from lru by its caller; or split_huge_page(), with NULL list and head on lru - because when head is racily isolated from lru, the isolator's reference will stop the split from getting any further than its page_ref_freeze(). So decide between the two cases by "list", but add VM_WARN_ON()s to verify that they match our lru expectations. [Hugh Dickins: rewrite commit log] Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com> Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Acked-by: Hugh Dickins <hughd@google.com> Cc: Kirill A. Shutemov <kirill@shutemov.name> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Matthew Wilcox <willy@infradead.org> Cc: Hugh Dickins <hughd@google.com> Cc: Mika Penttil√§ <mika.penttila@nextfour.com> Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- mm/huge_memory.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 60726eb26840..79318d7f7d5d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2356,24 +2356,16 @@ static void lru_add_page_tail(struct page *head, struct page *tail, VM_BUG_ON_PAGE(PageLRU(tail), head); lockdep_assert_held(&lruvec_pgdat(lruvec)->lru_lock); - if (!list) - SetPageLRU(tail); - - if (likely(PageLRU(head))) - list_add_tail(&tail->lru, &head->lru); - else if (list) { + if (list) { /* page reclaim is reclaiming a huge page */ + VM_WARN_ON(PageLRU(head)); get_page(tail); list_add_tail(&tail->lru, list); } else { - /* - * Head page has not yet been counted, as an hpage, - * so we must account for each subpage individually. - * - * Put tail on the list at the correct position - * so they all end up in order. - */ - add_page_to_lru_list_tail(tail, lruvec, page_lru(tail)); + /* head is still on lru (and we have it frozen) */ + VM_WARN_ON(!PageLRU(head)); + SetPageLRU(tail); + list_add_tail(&tail->lru, &head->lru); } } -- 1.8.3.1
next prev parent reply other threads:[~2020-11-05 8:57 UTC|newest] Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-05 8:55 [PATCH v21 00/19] per memcg lru lock Alex Shi 2020-11-05 8:55 ` Alex Shi 2020-11-05 8:55 ` [PATCH v21 01/19] mm/thp: move lru_add_page_tail func to huge_memory.c Alex Shi 2020-11-05 8:55 ` Alex Shi 2020-11-05 8:55 ` [PATCH v21 02/19] mm/thp: use head for head page in lru_add_page_tail Alex Shi 2020-11-05 8:55 ` Alex Shi [this message] 2020-11-05 8:55 ` [PATCH v21 03/19] mm/thp: Simplify lru_add_page_tail() Alex Shi 2020-11-05 8:55 ` [PATCH v21 04/19] mm/thp: narrow lru locking Alex Shi 2020-11-05 8:55 ` [PATCH v21 05/19] mm/vmscan: remove unnecessary lruvec adding Alex Shi 2020-11-05 8:55 ` Alex Shi 2020-11-11 12:36 ` Vlastimil Babka 2020-11-11 12:36 ` Vlastimil Babka 2020-11-05 8:55 ` [PATCH v21 06/19] mm/rmap: stop store reordering issue on page->mapping Alex Shi 2020-11-06 1:20 ` Alex Shi 2020-11-06 1:20 ` Alex Shi 2020-11-10 19:06 ` Johannes Weiner 2020-11-11 7:41 ` Hugh Dickins 2020-11-11 7:41 ` Hugh Dickins 2020-11-05 8:55 ` [PATCH v21 07/19] mm: page_idle_get_page() does not need lru_lock Alex Shi 2020-11-05 8:55 ` Alex Shi 2020-11-10 19:01 ` Johannes Weiner 2020-11-11 8:17 ` huang ying 2020-11-11 8:17 ` huang ying 2020-11-11 8:17 ` huang ying 2020-11-11 12:52 ` Vlastimil Babka 2020-11-11 12:52 ` Vlastimil Babka 2020-11-05 8:55 ` [PATCH v21 08/19] mm/memcg: add debug checking in lock_page_memcg Alex Shi 2020-11-05 8:55 ` Alex Shi 2020-11-05 8:55 ` [PATCH v21 09/19] mm/swap.c: fold vm event PGROTATED into pagevec_move_tail_fn Alex Shi 2020-11-05 8:55 ` [PATCH v21 10/19] mm/lru: move lock into lru_note_cost Alex Shi 2020-11-05 8:55 ` [PATCH v21 11/19] mm/vmscan: remove lruvec reget in move_pages_to_lru Alex Shi 2020-11-05 8:55 ` Alex Shi 2020-11-05 8:55 ` [PATCH v21 12/19] mm/mlock: remove lru_lock on TestClearPageMlocked Alex Shi 2020-11-11 13:03 ` Vlastimil Babka 2020-11-11 13:03 ` Vlastimil Babka 2020-11-05 8:55 ` [PATCH v21 13/19] mm/mlock: remove __munlock_isolate_lru_page Alex Shi 2020-11-11 13:07 ` Vlastimil Babka 2020-11-05 8:55 ` [PATCH v21 14/19] mm/lru: introduce TestClearPageLRU Alex Shi 2020-11-05 8:55 ` Alex Shi 2020-11-11 13:36 ` Vlastimil Babka 2020-11-12 2:03 ` Hugh Dickins 2020-11-12 2:03 ` Hugh Dickins 2020-11-12 11:24 ` Vlastimil Babka 2020-11-05 8:55 ` [PATCH v21 15/19] mm/compaction: do page isolation first in compaction Alex Shi 2020-11-05 8:55 ` Alex Shi 2020-11-11 17:12 ` Vlastimil Babka 2020-11-11 17:12 ` Vlastimil Babka 2020-11-12 2:28 ` Hugh Dickins 2020-11-12 2:28 ` Hugh Dickins 2020-11-12 3:35 ` Alex Shi 2020-11-12 3:35 ` Alex Shi 2020-11-12 11:25 ` Vlastimil Babka 2020-11-12 11:25 ` Vlastimil Babka 2020-11-05 8:55 ` [PATCH v21 16/19] mm/swap.c: serialize memcg changes in pagevec_lru_move_fn Alex Shi 2020-11-11 18:00 ` Vlastimil Babka 2020-11-11 18:00 ` Vlastimil Babka 2020-11-05 8:55 ` [PATCH v21 17/19] mm/lru: replace pgdat lru_lock with lruvec lock Alex Shi 2020-11-05 8:55 ` Alex Shi 2020-11-05 13:43 ` Alex Shi 2020-11-05 13:43 ` Alex Shi 2020-11-06 7:48 ` Alex Shi 2020-11-06 7:48 ` Alex Shi 2020-11-10 18:54 ` Johannes Weiner 2020-11-10 18:54 ` Johannes Weiner 2020-11-11 17:46 ` Vlastimil Babka 2020-11-11 17:46 ` Vlastimil Babka 2020-11-11 17:59 ` Vlastimil Babka 2020-11-12 12:19 ` Vlastimil Babka 2020-11-12 12:19 ` Vlastimil Babka 2020-11-12 14:19 ` Alex Shi 2020-11-12 14:19 ` Alex Shi 2020-11-05 8:55 ` [PATCH v21 18/19] mm/lru: introduce the relock_page_lruvec function Alex Shi 2020-11-05 8:55 ` Alex Shi 2020-11-06 7:50 ` Alex Shi 2020-11-06 7:50 ` Alex Shi 2020-11-10 18:59 ` Johannes Weiner 2020-11-10 18:59 ` Johannes Weiner 2020-11-12 12:31 ` Vlastimil Babka 2020-11-12 12:31 ` Vlastimil Babka 2020-11-05 8:55 ` [PATCH v21 19/19] mm/lru: revise the comments of lru_lock Alex Shi 2020-11-12 12:37 ` Vlastimil Babka 2020-11-12 12:37 ` Vlastimil Babka 2020-11-10 12:14 ` [PATCH v21 00/19] per memcg lru lock Alex Shi 2020-11-10 12:14 ` Alex Shi 2020-11-16 3:45 ` Alex Shi 2020-11-16 3:45 ` Alex Shi 2020-12-15 0:47 ` Andrew Morton 2020-12-15 0:47 ` Andrew Morton 2020-12-15 2:16 ` Hugh Dickins 2020-12-15 2:16 ` Hugh Dickins 2020-12-15 2:16 ` Hugh Dickins 2020-12-15 2:28 ` Andrew Morton 2020-12-15 2:28 ` Andrew Morton 2021-01-05 19:30 ` Qian Cai 2021-01-05 19:30 ` Qian Cai 2021-01-05 19:30 ` Qian Cai 2021-01-05 19:42 ` Shakeel Butt 2021-01-05 19:42 ` Shakeel Butt 2021-01-05 19:42 ` Shakeel Butt 2021-01-05 20:11 ` Qian Cai 2021-01-05 20:11 ` Qian Cai 2021-01-05 20:11 ` Qian Cai 2021-01-05 21:35 ` Hugh Dickins 2021-01-05 21:35 ` Hugh Dickins 2021-01-05 21:35 ` Hugh Dickins 2021-01-05 22:01 ` Qian Cai 2021-01-05 22:01 ` Qian Cai 2021-01-05 22:01 ` Qian Cai 2021-01-06 3:10 ` Hugh Dickins 2021-01-06 3:10 ` Hugh Dickins 2021-01-06 3:10 ` Hugh Dickins
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=1604566549-62481-4-git-send-email-alex.shi@linux.alibaba.com \ --to=alex.shi@linux.alibaba.com \ --cc=akpm@linux-foundation.org \ --cc=alexander.duyck@gmail.com \ --cc=cgroups@vger.kernel.org \ --cc=daniel.m.jordan@oracle.com \ --cc=hannes@cmpxchg.org \ --cc=hughd@google.com \ --cc=iamjoonsoo.kim@lge.com \ --cc=khlebnikov@yandex-team.ru \ --cc=kirill@shutemov.name \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=lkp@intel.com \ --cc=mgorman@techsingularity.net \ --cc=mhocko@suse.com \ --cc=mika.penttila@nextfour.com \ --cc=richard.weiyang@gmail.com \ --cc=rong.a.chen@intel.com \ --cc=shakeelb@google.com \ --cc=shy828301@gmail.com \ --cc=tj@kernel.org \ --cc=vdavydov.dev@gmail.com \ --cc=willy@infradead.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.