mm: memcg: remove unused node/section info from pc->flags
To find the page corresponding to a certain page_cgroup, the pc->flags encoded the node or section ID with the base array to compare the pc pointer to. Now that the per-memory cgroup LRU lists link page descriptors directly, there is no longer any code that knows the struct page_cgroup of a PFN but not the struct page. [hughd@google.com: remove unused node/section info from pc->flags fix] Signed-off-by: Johannes Weiner <jweiner@redhat.com> Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Reviewed-by: Michal Hocko <mhocko@suse.cz> Reviewed-by: Kirill A. Shutemov <kirill@shutemov.name> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Michal Hocko <mhocko@suse.cz> Cc: "Kirill A. Shutemov" <kirill@shutemov.name> Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Cc: Balbir Singh <bsingharora@gmail.com> Cc: Ying Han <yinghan@google.com> Cc: Greg Thelen <gthelen@google.com> Cc: Michel Lespinasse <walken@google.com> Cc: Rik van Riel <riel@redhat.com> Cc: Minchan Kim <minchan.kim@gmail.com> Cc: Christoph Hellwig <hch@infradead.org> Signed-off-by: Hugh Dickins <hughd@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
925b7673cc
commit
6b208e3f6e
@@ -121,39 +121,6 @@ static inline void move_unlock_page_cgroup(struct page_cgroup *pc,
|
||||
local_irq_restore(*flags);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SPARSEMEM
|
||||
#define PCG_ARRAYID_WIDTH SECTIONS_SHIFT
|
||||
#else
|
||||
#define PCG_ARRAYID_WIDTH NODES_SHIFT
|
||||
#endif
|
||||
|
||||
#if (PCG_ARRAYID_WIDTH > BITS_PER_LONG - NR_PCG_FLAGS)
|
||||
#error Not enough space left in pc->flags to store page_cgroup array IDs
|
||||
#endif
|
||||
|
||||
/* pc->flags: ARRAY-ID | FLAGS */
|
||||
|
||||
#define PCG_ARRAYID_MASK ((1UL << PCG_ARRAYID_WIDTH) - 1)
|
||||
|
||||
#define PCG_ARRAYID_OFFSET (BITS_PER_LONG - PCG_ARRAYID_WIDTH)
|
||||
/*
|
||||
* Zero the shift count for non-existent fields, to prevent compiler
|
||||
* warnings and ensure references are optimized away.
|
||||
*/
|
||||
#define PCG_ARRAYID_SHIFT (PCG_ARRAYID_OFFSET * (PCG_ARRAYID_WIDTH != 0))
|
||||
|
||||
static inline void set_page_cgroup_array_id(struct page_cgroup *pc,
|
||||
unsigned long id)
|
||||
{
|
||||
pc->flags &= ~(PCG_ARRAYID_MASK << PCG_ARRAYID_SHIFT);
|
||||
pc->flags |= (id & PCG_ARRAYID_MASK) << PCG_ARRAYID_SHIFT;
|
||||
}
|
||||
|
||||
static inline unsigned long page_cgroup_array_id(struct page_cgroup *pc)
|
||||
{
|
||||
return (pc->flags >> PCG_ARRAYID_SHIFT) & PCG_ARRAYID_MASK;
|
||||
}
|
||||
|
||||
#else /* CONFIG_CGROUP_MEM_RES_CTLR */
|
||||
struct page_cgroup;
|
||||
|
||||
|
Reference in New Issue
Block a user