On Thu, 16 Apr 2009 12:42:36 +0200 Andrea Righi <righi.andrea@xxxxxxxxx> wrote: > On Thu, Apr 16, 2009 at 08:58:14AM +0900, KAMEZAWA Hiroyuki wrote: > > On Wed, 15 Apr 2009 15:23:57 +0200 > > Andrea Righi <righi.andrea@xxxxxxxxx> wrote: > > > > > On Wed, Apr 15, 2009 at 09:38:50PM +0900, Ryo Tsuruta wrote: > > > > Hi Andrea and Kamezawa-san, > > > > > > > > > Ryo, it would be great if you can look at this and fix/integrate into > > > > > the mainstream bio-cgroup. Otherwise I can try to to schedule this in my > > > > > work. > > > > > > > > O.K. I'll apply those fixes and post patches as soon as I can. > > > > > > > > > > Very good! I've just tested the bio_cgroup_id inclusion in > > > page_cgroup->flags. I'm posting the patch on-top-of my patchset. > > > > > > If you're interested, it should apply cleanly to the original > > > bio-cgroup, except for the get/put_cgroup_from_page() part. > > > > > > Thanks, > > > -Andrea > > > --- > > > bio-cgroup: encode bio_cgroup_id in page_cgroup->flags > > > > > > Encode the bio_cgroup_id into the flags argument of page_cgroup as > > > suggested by Kamezawa. > > > > > > Lower 16-bits of the flags attribute are used for the actual page_cgroup > > > flags. The rest is reserved to store the bio-cgroup id. > > > > > > This allows to save 4 bytes (in 32-bit architectures) or 8 bytes (in > > > 64-bit) for each page_cgroup element. > > > > > > Signed-off-by: Andrea Righi <righi.andrea@xxxxxxxxx> > > > --- > > > include/linux/biotrack.h | 2 +- > > > include/linux/page_cgroup.h | 24 +++++++++++++++++++++--- > > > mm/biotrack.c | 26 ++++++++++++-------------- > > > 3 files changed, 34 insertions(+), 18 deletions(-) > > > > > > diff --git a/include/linux/biotrack.h b/include/linux/biotrack.h > > > index 25b8810..4bd0242 100644 > > > --- a/include/linux/biotrack.h > > > +++ b/include/linux/biotrack.h > > > @@ -28,7 +28,7 @@ struct bio_cgroup { > > > > > > static inline void __init_bio_page_cgroup(struct page_cgroup *pc) > > > { > > > - pc->bio_cgroup_id = 0; > > > + page_cgroup_set_bio_id(pc, 0); > > > } > > > > > > extern struct cgroup *get_cgroup_from_page(struct page *page); > > > diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h > > > index 00a49c5..af780a4 100644 > > > --- a/include/linux/page_cgroup.h > > > +++ b/include/linux/page_cgroup.h > > > @@ -16,12 +16,30 @@ struct page_cgroup { > > > #ifdef CONFIG_CGROUP_MEM_RES_CTLR > > > struct mem_cgroup *mem_cgroup; > > > #endif > > > -#ifdef CONFIG_CGROUP_BIO > > > - int bio_cgroup_id; > > > -#endif > > > struct list_head lru; /* per cgroup LRU list */ > > > }; > > > > > > +#ifdef CONFIG_CGROUP_BIO > > > +/* > > > + * use lower 16 bits for flags and reserve the rest for the bio-cgroup id > > > + */ > > > +#define BIO_CGROUP_ID_SHIFT (16) > > > +#define BIO_CGROUP_ID_BITS (8 * sizeof(unsigned long) - BIO_CGROUP_ID_SHIFT) > > > + > > > +static inline unsigned long page_cgroup_get_bio_id(struct page_cgroup *pc) > > > +{ > > > + return pc->flags >> BIO_CGROUP_ID_SHIFT; > > > +} > > > + > > > +static inline void page_cgroup_set_bio_id(struct page_cgroup *pc, > > > + unsigned long id) > > > +{ > > > + WARN_ON(id >= (1UL << BIO_CGROUP_ID_BITS)); > > > + pc->flags &= (1UL << BIO_CGROUP_ID_SHIFT) - 1; > > > + pc->flags |= (unsigned long)(id << BIO_CGROUP_ID_SHIFT); > > > +} > > > +#endif > > > + > > Ah, there is "Lock" bit in pc->flags and above "set" code does read-modify-write > > without lock_page_cgroup(). > > > > Could you use lock_page_cgroup() or cmpxchg ? (or using something magical technique ?) > > If I'm not wrong this should guarantee atomicity without using > lock_page_cgroup(). thread A thread B ================= ====================== val = pc->flags lock_page_cgroup() pc->flags |= hogehoge unlock_page_cgroup() *And* we may add another flags to page_cgroup. plz avoid corner cases. Thanks, -Kame _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers