On Tue 03-11-15 15:32:11, Andrew Morton wrote: > From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Subject: memcg-fix-thresholds-for-32b-architectures-fix-fix > > don't attempt to inline mem_cgroup_usage() > > The compiler ignores the inline anwyay. And __always_inlining it adds 600 > bytes of goop to the .o file. I am not sure you whether you want to fold this into the original patch but I would prefer this to be a separate one. Anyway it makes a good sense. The only performance semi-sensitive path would be __mem_cgroup_threshold but I seriously doubt a single function call would make a measurable difference because memcg_check_events is rate limited. > Cc: Ben Hutchings <ben@xxxxxxxxxxxxxxx> > Cc: Johannes Weiner <hannes@xxxxxxxxxxx> > Cc: Michal Hocko <mhocko@xxxxxxxxxx> > Cc: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Acked-by: Michal Hocko <mhocko@xxxxxxxx> Thanks! > --- > > mm/memcontrol.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff -puN mm/memcontrol.c~memcg-fix-thresholds-for-32b-architectures-fix-fix mm/memcontrol.c > --- a/mm/memcontrol.c~memcg-fix-thresholds-for-32b-architectures-fix-fix > +++ a/mm/memcontrol.c > @@ -2801,7 +2801,7 @@ static unsigned long tree_stat(struct me > return val; > } > > -static inline unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) > +static unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) > { > unsigned long val; > > _ > > Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are > > arch-alpha-kernel-systblss-remove-debug-check.patch > drivers-gpu-drm-i915-intel_spritec-fix-build.patch > drivers-gpu-drm-i915-intel_tvc-fix-build.patch > mm.patch > slub-optimize-bulk-slowpath-free-by-detached-freelist-fix.patch > uaccess-reimplement-probe_kernel_address-using-probe_kernel_read.patch > uaccess-reimplement-probe_kernel_address-using-probe_kernel_read-fix.patch > uaccess-reimplement-probe_kernel_address-using-probe_kernel_read-fix-fix.patch > mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-fix.patch > mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-checkpatch-fixes.patch > mm-page_alloc-only-enforce-watermarks-for-order-0-allocations-fix-fix.patch > mm-fix-declarations-of-nr-delta-and-nr_pagecache_reclaimable-fix.patch > mm-oom_kill-fix-the-wrong-task-mm-==-mm-checks-in-oom_kill_process-fix.patch > include-linux-mmzoneh-reflow-comment.patch > mm-fs-introduce-mapping_gfp_constraint-checkpatch-fixes.patch > mm-vmstatc-uninline-node_page_state.patch > mm-vmstatc-uninline-node_page_state-fix.patch > mm-cmac-suppress-warning.patch > memcg-fix-thresholds-for-32b-architectures-fix-fix.patch > kasan-various-fixes-in-documentation-checkpatch-fixes.patch > mm-slub-kasan-enable-user-tracking-by-default-with-kasan=y-fix.patch > zsmalloc-add-comments-for-inuse-to-zspage-v2-fix.patch > page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch > mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix.patch > mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-checkpatch-fixes.patch > mm-increase-swap_cluster_max-to-batch-tlb-flushes-fix-fix.patch > include-linux-compiler-gcch-improve-__visible-documentation.patch > fs-jffs2-wbufc-remove-stray-semicolon.patch > lib-documentation-synchronize-%p-formatting-documentation-fix-fix.patch > rbtree-clarify-documentation-of-rbtree_postorder_for_each_entry_safe-fix.patch > dma-mapping-tidy-up-dma_parms-default-handling-fix.patch > panic-release-stale-console-lock-to-always-get-the-logbuf-printed-out-fix.patch > linux-next-rejects.patch > mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-nvem-fix.patch > mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix.patch > mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix-fix.patch > net-ipv4-routec-prevent-oops.patch > remove-abs64.patch > remove-abs64-fix.patch > remove-abs64-fix-fix.patch > remove-abs64-fix-fix-fix.patch > do_shared_fault-check-that-mmap_sem-is-held.patch > kernel-forkc-export-kernel_thread-to-modules.patch > slab-leaks3-default-y.patch -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>