From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F8BE366066 for ; Tue, 30 Jun 2026 02:29:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782786555; cv=none; b=eowM3OLO2hAGGTL1UzOj9j0QV5mNeKXWrl/3YwRpog6f25XpkMJ8tAC4K0apAJj+vkoHv3v2d+2gesupWwgAZVNhWH9LbzlyfHC2/ace90PIwBqd0MKP43KUD87cghaxlJK7MdeVx6mtJopaa7OZ9VTBCUxnMGL2wf/0viL737Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782786555; c=relaxed/simple; bh=uhy5cqjQ6m2FfdUWKgz91uNW7fD5JKYJu/2unWtbV0g=; h=Date:To:From:Subject:Message-Id; b=q2C5WmcuJsbXIsvmhROrhu65n1bBALMLVR22sgeHNXcvRyvU/eFMuW5ETFc80ooCqG0b9dGzVcrZZpQLNZZHme07qXPoan81CzJbsFrZ+4aKWV8ofbsRjqrcR86IuVUwRxKOgH9+t4qIWCcg3e/+mg4mRWQ56f5dGZYnwrmcoEY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=RSQhJQaL; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="RSQhJQaL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13C2A1F000E9; Tue, 30 Jun 2026 02:29:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1782786554; bh=vXODaWU/RQxhPK9B8mAB9pJQXbB4MSg66XAl425Rfu0=; h=Date:To:From:Subject; b=RSQhJQaLivH3GuciKwTZ5WZ463GR9CEUu2p+a7SDlFDdzY3bD/jYvRan6hmEGWkwI lftiZpxMoaaYX9pzq1LvAbIV1bf3k8mxTcl5kuykpXnQQNe8bOLJVxaa1xWhxw4I2j 4HJ99XqRvpVocKPNMg0eCvbCtT1w5lQvkJwfUNLs= Date: Mon, 29 Jun 2026 19:29:13 -0700 To: mm-commits@vger.kernel.org,ziy@nvidia.com,vbabka@kernel.org,surenb@google.com,mhocko@suse.com,jackmanb@google.com,hannes@cmpxchg.org,ye.liu@linux.dev,akpm@linux-foundation.org From: Andrew Morton Subject: + mm-page_owner-hoist-config_memcg-to-function-level-for-print_page_owner_memcg.patch added to mm-unstable branch Message-Id: <20260630022914.13C2A1F000E9@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: mm/page_owner: hoist CONFIG_MEMCG to function level for print_page_owner_memcg() has been added to the -mm mm-unstable branch. Its filename is mm-page_owner-hoist-config_memcg-to-function-level-for-print_page_owner_memcg.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-page_owner-hoist-config_memcg-to-function-level-for-print_page_owner_memcg.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm 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 via various branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there most days ------------------------------------------------------ From: Ye Liu Subject: mm/page_owner: hoist CONFIG_MEMCG to function level for print_page_owner_memcg() Date: Tue, 30 Jun 2026 09:53:21 +0800 print_page_owner_memcg() has CONFIG_MEMCG guarding its entire body via #ifdef inside the function, which leaves a no-op { return ret; } when the config is disabled. Hoist the #ifdef to the top level so the real implementation and the empty stub are two clearly separated definitions. No functional change. Link: https://lore.kernel.org/20260630015331.147174-5-ye.liu@linux.dev Signed-off-by: Ye Liu Reviewed-by: Zi Yan Reviewed-by: Vlastimil Babka (SUSE) Cc: Brendan Jackman Cc: Johannes Weiner Cc: Michal Hocko Cc: Suren Baghdasaryan Signed-off-by: Andrew Morton --- mm/page_owner.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/mm/page_owner.c~mm-page_owner-hoist-config_memcg-to-function-level-for-print_page_owner_memcg +++ a/mm/page_owner.c @@ -522,13 +522,13 @@ ext_put_continue: seq_putc(m, '\n'); } +#ifdef CONFIG_MEMCG /* * Looking for memcg information and print it out */ static inline int print_page_owner_memcg(char *kbuf, size_t count, int ret, struct page *page) { -#ifdef CONFIG_MEMCG unsigned long memcg_data; struct mem_cgroup *memcg; bool online; @@ -556,10 +556,16 @@ static inline int print_page_owner_memcg name); out_unlock: rcu_read_unlock(); -#endif /* CONFIG_MEMCG */ return ret; } +#else +static inline int print_page_owner_memcg(char *kbuf, size_t count, int ret, + struct page *page) +{ + return ret; +} +#endif static ssize_t print_page_owner(char __user *buf, size_t count, unsigned long pfn, _ Patches currently in -mm which might be from ye.liu@linux.dev are mm-page_owner-extract-skip_buddy_pages-helper-to-unify-buddy-page-skipping.patch mm-page_owner-add-mr_never-to-enum-migrate_reason-and-use-it-for-last_migrate_reason.patch mm-use-enum-migrate_reason-instead-of-int-for-migration-reason-parameters.patch mm-page_owner-hoist-config_memcg-to-function-level-for-print_page_owner_memcg.patch mm-page_owner-add-missing-newline-to-count_threshold-format-string.patch mm-page_owner-move-free_ts_nsec-output-to-free-section-in-__dump_page_owner.patch mm-page_owner-drop-redundant-page_owner-prefix-from-static-symbols.patch mm-page_owner-clamp-skip_buddy_pages-pfn-advance-at-max_order_nr_pages-boundary.patch mm-page_owner-use-memcg_data-snapshot-instead-of-pagememcgkmem-to-avoid-toctou-vm_bug_on.patch