| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20120531053952.GC24855@skywalker.linux.vnet.ibm.com>
Date: Thu, 31 May 2012 11:09:52 +0530
From: "Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>
To: Konrad Rzeszutek Wilk <konrad@...nok.org>
Cc: linux-mm@...ck.org, kamezawa.hiroyu@...fujitsu.com,
dhillf@...il.com, rientjes@...gle.com, mhocko@...e.cz,
akpm@...ux-foundation.org, hannes@...xchg.org,
linux-kernel@...r.kernel.org, cgroups@...r.kernel.org
Subject: Re: [PATCH -V7 11/14] hugetlbfs: add hugetlb cgroup control files
On Wed, May 30, 2012 at 09:32:25PM -0400, Konrad Rzeszutek Wilk wrote:
> On Wed, May 30, 2012 at 08:08:56PM +0530, Aneesh Kumar K.V wrote:
> > From: "Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>
> >
> > Add the control files for hugetlb controller
> >
> > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@...ux.vnet.ibm.com>
> > ---
> > include/linux/hugetlb.h | 5 ++
> > include/linux/hugetlb_cgroup.h | 6 ++
> > mm/hugetlb.c | 2 +
> > mm/hugetlb_cgroup.c | 130 ++++++++++++++++++++++++++++++++++++++++
> > 4 files changed, 143 insertions(+)
> >
> > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
> > index dcd55c7..92f75a5 100644
> > --- a/include/linux/hugetlb.h
> > +++ b/include/linux/hugetlb.h
> > @@ -4,6 +4,7 @@
> > #include <linux/mm_types.h>
> > #include <linux/fs.h>
> > #include <linux/hugetlb_inline.h>
> > +#include <linux/cgroup.h>
> >
> > struct ctl_table;
> > struct user_struct;
> > @@ -221,6 +222,10 @@ struct hstate {
> > unsigned int nr_huge_pages_node[MAX_NUMNODES];
> > unsigned int free_huge_pages_node[MAX_NUMNODES];
> > unsigned int surplus_huge_pages_node[MAX_NUMNODES];
> > +#ifdef CONFIG_CGROUP_HUGETLB_RES_CTLR
> > + /* cgroup control files */
> > + struct cftype cgroup_files[5];
>
> Why five? Should there be a #define for this magic value?
>
Because we have 4 control files. Was not sure whether that should be a #define because
we are not going to use that #define anywhere else. Also the same patch index them
in hugetlb_file_init. That is the only place it is used.
> > +#endif
> > char name[HSTATE_NAME_LEN];
> > };
> >
> > diff --git a/include/linux/hugetlb_cgroup.h b/include/linux/hugetlb_cgroup.h
> > index 5794be4..fbf8c5f 100644
> > --- a/include/linux/hugetlb_cgroup.h
> > +++ b/include/linux/hugetlb_cgroup.h
> > @@ -42,6 +42,7 @@ 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 int hugetlb_cgroup_file_init(int idx) __init;
> > #else
> > static inline bool hugetlb_cgroup_disabled(void)
> > {
> > @@ -75,5 +76,10 @@ hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
> > {
> > return;
> > }
> > +
> > +static inline int __init hugetlb_cgroup_file_init(int idx)
> > +{
> > + return 0;
> > +}
> > #endif /* CONFIG_MEM_RES_CTLR_HUGETLB */
> > #endif
> > diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> > index 53840dd..6330de2 100644
> > --- a/mm/hugetlb.c
> > +++ b/mm/hugetlb.c
> > @@ -29,6 +29,7 @@
> > #include <linux/io.h>
> > #include <linux/hugetlb.h>
> > #include <linux/node.h>
> > +#include <linux/hugetlb_cgroup.h>
> > #include "internal.h"
> >
> > const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
> > @@ -1912,6 +1913,7 @@ void __init hugetlb_add_hstate(unsigned order)
> > h->next_nid_to_free = first_node(node_states[N_HIGH_MEMORY]);
> > snprintf(h->name, HSTATE_NAME_LEN, "hugepages-%lukB",
> > huge_page_size(h)/1024);
> > + hugetlb_cgroup_file_init(hugetlb_max_hstate - 1);
> >
> > parsed_hstate = h;
> > }
> > diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
> > index 3a288f7..49a3f20 100644
> > --- a/mm/hugetlb_cgroup.c
> > +++ b/mm/hugetlb_cgroup.c
> > @@ -19,6 +19,11 @@
> > #include <linux/page_cgroup.h>
> > #include <linux/hugetlb_cgroup.h>
> >
> > +/* lifted from mem control */
>
> Might also include the comment from said file explaining the
> purpose of these #define.
>
> > +#define MEMFILE_PRIVATE(x, val) (((x) << 16) | (val))
> > +#define MEMFILE_IDX(val) (((val) >> 16) & 0xffff)
> > +#define MEMFILE_ATTR(val) ((val) & 0xffff)
> > +
> > struct cgroup_subsys hugetlb_subsys __read_mostly;
> > struct hugetlb_cgroup *root_h_cgroup __read_mostly;
> >
> > @@ -271,6 +276,131 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
> > return;
> > }
> >
> > +static ssize_t hugetlb_cgroup_read(struct cgroup *cgroup, struct cftype *cft,
> > + struct file *file, char __user *buf,
> > + size_t nbytes, loff_t *ppos)
> > +{
> > + u64 val;
> > + char str[64];
>
> I would think there would be a define for this somewhere?
lifted from mem_cgroup_read. Number is big enough to find the return for usage_in_bytes,
limit_in_bytes etc
>
> > + int idx, name, len;
> > + struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_cgroup(cgroup);
> > +
> > + idx = MEMFILE_IDX(cft->private);
> > + name = MEMFILE_ATTR(cft->private);
> > +
> > + val = res_counter_read_u64(&h_cg->hugepage[idx], name);
> > + len = scnprintf(str, sizeof(str), "%llu\n", (unsigned long long)val);
> > + return simple_read_from_buffer(buf, nbytes, ppos, str, len);
> > +}
> > +
......
......
> > + cft->private = MEMFILE_PRIVATE(idx, RES_USAGE);
> > + cft->read = hugetlb_cgroup_read;
> > +
> > + /* Add the MAX usage file */
> > + cft = &h->cgroup_files[2];
> > + snprintf(cft->name, MAX_CFTYPE_NAME, "%s.max_usage_in_bytes", buf);
> > + cft->private = MEMFILE_PRIVATE(idx, RES_MAX_USAGE);
> > + cft->trigger = hugetlb_cgroup_reset;
> > + cft->read = hugetlb_cgroup_read;
> > +
> > + /* Add the failcntfile */
> > + cft = &h->cgroup_files[3];
> > + snprintf(cft->name, MAX_CFTYPE_NAME, "%s.failcnt", buf);
> > + cft->private = MEMFILE_PRIVATE(idx, RES_FAILCNT);
> > + cft->trigger = hugetlb_cgroup_reset;
> > + cft->read = hugetlb_cgroup_read;
> > +
> > + /* NULL terminate the last cft */
> > + cft = &h->cgroup_files[4];
> > + memset(cft, 0, sizeof(*cft));
> > +
> > + WARN_ON(cgroup_add_cftypes(&hugetlb_subsys, h->cgroup_files));
> > +
>
> Wouldn't doing:
> return cgroup_add_cftypes(&hugetlb_subsys, h->cgroup_files);
>
> be more appropiate?
cgroup wanted a WARN_ON around that IIUC. I guess we will drop all of the later.
> > + return 0;
> > +}
> > +
> > struct cgroup_subsys hugetlb_subsys = {
> > .name = "hugetlb",
> > .create = hugetlb_cgroup_create,
> > --
> > 1.7.10
> >
-aneesh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists