The patch titled Subject: memcg-add-hugetlb-extension-fix-fix has been removed from the -mm tree. Its filename was memcg-add-hugetlb-extension-fix-fix.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: memcg-add-hugetlb-extension-fix-fix optimise CONFIG_HUGETLB_PAGE=y, CONFIG_MEM_RES_CTLR_HUGETLB=n Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> Cc: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Hillf Danton <dhillf@xxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff -puN mm/memcontrol.c~memcg-add-hugetlb-extension-fix-fix mm/memcontrol.c --- a/mm/memcontrol.c~memcg-add-hugetlb-extension-fix-fix +++ a/mm/memcontrol.c @@ -57,6 +57,16 @@ #include <trace/events/vmscan.h> +/* + * If CONFIG_MEM_RES_CTLR_HUGETLB=n, CONFIG_HUGETLB_PAGE=y we can avoid + * generating any code or storage for the resource counters + */ +#ifdef CONFIG_MEM_RES_CTLR_HUGETLB +#define NR_HUGEPAGE_RES_COUNTERS HUGE_MAX_HSTATE +#else +#define NR_HUGEPAGE_RES_COUNTERS 0 +#endif + struct cgroup_subsys mem_cgroup_subsys __read_mostly; #define MEM_CGROUP_RECLAIM_RETRIES 5 static struct mem_cgroup *root_mem_cgroup __read_mostly; @@ -267,7 +277,7 @@ struct mem_cgroup { /* * the counter to account for hugepages from hugetlb. */ - struct res_counter hugepage[HUGE_MAX_HSTATE]; + struct res_counter hugepage[NR_HUGEPAGE_RES_COUNTERS]; /* * Per cgroup active and inactive list, similar to the * per zone LRU lists. @@ -5016,9 +5026,9 @@ mem_cgroup_create(struct cgroup *cont) mem_cgroup_get(parent); /* * We could get called before hugetlb init is called. - * Use HUGE_MAX_HSTATE as the max index. + * Use NR_HUGEPAGE_RES_COUNTERS as the max index. */ - for (idx = 0; idx < HUGE_MAX_HSTATE; idx++) + for (idx = 0; idx < NR_HUGEPAGE_RES_COUNTERS; idx++) res_counter_init(&memcg->hugepage[idx], &parent->hugepage[idx]); } else { @@ -5026,9 +5036,9 @@ mem_cgroup_create(struct cgroup *cont) res_counter_init(&memcg->memsw, NULL); /* * We could get called before hugetlb init is called. - * Use HUGE_MAX_HSTATE as the max index. + * Use NR_HUGEPAGE_RES_COUNTERS as the max index. */ - for (idx = 0; idx < HUGE_MAX_HSTATE; idx++) + for (idx = 0; idx < NR_HUGEPAGE_RES_COUNTERS; idx++) res_counter_init(&memcg->hugepage[idx], NULL); } memcg->last_scanned_node = MAX_NUMNODES; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are linux-next.patch linux-next-git-rejects.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch drivers-block-nvmec-stop-breaking-my-i386-build.patch drivers-staging-zsmalloc-zsmalloc-mainc-unbork.patch mm-fix-slab-page-_count-corruption-when-using-slub-fix.patch tmpfs-implement-numa-node-interleaving-fix.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch fs-symlink-restrictions-on-sticky-directories.patch fs-hardlink-creation-restrictions.patch mm.patch mm-make-vb_alloc-more-foolproof-fix.patch mm-compaction-handle-incorrect-migrate_unmovable-type-pageblocks-fix.patch hugetlbfs-add-memcg-control-files-for-hugetlbfs-use-scnprintf-instead-of-sprintf-fix.patch memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix.patch memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix-fix.patch hugetlb-migrate-memcg-info-from-oldpage-to-new-page-during-migration-fix.patch memcg-fix-error-code-in-hugetlb_force_memcg_empty-v2-checkpatch-fixes.patch nmi-watchdog-fix-for-lockup-detector-breakage-on-resume.patch kmsg-dev-kmsg-properly-return-possible-copy_from_user-failure.patch btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-fix.patch btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-checkpatch-fixes.patch kmod-avoid-deadlock-from-recursive-kmod-call.patch notify_change-check-that-i_mutex-is-held.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html