提交 bfc245bc 编写于 作者: R Roman Gushchin 提交者: Zheng Zengkai

mm: Introduce page memcg flags

mainline inclusion
from mainline-v5.11-rc1
commit 87944e29
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4C0GB
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=87944e2992bd28098c6806086a1e96bb4d0e502b

----------------------------------------------------------------------

The lowest bit in page->memcg_data is used to distinguish between struct
memory_cgroup pointer and a pointer to a objcgs array.  All checks and
modifications of this bit are open-coded.

Let's formalize it using page memcg flags, defined in enum
page_memcg_data_flags.

Additional flags might be added later.
Signed-off-by: NRoman Gushchin <guro@fb.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
Reviewed-by: NShakeel Butt <shakeelb@google.com>
Acked-by: NJohannes Weiner <hannes@cmpxchg.org>
Acked-by: NMichal Hocko <mhocko@suse.com>
Link: https://lkml.kernel.org/r/20201027001657.3398190-4-guro@fb.com
Link: https://lore.kernel.org/bpf/20201201215900.3569844-4-guro@fb.comSigned-off-by: NChen Huang <chenhuang5@huawei.com>
Reviewed-by: NKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: NChen Wandun <chenwandun@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 dbaf3609
...@@ -373,6 +373,15 @@ extern int sysctl_memcg_qos_handler(struct ctl_table *table, ...@@ -373,6 +373,15 @@ extern int sysctl_memcg_qos_handler(struct ctl_table *table,
extern struct mem_cgroup *root_mem_cgroup; extern struct mem_cgroup *root_mem_cgroup;
enum page_memcg_data_flags {
/* page->memcg_data is a pointer to an objcgs vector */
MEMCG_DATA_OBJCGS = (1UL << 0),
/* the next bit after the last actual flag */
__NR_MEMCG_DATA_FLAGS = (1UL << 1),
};
#define MEMCG_DATA_FLAGS_MASK (__NR_MEMCG_DATA_FLAGS - 1)
/* /*
* page_memcg - get the memory cgroup associated with a page * page_memcg - get the memory cgroup associated with a page
* @page: a pointer to the page struct * @page: a pointer to the page struct
...@@ -434,13 +443,7 @@ static inline struct mem_cgroup *page_memcg_check(struct page *page) ...@@ -434,13 +443,7 @@ static inline struct mem_cgroup *page_memcg_check(struct page *page)
*/ */
unsigned long memcg_data = READ_ONCE(page->memcg_data); unsigned long memcg_data = READ_ONCE(page->memcg_data);
/* if (memcg_data & MEMCG_DATA_OBJCGS)
* The lowest bit set means that memcg isn't a valid
* memcg pointer, but a obj_cgroups pointer.
* In this case the page is shared and doesn't belong
* to any specific memory cgroup.
*/
if (memcg_data & 0x1UL)
return NULL; return NULL;
return (struct mem_cgroup *)memcg_data; return (struct mem_cgroup *)memcg_data;
...@@ -459,7 +462,11 @@ static inline struct mem_cgroup *page_memcg_check(struct page *page) ...@@ -459,7 +462,11 @@ static inline struct mem_cgroup *page_memcg_check(struct page *page)
*/ */
static inline struct obj_cgroup **page_objcgs(struct page *page) static inline struct obj_cgroup **page_objcgs(struct page *page)
{ {
return (struct obj_cgroup **)(READ_ONCE(page->memcg_data) & ~0x1UL); unsigned long memcg_data = READ_ONCE(page->memcg_data);
VM_BUG_ON_PAGE(memcg_data && !(memcg_data & MEMCG_DATA_OBJCGS), page);
return (struct obj_cgroup **)(memcg_data & ~MEMCG_DATA_FLAGS_MASK);
} }
/* /*
...@@ -474,10 +481,10 @@ static inline struct obj_cgroup **page_objcgs_check(struct page *page) ...@@ -474,10 +481,10 @@ static inline struct obj_cgroup **page_objcgs_check(struct page *page)
{ {
unsigned long memcg_data = READ_ONCE(page->memcg_data); unsigned long memcg_data = READ_ONCE(page->memcg_data);
if (memcg_data && (memcg_data & 0x1UL)) if (!memcg_data || !(memcg_data & MEMCG_DATA_OBJCGS))
return (struct obj_cgroup **)(memcg_data & ~0x1UL);
return NULL; return NULL;
return (struct obj_cgroup **)(memcg_data & ~MEMCG_DATA_FLAGS_MASK);
} }
/* /*
...@@ -490,7 +497,8 @@ static inline struct obj_cgroup **page_objcgs_check(struct page *page) ...@@ -490,7 +497,8 @@ static inline struct obj_cgroup **page_objcgs_check(struct page *page)
static inline bool set_page_objcgs(struct page *page, static inline bool set_page_objcgs(struct page *page,
struct obj_cgroup **objcgs) struct obj_cgroup **objcgs)
{ {
return !cmpxchg(&page->memcg_data, 0, (unsigned long)objcgs | 0x1UL); return !cmpxchg(&page->memcg_data, 0, (unsigned long)objcgs |
MEMCG_DATA_OBJCGS);
} }
#else #else
static inline struct obj_cgroup **page_objcgs(struct page *page) static inline struct obj_cgroup **page_objcgs(struct page *page)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册