The patch titled
Subject: gfp: add __GFP_NOACCOUNT
has been removed from the -mm tree. Its filename was
gfp-add-__gfp_noaccount-v2.patch
This patch was dropped because it was folded into gfp-add-__gfp_noaccount.patch
------------------------------------------------------
From: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
Subject: gfp: add __GFP_NOACCOUNT
- explain drawbacks of per kmem cache flag disabling accounting as a possible
alternative to a GFP flag in commit message (Michal)
- warn if __GFP_NOACCOUNT is passed to mem_cgroup_try_charge (Michal)
Signed-off-by: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/gfp.h | 2 +-
mm/memcontrol.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff -puN include/linux/gfp.h~gfp-add-__gfp_noaccount-v2 include/linux/gfp.h
--- a/include/linux/gfp.h~gfp-add-__gfp_noaccount-v2
+++ a/include/linux/gfp.h
@@ -88,7 +88,7 @@ struct vm_area_struct;
#define __GFP_HARDWALL ((__force gfp_t)___GFP_HARDWALL) /* Enforce hardwall cpuset memory allocs */
#define __GFP_THISNODE ((__force gfp_t)___GFP_THISNODE)/* No fallback, no policies */
#define __GFP_RECLAIMABLE ((__force gfp_t)___GFP_RECLAIMABLE) /* Page is reclaimable */
-#define __GFP_NOACCOUNT ((__force gfp_t)___GFP_NOACCOUNT) /* Don't account to memcg */
+#define __GFP_NOACCOUNT ((__force gfp_t)___GFP_NOACCOUNT) /* Don't account to kmemcg */
#define __GFP_NOTRACK ((__force gfp_t)___GFP_NOTRACK) /* Don't track with kmemcheck */
#define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
diff -puN mm/memcontrol.c~gfp-add-__gfp_noaccount-v2 mm/memcontrol.c
--- a/mm/memcontrol.c~gfp-add-__gfp_noaccount-v2
+++ a/mm/memcontrol.c
@@ -5462,6 +5462,8 @@ int mem_cgroup_try_charge(struct page *p
unsigned int nr_pages = 1;
int ret = 0;
+ WARN_ON_ONCE(gfp_mask & __GFP_NOACCOUNT);
+
if (mem_cgroup_disabled())
goto out;
_
Patches currently in -mm which might be from vdavydov@xxxxxxxxxxxxx are
gfp-add-__gfp_noaccount.patch
gfp-add-__gfp_noaccount-v2-fix.patch
kernfs-do-not-account-ino_ida-allocations-to-memcg.patch
rmap-fix-theoretical-race-between-do_wp_page-and-shrink_active_list.patch
rmap-fix-theoretical-race-between-do_wp_page-and-shrink_active_list-fix.patch
rmap-fix-theoretical-race-between-do_wp_page-and-shrink_active_list-fix-fix.patch
mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch
linux-next.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
