mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
![Tejun Heo](/assets/img/avatar_default.png)
cgroup_subsys is a bit messier than it needs to be.
* The name of a subsys can be different from its internal identifier
defined in cgroup_subsys.h. Most subsystems use the matching name
but three - cpu, memory and perf_event - use different ones.
* cgroup_subsys_id enums are postfixed with _subsys_id and each
cgroup_subsys is postfixed with _subsys. cgroup.h is widely
included throughout various subsystems, it doesn't and shouldn't
have claim on such generic names which don't have any qualifier
indicating that they belong to cgroup.
* cgroup_subsys->subsys_id should always equal the matching
cgroup_subsys_id enum; however, we require each controller to
initialize it and then BUG if they don't match, which is a bit
silly.
This patch cleans up cgroup_subsys names and initialization by doing
the followings.
* cgroup_subsys_id enums are now postfixed with _cgrp_id, and each
cgroup_subsys with _cgrp_subsys.
* With the above, renaming subsys identifiers to match the userland
visible names doesn't cause any naming conflicts. All non-matching
identifiers are renamed to match the official names.
cpu_cgroup -> cpu
mem_cgroup -> memory
perf -> perf_event
* controllers no longer need to initialize ->subsys_id and ->name.
They're generated in cgroup core and set automatically during boot.
* Redundant cgroup_subsys declarations removed.
* While updating BUG_ON()s in cgroup_init_early(), convert them to
WARN()s. BUGging that early during boot is stupid - the kernel
can't print anything, even through serial console and the trap
handler doesn't even link stack frame properly for back-tracing.
This patch doesn't introduce any behavior changes.
v2: Rebased on top of fe1217c4f3
("net: net_cls: move cgroupfs
classid handling into core").
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: "David S. Miller" <davem@davemloft.net>
Acked-by: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Acked-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Aristeu Rozanski <aris@redhat.com>
Acked-by: Ingo Molnar <mingo@redhat.com>
Acked-by: Li Zefan <lizefan@huawei.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Serge E. Hallyn <serue@us.ibm.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Thomas Graf <tgraf@suug.ch>
126 lines
3 KiB
C
126 lines
3 KiB
C
/*
|
|
* Copyright IBM Corporation, 2012
|
|
* Author Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of version 2.1 of the GNU Lesser General Public License
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it would be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
*
|
|
*/
|
|
|
|
#ifndef _LINUX_HUGETLB_CGROUP_H
|
|
#define _LINUX_HUGETLB_CGROUP_H
|
|
|
|
#include <linux/mmdebug.h>
|
|
#include <linux/res_counter.h>
|
|
|
|
struct hugetlb_cgroup;
|
|
/*
|
|
* Minimum page order trackable by hugetlb cgroup.
|
|
* At least 3 pages are necessary for all the tracking information.
|
|
*/
|
|
#define HUGETLB_CGROUP_MIN_ORDER 2
|
|
|
|
#ifdef CONFIG_CGROUP_HUGETLB
|
|
|
|
static inline struct hugetlb_cgroup *hugetlb_cgroup_from_page(struct page *page)
|
|
{
|
|
VM_BUG_ON_PAGE(!PageHuge(page), page);
|
|
|
|
if (compound_order(page) < HUGETLB_CGROUP_MIN_ORDER)
|
|
return NULL;
|
|
return (struct hugetlb_cgroup *)page[2].lru.next;
|
|
}
|
|
|
|
static inline
|
|
int set_hugetlb_cgroup(struct page *page, struct hugetlb_cgroup *h_cg)
|
|
{
|
|
VM_BUG_ON_PAGE(!PageHuge(page), page);
|
|
|
|
if (compound_order(page) < HUGETLB_CGROUP_MIN_ORDER)
|
|
return -1;
|
|
page[2].lru.next = (void *)h_cg;
|
|
return 0;
|
|
}
|
|
|
|
static inline bool hugetlb_cgroup_disabled(void)
|
|
{
|
|
if (hugetlb_cgrp_subsys.disabled)
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
extern int hugetlb_cgroup_charge_cgroup(int idx, unsigned long nr_pages,
|
|
struct hugetlb_cgroup **ptr);
|
|
extern void hugetlb_cgroup_commit_charge(int idx, unsigned long nr_pages,
|
|
struct hugetlb_cgroup *h_cg,
|
|
struct page *page);
|
|
extern void hugetlb_cgroup_uncharge_page(int idx, unsigned long nr_pages,
|
|
struct page *page);
|
|
extern void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
|
|
struct hugetlb_cgroup *h_cg);
|
|
extern void hugetlb_cgroup_file_init(void) __init;
|
|
extern void hugetlb_cgroup_migrate(struct page *oldhpage,
|
|
struct page *newhpage);
|
|
|
|
#else
|
|
static inline struct hugetlb_cgroup *hugetlb_cgroup_from_page(struct page *page)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline
|
|
int set_hugetlb_cgroup(struct page *page, struct hugetlb_cgroup *h_cg)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline bool hugetlb_cgroup_disabled(void)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static inline int
|
|
hugetlb_cgroup_charge_cgroup(int idx, unsigned long nr_pages,
|
|
struct hugetlb_cgroup **ptr)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void
|
|
hugetlb_cgroup_commit_charge(int idx, unsigned long nr_pages,
|
|
struct hugetlb_cgroup *h_cg,
|
|
struct page *page)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline void
|
|
hugetlb_cgroup_uncharge_page(int idx, unsigned long nr_pages, struct page *page)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline void
|
|
hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
|
|
struct hugetlb_cgroup *h_cg)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline void hugetlb_cgroup_file_init(void)
|
|
{
|
|
}
|
|
|
|
static inline void hugetlb_cgroup_migrate(struct page *oldhpage,
|
|
struct page *newhpage)
|
|
{
|
|
return;
|
|
}
|
|
|
|
#endif /* CONFIG_MEM_RES_CTLR_HUGETLB */
|
|
#endif
|