The patch titled
Subject: mm-demotion-expose-memory-tier-details-via-sysfs-fix-2
has been added to the -mm mm-unstable branch. Its filename is
mm-demotion-expose-memory-tier-details-via-sysfs-fix-2.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-demotion-expose-memory-tier-details-via-sysfs-fix-2.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 the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-demotion-expose-memory-tier-details-via-sysfs-fix-2
Date: Tue Aug 30 03:14:15 PM PDT 2022
temp build fix
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxx>
Cc: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Cc: Naoya Horiguchi <naoya.horiguchi@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory-tiers.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
--- a/mm/memory-tiers.c~mm-demotion-expose-memory-tier-details-via-sysfs-fix-2
+++ a/mm/memory-tiers.c
@@ -108,7 +108,20 @@ static int top_tier_adistance;
*
*/
static struct demotion_nodes *node_demotion __read_mostly;
-#endif /* CONFIG_MIGRATION */
+
+/* I need a comment too */
+static inline bool i_need_a_name(struct memory_tier *memtier)
+{
+ return memtier->adistance_start >= top_tier_adistance;
+}
+
+#else /* CONFIG_MIGRATION */
+
+static inline bool i_need_a_name(struct memory_tier *memtier)
+{
+ return false;
+}
+#endif /* CONFIG_MIGRATION */
static __always_inline nodemask_t get_memtier_nodemask(struct memory_tier *memtier)
{
@@ -648,7 +661,7 @@ static ssize_t toptier_nodes_show(struct
mutex_lock(&memory_tier_lock);
list_for_each_entry(memtier, &memory_tiers, list) {
- if (memtier->adistance_start >= top_tier_adistance)
+ if (i_need_a_name(memtier))
break;
nmask = get_memtier_nodemask(memtier);
nodes_or(top_tier_mask, top_tier_mask, nmask);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-page_alloc-fix-race-condition-between-build_all_zonelists-and-page-allocation-fix.patch
procfs-add-path-to-proc-pid-fdinfo-fix.patch
zsmalloc-zs_object_copy-add-clarifying-comment-fix.patch
mm-gupc-simplify-and-fix-check_and_migrate_movable_pages-return-codes-fix-fix.patch
mm-oom_kill-add-trace-logs-in-process_mrelease-system-call-fix.patch
zsmalloc-zs_object_copy-replace-email-link-to-doc-checkpatch-fixes.patch
mm-demotion-add-support-for-explicit-memory-tiers-fix.patch
mm-demotion-update-node_is_toptier-to-work-with-memory-tiers-fix-2.patch
mm-demotion-expose-memory-tier-details-via-sysfs-fix.patch
mm-demotion-expose-memory-tier-details-via-sysfs-fix-2.patch
mm-drop-oom-code-from-exit_mmap-fix-fix.patch
mm-delete-unused-mmf_oom_victim-flag-vs-mglru.patch
mm-add-merging-after-mremap-resize-checkpatch-fixes.patch
mm-gupc-refactor-check_and_migrate_movable_pages-fix.patch
hugetlb-rename-remove_huge_page-to-hugetlb_delete_from_page_cache-fix.patch
hugetlb-handle-truncate-racing-with-page-faults-fix-fix.patch
mm-reduce-noise-in-show_mem-for-lowmem-allocations-fix-2.patch
mm-reduce-noise-in-show_mem-for-lowmem-allocations-vs-mapletree.patch
page_ext-introduce-boot-parameter-early_page_ext-fix.patch
mm-fix-null-ptr-deref-in-kswapd_is_running-fix.patch
ia64-fix-clock_getresclock_monotonic-to-report-itc-frequency-checkpatch-fixes.patch
