From: Muchun Song <songmuchun@bytedance.com> To: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, duanxiongchun@bytedance.com, longman@redhat.com, Muchun Song <songmuchun@bytedance.com> Subject: [PATCH v4 10/11] mm: lru: add VM_BUG_ON_FOLIO to lru maintenance function Date: Tue, 24 May 2022 14:05:50 +0800 [thread overview] Message-ID: <20220524060551.80037-11-songmuchun@bytedance.com> (raw) In-Reply-To: <20220524060551.80037-1-songmuchun@bytedance.com> We need to make sure that the page is deleted from or added to the correct lruvec list. So add a VM_BUG_ON_FOLIO() to catch invalid users. Signed-off-by: Muchun Song <songmuchun@bytedance.com> --- include/linux/mm_inline.h | 6 ++++++ mm/vmscan.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index ac32125745ab..30d2393da613 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -97,6 +97,8 @@ void lruvec_add_folio(struct lruvec *lruvec, struct folio *folio) { enum lru_list lru = folio_lru_list(folio); + VM_BUG_ON_FOLIO(!folio_matches_lruvec(folio, lruvec), folio); + update_lru_size(lruvec, lru, folio_zonenum(folio), folio_nr_pages(folio)); if (lru != LRU_UNEVICTABLE) @@ -114,6 +116,8 @@ void lruvec_add_folio_tail(struct lruvec *lruvec, struct folio *folio) { enum lru_list lru = folio_lru_list(folio); + VM_BUG_ON_FOLIO(!folio_matches_lruvec(folio, lruvec), folio); + update_lru_size(lruvec, lru, folio_zonenum(folio), folio_nr_pages(folio)); /* This is not expected to be used on LRU_UNEVICTABLE */ @@ -131,6 +135,8 @@ void lruvec_del_folio(struct lruvec *lruvec, struct folio *folio) { enum lru_list lru = folio_lru_list(folio); + VM_BUG_ON_FOLIO(!folio_matches_lruvec(folio, lruvec), folio); + if (lru != LRU_UNEVICTABLE) list_del(&folio->lru); update_lru_size(lruvec, lru, folio_zonenum(folio), diff --git a/mm/vmscan.c b/mm/vmscan.c index 761d5e0dd78d..6c9e2eafc8f9 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2281,7 +2281,6 @@ static unsigned int move_pages_to_lru(struct list_head *list) continue; } - VM_BUG_ON_PAGE(!folio_matches_lruvec(folio, lruvec), page); add_page_to_lru_list(page, lruvec); nr_pages = thp_nr_pages(page); nr_moved += nr_pages; -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Muchun Song <songmuchun-EC8Uxl6Npydl57MIdRCFDg@public.gmane.org> To: hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org, mhocko-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, roman.gushchin-fxUVXftIFDnyG1zEObXtfA@public.gmane.org, shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org Cc: cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, duanxiongchun-EC8Uxl6Npydl57MIdRCFDg@public.gmane.org, longman-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Muchun Song <songmuchun-EC8Uxl6Npydl57MIdRCFDg@public.gmane.org> Subject: [PATCH v4 10/11] mm: lru: add VM_BUG_ON_FOLIO to lru maintenance function Date: Tue, 24 May 2022 14:05:50 +0800 [thread overview] Message-ID: <20220524060551.80037-11-songmuchun@bytedance.com> (raw) In-Reply-To: <20220524060551.80037-1-songmuchun-EC8Uxl6Npydl57MIdRCFDg@public.gmane.org> We need to make sure that the page is deleted from or added to the correct lruvec list. So add a VM_BUG_ON_FOLIO() to catch invalid users. Signed-off-by: Muchun Song <songmuchun-EC8Uxl6Npydl57MIdRCFDg@public.gmane.org> --- include/linux/mm_inline.h | 6 ++++++ mm/vmscan.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index ac32125745ab..30d2393da613 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -97,6 +97,8 @@ void lruvec_add_folio(struct lruvec *lruvec, struct folio *folio) { enum lru_list lru = folio_lru_list(folio); + VM_BUG_ON_FOLIO(!folio_matches_lruvec(folio, lruvec), folio); + update_lru_size(lruvec, lru, folio_zonenum(folio), folio_nr_pages(folio)); if (lru != LRU_UNEVICTABLE) @@ -114,6 +116,8 @@ void lruvec_add_folio_tail(struct lruvec *lruvec, struct folio *folio) { enum lru_list lru = folio_lru_list(folio); + VM_BUG_ON_FOLIO(!folio_matches_lruvec(folio, lruvec), folio); + update_lru_size(lruvec, lru, folio_zonenum(folio), folio_nr_pages(folio)); /* This is not expected to be used on LRU_UNEVICTABLE */ @@ -131,6 +135,8 @@ void lruvec_del_folio(struct lruvec *lruvec, struct folio *folio) { enum lru_list lru = folio_lru_list(folio); + VM_BUG_ON_FOLIO(!folio_matches_lruvec(folio, lruvec), folio); + if (lru != LRU_UNEVICTABLE) list_del(&folio->lru); update_lru_size(lruvec, lru, folio_zonenum(folio), diff --git a/mm/vmscan.c b/mm/vmscan.c index 761d5e0dd78d..6c9e2eafc8f9 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2281,7 +2281,6 @@ static unsigned int move_pages_to_lru(struct list_head *list) continue; } - VM_BUG_ON_PAGE(!folio_matches_lruvec(folio, lruvec), page); add_page_to_lru_list(page, lruvec); nr_pages = thp_nr_pages(page); nr_moved += nr_pages; -- 2.11.0
next prev parent reply other threads:[~2022-05-24 6:28 UTC|newest] Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-24 6:05 [PATCH v4 00/11] Use obj_cgroup APIs to charge the LRU pages Muchun Song 2022-05-24 6:05 ` Muchun Song 2022-05-24 6:05 ` [PATCH v4 01/11] mm: memcontrol: prepare objcg API for non-kmem usage Muchun Song 2022-05-24 6:05 ` Muchun Song 2022-05-24 19:01 ` Johannes Weiner 2022-05-24 19:01 ` Johannes Weiner 2022-05-25 8:46 ` Muchun Song 2022-05-25 8:46 ` Muchun Song 2022-05-25 2:36 ` Roman Gushchin 2022-05-25 2:36 ` Roman Gushchin 2022-05-25 7:57 ` Muchun Song 2022-05-25 7:57 ` Muchun Song 2022-05-25 12:37 ` Johannes Weiner 2022-05-25 12:37 ` Johannes Weiner 2022-05-25 13:08 ` Muchun Song 2022-05-25 13:08 ` Muchun Song 2022-05-24 6:05 ` [PATCH v4 02/11] mm: memcontrol: introduce compact_folio_lruvec_lock_irqsave Muchun Song 2022-05-24 6:05 ` Muchun Song 2022-05-24 19:22 ` Johannes Weiner 2022-05-24 19:22 ` Johannes Weiner 2022-05-25 9:38 ` Muchun Song 2022-05-25 9:38 ` Muchun Song 2022-05-24 6:05 ` [PATCH v4 03/11] mm: memcontrol: make lruvec lock safe when LRU pages are reparented Muchun Song 2022-05-24 6:05 ` Muchun Song 2022-05-24 19:23 ` Waiman Long 2022-05-25 10:20 ` Muchun Song 2022-05-25 10:20 ` Muchun Song 2022-05-25 14:59 ` Waiman Long 2022-05-25 14:59 ` Waiman Long 2022-05-24 19:27 ` Johannes Weiner 2022-05-24 19:27 ` Johannes Weiner 2022-05-25 9:53 ` Muchun Song 2022-05-25 9:53 ` Muchun Song 2022-05-25 12:30 ` Johannes Weiner 2022-05-25 12:30 ` Johannes Weiner 2022-05-25 13:03 ` Muchun Song 2022-05-25 13:03 ` Muchun Song 2022-05-25 14:48 ` Johannes Weiner 2022-05-25 14:48 ` Johannes Weiner 2022-05-25 15:38 ` Muchun Song 2022-05-25 15:38 ` Muchun Song 2022-05-26 20:17 ` Waiman Long 2022-05-26 20:17 ` Waiman Long 2022-05-27 2:55 ` Muchun Song 2022-05-27 2:55 ` Muchun Song 2022-05-24 6:05 ` [PATCH v4 04/11] mm: vmscan: rework move_pages_to_lru() Muchun Song 2022-05-24 6:05 ` Muchun Song 2022-05-24 19:38 ` Johannes Weiner 2022-05-24 19:38 ` Johannes Weiner 2022-05-25 11:38 ` Muchun Song 2022-05-25 11:38 ` Muchun Song 2022-05-24 19:52 ` Waiman Long 2022-05-24 19:52 ` Waiman Long 2022-05-25 11:43 ` Muchun Song 2022-05-25 11:43 ` Muchun Song 2022-05-25 2:43 ` Roman Gushchin 2022-05-25 2:43 ` Roman Gushchin 2022-05-25 11:41 ` Muchun Song 2022-05-25 11:41 ` Muchun Song 2022-05-24 6:05 ` [PATCH v4 05/11] mm: thp: introduce folio_split_queue_lock{_irqsave}() Muchun Song 2022-05-24 6:05 ` Muchun Song 2022-05-24 6:05 ` [PATCH v4 06/11] mm: thp: make split queue lock safe when LRU pages are reparented Muchun Song 2022-05-24 6:05 ` Muchun Song 2022-05-25 2:54 ` Roman Gushchin 2022-05-25 2:54 ` Roman Gushchin 2022-05-25 11:44 ` Muchun Song 2022-05-25 11:44 ` Muchun Song 2022-05-24 6:05 ` [PATCH v4 07/11] mm: memcontrol: make all the callers of {folio,page}_memcg() safe Muchun Song 2022-05-24 6:05 ` Muchun Song 2022-05-25 3:03 ` Roman Gushchin 2022-05-25 3:03 ` Roman Gushchin 2022-05-25 11:51 ` Muchun Song 2022-05-25 11:51 ` Muchun Song 2022-05-24 6:05 ` [PATCH v4 08/11] mm: memcontrol: introduce memcg_reparent_ops Muchun Song 2022-05-24 6:05 ` Muchun Song 2022-05-24 6:05 ` [PATCH v4 09/11] mm: memcontrol: use obj_cgroup APIs to charge the LRU pages Muchun Song 2022-05-24 6:05 ` Muchun Song 2022-05-24 12:29 ` kernel test robot 2022-05-24 18:16 ` kernel test robot 2022-05-24 18:16 ` kernel test robot 2022-05-25 7:14 ` [mm] bec0ae1210: WARNING:possible_recursive_locking_detected kernel test robot 2022-05-25 7:14 ` kernel test robot 2022-05-24 6:05 ` Muchun Song [this message] 2022-05-24 6:05 ` [PATCH v4 10/11] mm: lru: add VM_BUG_ON_FOLIO to lru maintenance function Muchun Song 2022-05-24 19:44 ` Johannes Weiner 2022-05-24 19:44 ` Johannes Weiner 2022-05-25 11:59 ` Muchun Song 2022-05-25 11:59 ` Muchun Song 2022-05-25 2:40 ` Roman Gushchin 2022-05-25 2:40 ` Roman Gushchin 2022-05-25 11:58 ` Muchun Song 2022-05-24 6:05 ` [PATCH v4 11/11] mm: lru: use lruvec lock to serialize memcg changes Muchun Song 2022-05-24 6:05 ` Muchun Song
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=20220524060551.80037-11-songmuchun@bytedance.com \ --to=songmuchun@bytedance.com \ --cc=cgroups@vger.kernel.org \ --cc=duanxiongchun@bytedance.com \ --cc=hannes@cmpxchg.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=longman@redhat.com \ --cc=mhocko@kernel.org \ --cc=roman.gushchin@linux.dev \ --cc=shakeelb@google.com \ /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.