From: Brendan Jackman <jackmanb@google.com>
To: Andrew Morton <akpm@linux-foundation.org>,
David Hildenbrand <david@redhat.com>,
Oscar Salvador <osalvador@suse.de>
Cc: Johannes Weiner <hannes@cmpxchg.org>,
Vlastimil Babka <vbabka@suse.cz>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Brendan Jackman <jackmanb@google.com>
Subject: [PATCH] mm/page_alloc: Add lockdep assertion for pageblock type change
Date: Thu, 27 Feb 2025 16:15:47 +0000 [thread overview]
Message-ID: <20250227-pageblock-lockdep-v1-1-3701efb331bb@google.com> (raw)
Since the migratetype hygiene patches [0], the locking here is
a bit more formalised, so write it down with an assert.
[0] https://lore.kernel.org/lkml/20240320180429.678181-3-hannes@cmpxchg.org/T/
Signed-off-by: Brendan Jackman <jackmanb@google.com>
---
include/linux/memory_hotplug.h | 1 +
mm/memory_hotplug.c | 5 +++++
mm/page_alloc.c | 4 ++++
3 files changed, 10 insertions(+)
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index eaac5ae8c05c8ee2f2868d5bc1b04d1f68235b3f..ff9511d9b9e6f775feeb4f897754878ac4c8cdb0 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -175,6 +175,7 @@ void put_online_mems(void);
void mem_hotplug_begin(void);
void mem_hotplug_done(void);
+bool in_mem_hotplug(void);
/* See kswapd_is_running() */
static inline void pgdat_kswapd_lock(pg_data_t *pgdat)
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 16cf9e17077e359b98a69dc4bca48f4575b9a28c..2b9d1a6267c0872c433fafe8684dd4e2aa821f5f 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -267,6 +267,11 @@ void mem_hotplug_done(void)
cpus_read_unlock();
}
+bool in_mem_hotplug(void)
+{
+ return percpu_is_write_locked(&mem_hotplug_lock);
+}
+
u64 max_mem_size = U64_MAX;
/* add this memory to iomem resource */
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 299c9f10bbcd2aa1d35ac6eb5131a2471da825d5..e0516d70835e20e54ff8e43f3aa884c7e36d929a 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -417,6 +417,10 @@ void set_pfnblock_flags_mask(struct page *page, unsigned long flags,
void set_pageblock_migratetype(struct page *page, int migratetype)
{
+ lockdep_assert_once(system_state == SYSTEM_BOOTING ||
+ in_mem_hotplug() ||
+ lockdep_is_held(&page_zone(page)->lock));
+
if (unlikely(page_group_by_mobility_disabled &&
migratetype < MIGRATE_PCPTYPES))
migratetype = MIGRATE_UNMOVABLE;
---
base-commit: d58172d128acbafa2295aa17cc96e28260da9a86
change-id: 20250227-pageblock-lockdep-9628c48d7e08
Best regards,
--
Brendan Jackman <jackmanb@google.com>
next reply other threads:[~2025-02-27 16:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-27 16:15 Brendan Jackman [this message]
2025-02-27 22:33 ` [PATCH] mm/page_alloc: Add lockdep assertion for pageblock type change Andrew Morton
2025-02-28 9:20 ` Brendan Jackman
2025-02-28 10:12 ` Vlastimil Babka
2025-02-28 17:31 ` kernel test robot
2025-02-28 18:28 ` Johannes Weiner
2025-03-03 11:18 ` Andy Shevchenko
2025-03-03 23:13 ` Stephen Rothwell
2025-03-04 10:18 ` Brendan Jackman
2025-03-04 10:31 ` David Hildenbrand
2025-02-28 23:42 ` kernel test robot
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=20250227-pageblock-lockdep-v1-1-3701efb331bb@google.com \
--to=jackmanb@google.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=osalvador@suse.de \
--cc=vbabka@suse.cz \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox