From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Mike Rapoport <rppt@kernel.org>, <linux-mm@kvack.org>
Cc: David Hildenbrand <david@redhat.com>,
Oscar Salvador <osalvador@suse.de>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>,
Luis Chamberlain <mcgrof@kernel.org>,
Kees Cook <keescook@chromium.org>,
Iurii Zaikin <yzaikin@google.com>, <linux-kernel@vger.kernel.org>,
<linux-pm@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>,
<ying.huang@intel.com>, Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH v2 13/13] mm: page_alloc: move is_check_pages_enabled() into page_alloc.c
Date: Tue, 16 May 2023 14:38:21 +0800 [thread overview]
Message-ID: <20230516063821.121844-14-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20230516063821.121844-1-wangkefeng.wang@huawei.com>
The is_check_pages_enabled() only used in page_alloc.c, move it into
page_alloc.c, also use it in free_tail_page_prepare().
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
mm/internal.h | 5 -----
mm/page_alloc.c | 7 ++++++-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/mm/internal.h b/mm/internal.h
index 5fdf930a87b5..bb6542279599 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -208,11 +208,6 @@ extern char * const zone_names[MAX_NR_ZONES];
/* perform sanity checks on struct pages being allocated or freed */
DECLARE_STATIC_KEY_MAYBE(CONFIG_DEBUG_VM, check_pages_enabled);
-static inline bool is_check_pages_enabled(void)
-{
- return static_branch_unlikely(&check_pages_enabled);
-}
-
extern int min_free_kbytes;
void setup_per_zone_wmarks(void);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5e8680669388..1023f41de2fb 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -983,6 +983,11 @@ static inline bool free_page_is_bad(struct page *page)
return true;
}
+static inline bool is_check_pages_enabled(void)
+{
+ return static_branch_unlikely(&check_pages_enabled);
+}
+
static int free_tail_page_prepare(struct page *head_page, struct page *page)
{
struct folio *folio = (struct folio *)head_page;
@@ -994,7 +999,7 @@ static int free_tail_page_prepare(struct page *head_page, struct page *page)
*/
BUILD_BUG_ON((unsigned long)LIST_POISON1 & 1);
- if (!static_branch_unlikely(&check_pages_enabled)) {
+ if (!is_check_pages_enabled()) {
ret = 0;
goto out;
}
--
2.35.3
prev parent reply other threads:[~2023-05-16 6:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-16 6:38 [PATCH -next v2 00/13] mm: page_alloc: misc cleanup and refector Kefeng Wang
2023-05-16 6:38 ` [PATCH v2 01/13] mm: page_alloc: move mirrored_kernelcore into mm_init.c Kefeng Wang
2023-05-16 6:38 ` [PATCH v2 02/13] mm: page_alloc: move init_on_alloc/free() " Kefeng Wang
2023-05-16 6:38 ` [PATCH v2 03/13] mm: page_alloc: move set_zone_contiguous() " Kefeng Wang
2023-05-16 6:38 ` [PATCH v2 04/13] mm: page_alloc: collect mem statistic into show_mem.c Kefeng Wang
2023-05-16 6:38 ` [PATCH v2 05/13] mm: page_alloc: squash page_is_consistent() Kefeng Wang
2023-05-16 6:38 ` [PATCH v2 06/13] mm: page_alloc: remove alloc_contig_dump_pages() stub Kefeng Wang
2023-05-16 6:38 ` [PATCH v2 07/13] mm: page_alloc: split out FAIL_PAGE_ALLOC Kefeng Wang
2023-05-16 6:38 ` [PATCH v2 08/13] mm: page_alloc: split out DEBUG_PAGEALLOC Kefeng Wang
2023-05-16 22:22 ` Andrew Morton
2023-05-18 1:35 ` Kefeng Wang
2023-05-18 2:10 ` Andrew Morton
2023-05-16 6:38 ` [PATCH v2 09/13] mm: page_alloc: move mark_free_page() into snapshot.c Kefeng Wang
2023-05-16 6:38 ` [PATCH v2 10/13] mm: page_alloc: move pm_* function into power Kefeng Wang
2023-05-16 6:38 ` [PATCH v2 11/13] mm: vmscan: use gfp_has_io_fs() Kefeng Wang
2023-05-16 6:38 ` [PATCH v2 12/13] mm: page_alloc: move sysctls into it own fils Kefeng Wang
2023-05-16 6:38 ` Kefeng Wang [this message]
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=20230516063821.121844-14-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=keescook@chromium.org \
--cc=len.brown@intel.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-pm@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=osalvador@suse.de \
--cc=pavel@ucw.cz \
--cc=rafael@kernel.org \
--cc=rppt@kernel.org \
--cc=ying.huang@intel.com \
--cc=yzaikin@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: 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