kernfs,cgroup: support 64bit inos and unify cgroup IDs
Subsystems (10)
Tejun Heo
maintainerPATCH 1/1 kernfs,cgroup: support 64bit inos and unify cgroup IDs
Hello,
Currently, there are three IDs which are being used to identify a cgroup.
1. cgroup->id
2. cgroupfs 32bit ino
3. cgroupfs 32bit ino + 32bit gen
All three IDs are visible to userland through different interfaces. This is very confusing and #1 can't even be resolved to cgroups from userland.
A 64bit number is sufficient to identify a cgroup instance uniquely and ino_t is 64bit on all archs except for alpha. There's no reason for three different IDs at all. This patchset updates kernfs so that it supports 64bit ino and associated exportfs operations and unifies the cgroup IDs.
* On 64bit ino archs, ino is kernfs node ID which is also the cgroup ID. The ino can be passed directly into open_by_handle_at(2) w/ the new key type FILEID_KERNFS. Backward compatibility is maintained for FILEID_INO32_GEN keys.
* On 32bit ino archs, kernfs node ID is still 64bit and the cgroup ID. ino is the low 32bits and gen is the high 32bits. If the high 32bits is zero, open_by_handle_at(2) only matches the ino part of the ID allowing userland to resolve inos to cgroups as long as distinguishing recycled inos isn't necessary.
This patchset contains the following 10 patches.
0001-kernfs-fix-ino-wrap-around-detection.patch 0002-writeback-use-ino_t-for-inodes-in-tracepoints.patch 0003-netprio-use-css-ID-instead-of-cgroup-ID.patch 0004-kernfs-use-dumber-locking-for-kernfs_find_and_get_no.patch 0005-kernfs-kernfs_find_and_get_node_by_ino-should-only-l.patch 0006-kernfs-convert-kernfs_node-id-from-union-kernfs_node.patch 0007-kernfs-combine-ino-id-lookup-functions-into-kernfs_f.patch 0008-kernfs-implement-custom-exportfs-ops-and-fid-type.patch 0009-kernfs-use-64bit-inos-if-ino_t-is-64bit.patch 0010-cgroup-use-cgrp-kn-id-as-the-cgroup-ID.patch
0001 is a fix which should be backported through -stable. 0002 and 0003 are prep patches. 0004-0009 make kernfs_node->id a u64 and use it as ino on 64bit ino archs. 0010 replaces cgroup->id with the kernfs node ID.
Greg, how do you want to route the patches? We can route 0001-0009 through your tree and the last one through cgroup after pulling in. I'd be happy to route them all too.
This patchset is also available in the following git branch.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git review-unified-cgid
diffstat follows. Thanks.
fs/kernfs/dir.c | 101 +++++++++++++++++++------------------- fs/kernfs/file.c | 4 - fs/kernfs/inode.c | 4 - fs/kernfs/kernfs-internal.h | 2 fs/kernfs/mount.c | 102 ++++++++++++++++++++++----------------- include/linux/cgroup-defs.h | 17 ------ include/linux/cgroup.h | 26 ++++----- include/linux/exportfs.h | 5 + include/linux/kernfs.h | 57 ++++++++++++++------- include/net/netprio_cgroup.h | 2 include/trace/events/cgroup.h | 6 +- include/trace/events/writeback.h | 92 +++++++++++++++++------------------ kernel/bpf/helpers.c | 2 kernel/bpf/local_storage.c | 2 kernel/cgroup/cgroup.c | 81 ++++++++++-------------------- kernel/trace/blktrace.c | 84 +++++++++++++++++--------------- net/core/filter.c | 4 - net/core/netprio_cgroup.c | 8 +-- 18 files changed, 301 insertions(+), 298 deletions(-)
--
tejun
Tejun Heo
maintainerPATCH 1/10 kernfs: fix ino wrap-around detection
When the 32bit ino wraps around, kernfs increments the generation number to distinguish reused ino instances. The wrap-around detection tests whether the allocated ino is lower than what the cursor but the cursor is pointing to the next ino to allocate so the condition never triggers.
Fix it by remembering the last ino and comparing against that.
--- fs/kernfs/dir.c | 5 ++--- include/linux/kernfs.h | 1 + 2 files changed, 3 insertions(+), 3 deletions(-)
fs/kernfs/dir.c +2 -3
@@ -622,7 +622,6 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root, {struct kernfs_node *kn;u32 gen; -int cursor;int ret; name =kstrdup_const (name,GFP_KERNEL );
@@ -635,11 +634,11 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,idr_preload (GFP_KERNEL );spin_lock (&kernfs_idr_lock); - cursor =idr_get_cursor (&root->ino_idr); ret =idr_alloc_cyclic (&root->ino_idr, kn,1 ,0 ,GFP_ATOMIC ); -if (ret >=0 && ret < cursor) +if (ret >=0 && ret < root->last_ino) root->next_generation++; gen = root->next_generation; + root->last_ino = ret;spin_unlock (&kernfs_idr_lock);idr_preload_end ();if (ret <0 )
include/linux/kernfs.h +1 -0
@@ -187,6 +187,7 @@ struct kernfs_root {/* private fields, do not use outside kernfs proper */ struct idr ino_idr; +u32 last_ino;u32 next_generation;struct kernfs_syscall_ops *syscall_ops;
Signature · 1 line
2.17.1
Tejun Heo
maintainerPATCH 2/10 writeback: use ino_t for inodes in tracepoints
In reply to Tejun HeoWriteback TPs currently use mix of 32 and 64bits for inos. This isn't currently broken because only cgroup inos are using 32bits and they're limited to 32bits. cgroup inos will make use of 64bits. Let's uniformly use ino_t.
While at it, switch the default cgroup ino value used when cgroup is disabled to 1 instead of -1U as root cgroup always uses ino 1.
---
Hello,
This is to prepare for kernfs 64bit ino support. It'd be best to route this with the rest of kernfs patchset.
Thanks.
include/trace/events/writeback.h | 88 ++++++++++++++++---------------- 1 file changed, 44 insertions(+), 44 deletions(-)
include/trace/events/writeback.h +44 -44
@@ -61,7 +61,7 @@ DECLARE_EVENT_CLASS(writeback_page_template,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) + __field(ino_t, ino)__field (pgoff_t, index) ),
@@ -102,7 +102,7 @@ DECLARE_EVENT_CLASS(writeback_dirty_inode_template,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) + __field(ino_t, ino) __field(unsigned long, state) __field(unsigned long, flags) ),
@@ -150,28 +150,28 @@ DEFINE_EVENT(writeback_dirty_inode_template, writeback_dirty_inode,#ifdef CREATE_TRACE_POINTS #ifdef CONFIG_CGROUP_WRITEBACK -static inline unsigned int __trace_wb_assign_cgroup (struct bdi_writeback *wb) +static inline ino_t __trace_wb_assign_cgroup (struct bdi_writeback *wb) {return wb->memcg_css->cgroup->kn->id.ino; } -static inline unsigned int __trace_wbc_assign_cgroup (struct writeback_control *wbc) +static inline ino_t __trace_wbc_assign_cgroup (struct writeback_control *wbc) {if (wbc->wb)return __trace_wb_assign_cgroup (wbc->wb);else -return -1U ; +return 1 ; }#else /* CONFIG_CGROUP_WRITEBACK */ -static inline unsigned int __trace_wb_assign_cgroup (struct bdi_writeback *wb) +static inline ino_t __trace_wb_assign_cgroup (struct bdi_writeback *wb) { -return -1U ; +return 1 ; } -static inline unsigned int __trace_wbc_assign_cgroup (struct writeback_control *wbc) +static inline ino_t __trace_wbc_assign_cgroup (struct writeback_control *wbc) { -return -1U ; +return 1 ; }#endif /* CONFIG_CGROUP_WRITEBACK */
@@ -187,8 +187,8 @@ TRACE_EVENT(inode_foreign_history,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) - __field(unsigned int, cgroup_ino) + __field(ino_t, ino) + __field(ino_t, cgroup_ino) __field(unsigned int, history) ),
@@ -199,7 +199,7 @@ TRACE_EVENT(inode_foreign_history, __entry->history = history; ), - TP_printk("bdi %s: ino=%lu cgroup_ino=%u history=0x%x", + TP_printk("bdi %s: ino=%lu cgroup_ino=%lu history=0x%x", __entry->name, __entry->ino, __entry->cgroup_ino,
@@ -216,9 +216,9 @@ TRACE_EVENT(inode_switch_wbs,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) - __field(unsigned int, old_cgroup_ino) - __field(unsigned int, new_cgroup_ino) + __field(ino_t, ino) + __field(ino_t, old_cgroup_ino) +__field (ino_t, new_cgroup_ino) ), TP_fast_assign(
@@ -228,7 +228,7 @@ TRACE_EVENT(inode_switch_wbs, __entry->new_cgroup_ino =__trace_wb_assign_cgroup (new_wb); ), - TP_printk("bdi %s: ino=%lu old_cgroup_ino=%u new_cgroup_ino=%u", + TP_printk("bdi %s: ino=%lu old_cgroup_ino=%lu new_cgroup_ino=%lu", __entry->name, __entry->ino, __entry->old_cgroup_ino,
@@ -245,10 +245,10 @@ TRACE_EVENT(track_foreign_dirty,TP_STRUCT__entry ( __array(char, name, 32) __field(u64, bdi_id) - __field(unsigned long, ino) + __field(ino_t, ino) __field(unsigned int, memcg_id) - __field(unsigned int, cgroup_ino) - __field(unsigned int, page_cgroup_ino) + __field(ino_t, cgroup_ino) +__field (ino_t, page_cgroup_ino) ), TP_fast_assign(
@@ -263,7 +263,7 @@ TRACE_EVENT(track_foreign_dirty, __entry->page_cgroup_ino = page->mem_cgroup->css.cgroup->kn->id.ino; ), - TP_printk("bdi %s[%llu]: ino=%lu memcg_id=%u cgroup_ino=%u page_cgroup_ino=%u", + TP_printk("bdi %s[%llu]: ino=%lu memcg_id=%u cgroup_ino=%lu page_cgroup_ino=%lu", __entry->name, __entry->bdi_id, __entry->ino,
@@ -282,7 +282,7 @@ TRACE_EVENT(flush_foreign,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned int, cgroup_ino) + __field(ino_t, cgroup_ino) __field(unsigned int, frn_bdi_id) __field(unsigned int, frn_memcg_id) ),
@@ -294,7 +294,7 @@ TRACE_EVENT(flush_foreign, __entry->frn_memcg_id = frn_memcg_id; ), - TP_printk("bdi %s: cgroup_ino=%u frn_bdi_id=%u frn_memcg_id=%u", + TP_printk("bdi %s: cgroup_ino=%lu frn_bdi_id=%u frn_memcg_id=%u", __entry->name, __entry->cgroup_ino, __entry->frn_bdi_id,
@@ -311,9 +311,9 @@ DECLARE_EVENT_CLASS(writeback_write_inode_template,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) + __field(ino_t, ino) __field(int, sync_mode) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ), TP_fast_assign(
@@ -324,7 +324,7 @@ DECLARE_EVENT_CLASS(writeback_write_inode_template, __entry->cgroup_ino =__trace_wbc_assign_cgroup (wbc); ), - TP_printk("bdi %s: ino=%lu sync_mode=%d cgroup_ino=%u", + TP_printk("bdi %s: ino=%lu sync_mode=%d cgroup_ino=%lu", __entry->name, __entry->ino, __entry->sync_mode,
@@ -358,7 +358,7 @@ DECLARE_EVENT_CLASS(writeback_work_class, __field(int, range_cyclic) __field(int, for_background) __field(int, reason) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ), TP_fast_assign( strscpy_pad(__entry->name,
@@ -374,7 +374,7 @@ DECLARE_EVENT_CLASS(writeback_work_class, __entry->cgroup_ino =__trace_wb_assign_cgroup (wb); ), TP_printk("bdi %s: sb_dev %d:%d nr_pages=%ld sync_mode=%d " - "kupdate=%d range_cyclic=%d background=%d reason=%s cgroup_ino=%u", + "kupdate=%d range_cyclic=%d background=%d reason=%s cgroup_ino=%lu", __entry->name, MAJOR(__entry->sb_dev), MINOR(__entry->sb_dev), __entry->nr_pages,
@@ -413,13 +413,13 @@ DECLARE_EVENT_CLASS(writeback_class,TP_ARGS (wb),TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ),TP_fast_assign ( strscpy_pad(__entry->name, dev_name(wb->bdi->dev), 32); __entry->cgroup_ino =__trace_wb_assign_cgroup (wb); ), -TP_printk ("bdi %s: cgroup_ino=%u" , +TP_printk ("bdi %s: cgroup_ino=%lu" , __entry->name, __entry->cgroup_ino )
@@ -459,7 +459,7 @@ DECLARE_EVENT_CLASS(wbc_class, __field(int, range_cyclic) __field(long, range_start) __field(long, range_end) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ), TP_fast_assign(
@@ -478,7 +478,7 @@ DECLARE_EVENT_CLASS(wbc_class, TP_printk("bdi %s: towrt=%ld skip=%ld mode=%d kupd=%d " "bgrd=%d reclm=%d cyclic=%d " - "start=0x%lx end=0x%lx cgroup_ino=%u", + "start=0x%lx end=0x%lx cgroup_ino=%lu", __entry->name, __entry->nr_to_write, __entry->pages_skipped,
@@ -510,7 +510,7 @@ TRACE_EVENT(writeback_queue_io, __field(long, age) __field(int, moved) __field(int, reason) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ),TP_fast_assign ( unsigned long *older_than_this = work->older_than_this;
@@ -522,7 +522,7 @@ TRACE_EVENT(writeback_queue_io, __entry->reason = work->reason; __entry->cgroup_ino =__trace_wb_assign_cgroup (wb); ), - TP_printk("bdi %s: older=%lu age=%ld enqueue=%d reason=%s cgroup_ino=%u", + TP_printk("bdi %s: older=%lu age=%ld enqueue=%d reason=%s cgroup_ino=%lu", __entry->name, __entry->older, /* older_than_this in jiffies */ __entry->age, /* older_than_this in relative milliseconds */
@@ -596,7 +596,7 @@ TRACE_EVENT(bdi_dirty_ratelimit, __field(unsigned long, dirty_ratelimit) __field(unsigned long, task_ratelimit) __field(unsigned long, balanced_dirty_ratelimit) - __field(unsigned int, cgroup_ino) + __field(ino_t, cgroup_ino) ), TP_fast_assign(
@@ -614,7 +614,7 @@ TRACE_EVENT(bdi_dirty_ratelimit, TP_printk("bdi %s: " "write_bw=%lu awrite_bw=%lu dirty_rate=%lu " "dirty_ratelimit=%lu task_ratelimit=%lu " - "balanced_dirty_ratelimit=%lu cgroup_ino=%u", + "balanced_dirty_ratelimit=%lu cgroup_ino=%lu", __entry->bdi, __entry->write_bw, /* write bandwidth */ __entry->avg_write_bw, /* avg write bandwidth */
@@ -660,7 +660,7 @@ TRACE_EVENT(balance_dirty_pages, __field( long, pause) __field(unsigned long, period) __field( long, think) - __field(unsigned int, cgroup_ino) + __field(ino_t, cgroup_ino) ), TP_fast_assign(
@@ -692,7 +692,7 @@ TRACE_EVENT(balance_dirty_pages,"bdi_setpoint=%lu bdi_dirty=%lu " "dirty_ratelimit=%lu task_ratelimit=%lu " "dirtied=%u dirtied_pause=%u " -"paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%u" , +"paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%lu" , __entry->bdi, __entry->limit, __entry->setpoint,
@@ -718,10 +718,10 @@ TRACE_EVENT(writeback_sb_inodes_requeue,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) + __field(ino_t, ino) __field(unsigned long, state) __field(unsigned long, dirtied_when) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ), TP_fast_assign(
@@ -733,7 +733,7 @@ TRACE_EVENT(writeback_sb_inodes_requeue, __entry->cgroup_ino =__trace_wb_assign_cgroup (inode_to_wb (inode)); ), - TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu cgroup_ino=%u", + TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu cgroup_ino=%lu", __entry->name, __entry->ino, show_inode_state(__entry->state),
@@ -789,13 +789,13 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) + __field(ino_t, ino) __field(unsigned long, state) __field(unsigned long, dirtied_when) __field(unsigned long, writeback_index) __field(long, nr_to_write) __field(unsigned long, wrote) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ), TP_fast_assign(
@@ -811,7 +811,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template, ), TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu " - "index=%lu to_write=%ld wrote=%lu cgroup_ino=%u", + "index=%lu to_write=%ld wrote=%lu cgroup_ino=%lu", __entry->name, __entry->ino, show_inode_state(__entry->state),
@@ -845,7 +845,7 @@ DECLARE_EVENT_CLASS(writeback_inode_template,TP_STRUCT__entry (__field (dev_t ,dev ) - __field(unsigned long, ino ) +__field ( ino_t, ino ) __field(unsigned long, state )__field ( __u16, mode ) __field(unsigned long, dirtied_when )
Signature · 1 line
2.17.1
Re: [PATCH 02/10] writeback: use ino_t for inodes in tracepoints
Quoted 5 lines · Tejun Heo
Writeback TPs currently use mix of 32 and 64bits for inos. This isn't currently broken because only cgroup inos are using 32bits and they're limited to 32bits. cgroup inos will make use of 64bits. Let's uniformly use
ino_t.
Quoted 7 lines
While at it, switch the default cgroup ino value used when cgroup is disabled to 1 instead of -1U as root cgroup always uses ino 1.
Signed-off-by Tejun Heo <[email protected]>Cc Jan Kara <[email protected]>Cc Jens Axboe <[email protected]>Cc Namhyung Kim <[email protected]>
Thanks! The patch looks good to me. You can add:
Honza
Quoted 338 lines
---
Hello,This is to prepare for kernfs 64bit ino support. It'd be best to route this with the rest of kernfs patchset.
Thanks.
include/trace/events/writeback.h | 88 ++++++++++++++++---------------- 1 file changed, 44 insertions(+), 44 deletions(-)include/trace/events/writeback.h +44
-44@@ -61,7 +61,7 @@ DECLARE_EVENT_CLASS(writeback_page_template,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) + __field(ino_t, ino)__field (pgoff_t, index) ),@@ -102,7 +102,7 @@ DECLARE_EVENT_CLASS(writeback_dirty_inode_template,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) + __field(ino_t, ino) __field(unsigned long, state) __field(unsigned long, flags) ),@@ -150,28 +150,28 @@ DEFINE_EVENT(writeback_dirty_inode_template, writeback_dirty_inode,#ifdef CREATE_TRACE_POINTS #ifdef CONFIG_CGROUP_WRITEBACK -static inline unsigned int __trace_wb_assign_cgroup (struct bdi_writeback *wb) +static inline ino_t __trace_wb_assign_cgroup (struct bdi_writeback *wb) {return wb->memcg_css->cgroup->kn->id.ino; } -static inline unsigned int __trace_wbc_assign_cgroup (struct writeback_control *wbc) +static inline ino_t __trace_wbc_assign_cgroup (struct writeback_control *wbc) {if (wbc->wb)return __trace_wb_assign_cgroup (wbc->wb);else -return -1U ; +return 1 ; }#else /* CONFIG_CGROUP_WRITEBACK */ -static inline unsigned int __trace_wb_assign_cgroup (struct bdi_writeback *wb) +static inline ino_t __trace_wb_assign_cgroup (struct bdi_writeback *wb) { -return -1U ; +return 1 ; } -static inline unsigned int __trace_wbc_assign_cgroup (struct writeback_control *wbc) +static inline ino_t __trace_wbc_assign_cgroup (struct writeback_control *wbc) { -return -1U ; +return 1 ; }#endif /* CONFIG_CGROUP_WRITEBACK */ @@ -187,8 +187,8 @@ TRACE_EVENT(inode_foreign_history,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) - __field(unsigned int, cgroup_ino) + __field(ino_t, ino) + __field(ino_t, cgroup_ino) __field(unsigned int, history) ),@@ -199,7 +199,7 @@ TRACE_EVENT(inode_foreign_history, __entry->history = history; ), - TP_printk("bdi %s: ino=%lu cgroup_ino=%u history=0x%x", + TP_printk("bdi %s: ino=%lu cgroup_ino=%lu history=0x%x", __entry->name, __entry->ino, __entry->cgroup_ino,@@ -216,9 +216,9 @@ TRACE_EVENT(inode_switch_wbs,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) - __field(unsigned int, old_cgroup_ino) - __field(unsigned int, new_cgroup_ino) + __field(ino_t, ino) + __field(ino_t, old_cgroup_ino) +__field (ino_t, new_cgroup_ino) ), TP_fast_assign(@@ -228,7 +228,7 @@ TRACE_EVENT(inode_switch_wbs, __entry->new_cgroup_ino =__trace_wb_assign_cgroup (new_wb); ), - TP_printk("bdi %s: ino=%lu old_cgroup_ino=%u new_cgroup_ino=%u", + TP_printk("bdi %s: ino=%lu old_cgroup_ino=%lu new_cgroup_ino=%lu", __entry->name, __entry->ino, __entry->old_cgroup_ino,@@ -245,10 +245,10 @@ TRACE_EVENT(track_foreign_dirty,TP_STRUCT__entry ( __array(char, name, 32) __field(u64, bdi_id) - __field(unsigned long, ino) + __field(ino_t, ino) __field(unsigned int, memcg_id) - __field(unsigned int, cgroup_ino) - __field(unsigned int, page_cgroup_ino) + __field(ino_t, cgroup_ino) +__field (ino_t, page_cgroup_ino) ), TP_fast_assign(@@ -263,7 +263,7 @@ TRACE_EVENT(track_foreign_dirty, __entry->page_cgroup_ino = page->mem_cgroup->css.cgroup->kn->id.ino; ), - TP_printk("bdi %s[%llu]: ino=%lu memcg_id=%u cgroup_ino=%u page_cgroup_ino=%u", + TP_printk("bdi %s[%llu]: ino=%lu memcg_id=%u cgroup_ino=%lu page_cgroup_ino=%lu", __entry->name, __entry->bdi_id, __entry->ino,@@ -282,7 +282,7 @@ TRACE_EVENT(flush_foreign,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned int, cgroup_ino) + __field(ino_t, cgroup_ino) __field(unsigned int, frn_bdi_id) __field(unsigned int, frn_memcg_id) ),@@ -294,7 +294,7 @@ TRACE_EVENT(flush_foreign, __entry->frn_memcg_id = frn_memcg_id; ), - TP_printk("bdi %s: cgroup_ino=%u frn_bdi_id=%u frn_memcg_id=%u", + TP_printk("bdi %s: cgroup_ino=%lu frn_bdi_id=%u frn_memcg_id=%u", __entry->name, __entry->cgroup_ino, __entry->frn_bdi_id,@@ -311,9 +311,9 @@ DECLARE_EVENT_CLASS(writeback_write_inode_template,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) + __field(ino_t, ino) __field(int, sync_mode) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ), TP_fast_assign(@@ -324,7 +324,7 @@ DECLARE_EVENT_CLASS(writeback_write_inode_template, __entry->cgroup_ino =__trace_wbc_assign_cgroup (wbc); ), - TP_printk("bdi %s: ino=%lu sync_mode=%d cgroup_ino=%u", + TP_printk("bdi %s: ino=%lu sync_mode=%d cgroup_ino=%lu", __entry->name, __entry->ino, __entry->sync_mode,@@ -358,7 +358,7 @@ DECLARE_EVENT_CLASS(writeback_work_class, __field(int, range_cyclic) __field(int, for_background) __field(int, reason) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ), TP_fast_assign( strscpy_pad(__entry->name,@@ -374,7 +374,7 @@ DECLARE_EVENT_CLASS(writeback_work_class, __entry->cgroup_ino =__trace_wb_assign_cgroup (wb); ), TP_printk("bdi %s: sb_dev %d:%d nr_pages=%ld sync_mode=%d " - "kupdate=%d range_cyclic=%d background=%d reason=%s cgroup_ino=%u", + "kupdate=%d range_cyclic=%d background=%d reason=%s cgroup_ino=%lu", __entry->name, MAJOR(__entry->sb_dev), MINOR(__entry->sb_dev), __entry->nr_pages,@@ -413,13 +413,13 @@ DECLARE_EVENT_CLASS(writeback_class,TP_ARGS (wb),TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ),TP_fast_assign ( strscpy_pad(__entry->name, dev_name(wb->bdi->dev), 32); __entry->cgroup_ino =__trace_wb_assign_cgroup (wb); ), -TP_printk ("bdi %s: cgroup_ino=%u" , +TP_printk ("bdi %s: cgroup_ino=%lu" , __entry->name, __entry->cgroup_ino )@@ -459,7 +459,7 @@ DECLARE_EVENT_CLASS(wbc_class, __field(int, range_cyclic) __field(long, range_start) __field(long, range_end) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ), TP_fast_assign(@@ -478,7 +478,7 @@ DECLARE_EVENT_CLASS(wbc_class, TP_printk("bdi %s: towrt=%ld skip=%ld mode=%d kupd=%d " "bgrd=%d reclm=%d cyclic=%d " - "start=0x%lx end=0x%lx cgroup_ino=%u", + "start=0x%lx end=0x%lx cgroup_ino=%lu", __entry->name, __entry->nr_to_write, __entry->pages_skipped,@@ -510,7 +510,7 @@ TRACE_EVENT(writeback_queue_io, __field(long, age) __field(int, moved) __field(int, reason) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ),TP_fast_assign ( unsigned long *older_than_this = work->older_than_this;@@ -522,7 +522,7 @@ TRACE_EVENT(writeback_queue_io, __entry->reason = work->reason; __entry->cgroup_ino =__trace_wb_assign_cgroup (wb); ), - TP_printk("bdi %s: older=%lu age=%ld enqueue=%d reason=%s cgroup_ino=%u", + TP_printk("bdi %s: older=%lu age=%ld enqueue=%d reason=%s cgroup_ino=%lu", __entry->name, __entry->older, /* older_than_this in jiffies */ __entry->age, /* older_than_this in relative milliseconds */@@ -596,7 +596,7 @@ TRACE_EVENT(bdi_dirty_ratelimit, __field(unsigned long, dirty_ratelimit) __field(unsigned long, task_ratelimit) __field(unsigned long, balanced_dirty_ratelimit) - __field(unsigned int, cgroup_ino) + __field(ino_t, cgroup_ino) ), TP_fast_assign(@@ -614,7 +614,7 @@ TRACE_EVENT(bdi_dirty_ratelimit, TP_printk("bdi %s: " "write_bw=%lu awrite_bw=%lu dirty_rate=%lu " "dirty_ratelimit=%lu task_ratelimit=%lu " - "balanced_dirty_ratelimit=%lu cgroup_ino=%u", + "balanced_dirty_ratelimit=%lu cgroup_ino=%lu", __entry->bdi, __entry->write_bw, /* write bandwidth */ __entry->avg_write_bw, /* avg write bandwidth */@@ -660,7 +660,7 @@ TRACE_EVENT(balance_dirty_pages, __field( long, pause) __field(unsigned long, period) __field( long, think) - __field(unsigned int, cgroup_ino) + __field(ino_t, cgroup_ino) ), TP_fast_assign(@@ -692,7 +692,7 @@ TRACE_EVENT(balance_dirty_pages,"bdi_setpoint=%lu bdi_dirty=%lu " "dirty_ratelimit=%lu task_ratelimit=%lu " "dirtied=%u dirtied_pause=%u " -"paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%u" , +"paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%lu" , __entry->bdi, __entry->limit, __entry->setpoint,@@ -718,10 +718,10 @@ TRACE_EVENT(writeback_sb_inodes_requeue,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) + __field(ino_t, ino) __field(unsigned long, state) __field(unsigned long, dirtied_when) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ), TP_fast_assign(@@ -733,7 +733,7 @@ TRACE_EVENT(writeback_sb_inodes_requeue, __entry->cgroup_ino =__trace_wb_assign_cgroup (inode_to_wb (inode)); ), - TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu cgroup_ino=%u", + TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu cgroup_ino=%lu", __entry->name, __entry->ino, show_inode_state(__entry->state),@@ -789,13 +789,13 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template,TP_STRUCT__entry ( __array(char, name, 32) - __field(unsigned long, ino) + __field(ino_t, ino) __field(unsigned long, state) __field(unsigned long, dirtied_when) __field(unsigned long, writeback_index) __field(long, nr_to_write) __field(unsigned long, wrote) - __field(unsigned int, cgroup_ino) +__field (ino_t, cgroup_ino) ), TP_fast_assign(@@ -811,7 +811,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template, ), TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu " - "index=%lu to_write=%ld wrote=%lu cgroup_ino=%u", + "index=%lu to_write=%ld wrote=%lu cgroup_ino=%lu", __entry->name, __entry->ino, show_inode_state(__entry->state),@@ -845,7 +845,7 @@ DECLARE_EVENT_CLASS(writeback_inode_template,TP_STRUCT__entry (__field (dev_t ,dev ) - __field(unsigned long, ino ) +__field ( ino_t, ino ) __field(unsigned long, state )__field ( __u16, mode ) __field(unsigned long, dirtied_when )Signature · 1 line
2.17.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Tejun Heo
maintainerPATCH 3/10 netprio: use css ID instead of cgroup ID
In reply to Tejun Heonetprio uses cgroup ID to index the priority mapping table. This is currently okay as cgroup IDs are allocated using idr and packed. However, cgroup IDs will be changed to use full 64bit range and won't be packed making this impractical. netprio doesn't care what type of IDs it uses as long as they can identify the controller instances and are packed. Let's switch to css IDs instead of cgroup IDs.
---
Hello,
This is to prepare for kernfs 64bit ino support. It'd be best to route this with the rest of kernfs patchset.
Thanks.
include/net/netprio_cgroup.h | 2 +- net/core/netprio_cgroup.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
include/net/netprio_cgroup.h +1 -1
@@ -26,7 +26,7 @@ static inline u32 task_netprioidx(struct task_struct *p)rcu_read_lock (); css =task_css (p, net_prio_cgrp_id); - idx = css->cgroup->id; + idx = css->id;rcu_read_unlock ();return idx; }
net/core/netprio_cgroup.c +4 -4
@@ -93,7 +93,7 @@ static int extend_netdev_table(struct net_device *dev, u32 target_idx)static u32 netprio_prio (struct cgroup_subsys_state *css,struct net_device *dev) {struct netprio_map *map =rcu_dereference_rtnl (dev->priomap); -int id = css->cgroup->id; +int id = css->id;if (map && id < map->priomap_len)return map->priomap[id];
@@ -113,7 +113,7 @@ static int netprio_set_prio(struct cgroup_subsys_state *css, struct net_device *dev, u32 prio) {struct netprio_map *map; -int id = css->cgroup->id; +int id = css->id;int ret;/* avoid extending priomap for zero writes */
@@ -177,7 +177,7 @@ static void cgrp_css_free(struct cgroup_subsys_state *css)static u64 read_prioidx (struct cgroup_subsys_state *css,struct cftype *cft) { -return css->cgroup->id; +return css->id; }static int read_priomap (struct seq_file *sf,void *v)
@@ -237,7 +237,7 @@ static void net_prio_attach(struct cgroup_taskset *tset)struct cgroup_subsys_state *css;cgroup_taskset_for_each (p, css, tset) { -void *v = (void *)(unsigned long )css->cgroup->id; +void *v = (void *)(unsigned long )css->id;task_lock (p);iterate_fd (p->files,0 , update_netprio, v);
Signature · 1 line
2.17.1
Re: [PATCH 03/10] netprio: use css ID instead of cgroup ID
Quoted 80 lines · Tejun Heo
netprio uses cgroup ID to index the priority mapping table. This is currently okay as cgroup IDs are allocated using idr and packed. However, cgroup IDs will be changed to use full 64bit range and won't be packed making this impractical. netprio doesn't care what type of IDs it uses as long as they can identify the controller instances and are packed. Let's switch to css IDs instead of cgroup IDs.
Signed-off-by Tejun Heo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Neil Horman <[email protected]>Cc Namhyung Kim <[email protected]>---
Hello,This is to prepare for kernfs 64bit ino support. It'd be best to route this with the rest of kernfs patchset.
Thanks.
include/net/netprio_cgroup.h | 2 +- net/core/netprio_cgroup.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)include/net/netprio_cgroup.h +1
-1@@ -26,7 +26,7 @@ static inline u32 task_netprioidx(struct task_struct *p)rcu_read_lock (); css =task_css (p, net_prio_cgrp_id); - idx = css->cgroup->id; + idx = css->id;rcu_read_unlock ();return idx; }net/core/netprio_cgroup.c +4
-4@@ -93,7 +93,7 @@ static int extend_netdev_table(struct net_device *dev, u32 target_idx)static u32 netprio_prio (struct cgroup_subsys_state *css,struct net_device *dev) {struct netprio_map *map =rcu_dereference_rtnl (dev->priomap); -int id = css->cgroup->id; +int id = css->id;if (map && id < map->priomap_len)return map->priomap[id];@@ -113,7 +113,7 @@ static int netprio_set_prio(struct cgroup_subsys_state *css, struct net_device *dev, u32 prio) {struct netprio_map *map; -int id = css->cgroup->id; +int id = css->id;int ret;/* avoid extending priomap for zero writes */ @@ -177,7 +177,7 @@ static void cgrp_css_free(struct cgroup_subsys_state *css)static u64 read_prioidx (struct cgroup_subsys_state *css,struct cftype *cft) { -return css->cgroup->id; +return css->id; }static int read_priomap (struct seq_file *sf,void *v)@@ -237,7 +237,7 @@ static void net_prio_attach(struct cgroup_taskset *tset)struct cgroup_subsys_state *css;cgroup_taskset_for_each (p, css, tset) { -void *v = (void *)(unsigned long )css->cgroup->id; +void *v = (void *)(unsigned long )css->id;task_lock (p);iterate_fd (p->files,0 , update_netprio, v);Signature · 1 line
2.17.1
Tejun Heo
maintainerPATCH 4/10 kernfs: use dumber locking for kernfs_find_and_get_node_by_ino()
In reply to Tejun Heokernfs_find_and_get_node_by_ino() uses RCU protection. It's currently a bit buggy because it can look up a node which hasn't been activated yet and thus may end up exposing a node that the kernfs user is still prepping.
While it can be fixed by pushing it further in the current direction, it's already complicated and isn't clear whether the complexity is justified. The main use of kernfs_find_and_get_node_by_ino() is for exportfs operations. They aren't super hot and all the follow-up operations (e.g. mapping to path) use normal locking anyway.
Let's switch to a dumber locking scheme and protect the lookup with kernfs_idr_lock.
--- fs/kernfs/dir.c | 45 +++++++++------------------------------------ fs/kernfs/mount.c | 11 +---------- 2 files changed, 10 insertions(+), 46 deletions(-)
fs/kernfs/dir.c +9 -36
@@ -508,10 +508,6 @@ void kernfs_put(struct kernfs_node *kn)struct kernfs_node *parent;struct kernfs_root *root; -/* -* kernfs_node is freed with ->count 0, kernfs_find_and_get_node_by_ino -* depends on this to filter reused stale node -*/ if (!kn || !atomic_dec_and_test (&kn->count))return ; root =kernfs_root (kn);
@@ -646,11 +642,7 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root, kn->id.ino = ret; kn->id.generation = gen; -/* -* set ino first. This RELEASE is paired with atomic_inc_not_zero in -* kernfs_find_and_get_node_by_ino -*/ -atomic_set_release (&kn->count,1 ); +atomic_set (&kn->count,1 );atomic_set (&kn->active,KN_DEACTIVATED_BIAS );RB_CLEAR_NODE (&kn->rb);
@@ -716,38 +708,19 @@ struct kernfs_node *kernfs_find_and_get_node_by_ino(struct kernfs_root *root, {struct kernfs_node *kn; -rcu_read_lock (); +spin_lock (&kernfs_idr_lock); + kn =idr_find (&root->ino_idr, ino);if (!kn) - goto out; + goto err_unlock; -/* -* Since kernfs_node is freed in RCU, it's possible an old node for ino -* is freed, but reused before RCU grace period. But a freed node (see -* kernfs_put) or an incompletedly initialized node (see -* __kernfs_new_node) should have 'count' 0. We can use this fact to -* filter out such node. -*/ -if (!atomic_inc_not_zero (&kn->count)) { - kn =NULL ; - goto out; - } - -/* -* The node could be a new node or a reused node. If it's a new node, -* we are ok. If it's reused because of RCU (because of -* SLAB_TYPESAFE_BY_RCU), the __kernfs_new_node always sets its 'ino' -* before 'count'. So if 'count' is uptodate, 'ino' should be uptodate, -* hence we can use 'ino' to filter stale node. -*/ -if (kn->id.ino != ino) - goto out; -rcu_read_unlock (); +if (unlikely (!atomic_inc_not_zero (&kn->count))) + goto err_unlock; +spin_unlock (&kernfs_idr_lock);return kn; -out: -rcu_read_unlock (); -kernfs_put (kn); +err_unlock: +spin_unlock (&kernfs_idr_lock);return NULL ; }
fs/kernfs/mount.c +1 -10
@@ -363,18 +363,9 @@ void kernfs_kill_sb(struct super_block *sb)void __init kernfs_init (void ) { - -/* -* the slab is freed in RCU context, so kernfs_find_and_get_node_by_ino -* can access the slab lock free. This could introduce stale nodes, -* please see how kernfs_find_and_get_node_by_ino filters out stale -* nodes. -*/ kernfs_node_cache =kmem_cache_create ("kernfs_node_cache" ,sizeof (struct kernfs_node ), -0 , -SLAB_PANIC |SLAB_TYPESAFE_BY_RCU , -NULL ); +0 ,SLAB_PANIC ,NULL );/* Creates slab cache for kernfs inode attributes */ kernfs_iattrs_cache = kmem_cache_create("kernfs_iattrs_cache",
Signature · 1 line
2.17.1
Tejun Heo
maintainerPATCH 5/10 kernfs: kernfs_find_and_get_node_by_ino() should only look up activated nodes
In reply to Tejun Heokernfs node can be created in two separate steps - allocation and activation. This is used to make kernfs nodes visible only after the internal states attached to the node are fully initialized. kernfs_find_and_get_node_by_id() currently allows lookups of nodes which aren't activated yet and thus can expose nodes are which are still being prepped by kernfs users.
Fix it by disallowing lookups of nodes which aren't activated yet.
kernfs_find_and_get_node_by_ino()
--- fs/kernfs/dir.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/kernfs/dir.c +7 -1
@@ -714,7 +714,13 @@ struct kernfs_node *kernfs_find_and_get_node_by_ino(struct kernfs_root *root,if (!kn) goto err_unlock; -if (unlikely (!atomic_inc_not_zero (&kn->count))) +/* +* ACTIVATED is protected with kernfs_mutex but it was clear when +* @kn was added to idr and we just wanna see it set. No need to +* grab kernfs_mutex. +*/ +if (unlikely (!(kn->flags &KERNFS_ACTIVATED ) || + !atomic_inc_not_zero (&kn->count))) goto err_unlock;spin_unlock (&kernfs_idr_lock);
Signature · 1 line
2.17.1
Tejun Heo
maintainerPATCH 6/10 kernfs: convert kernfs_node->id from union kernfs_node_id to u64
In reply to Tejun Heokernfs_node->id is currently a union kernfs_node_id which represents either a 32bit (ino, gen) pair or u64 value. I can't see much value in the usage of the union - all that's needed is a 64bit ID which the current code is already limited to. Using a union makes the code unnecessarily complicated and prevents using 64bit ino without adding practical benefits.
This patch drops union kernfs_node_id and makes kernfs_node->id a u64. ino is stored in the lower 32bits and gen upper. Accessors - kernfs[_id]_ino() and kernfs[_id]_gen() - are added to retrieve the ino and gen. This simplifies ID handling less cumbersome and will allow using 64bit inos on supported archs.
This patch doesn't make any functional changes.
--- fs/kernfs/dir.c | 10 ++--- fs/kernfs/file.c | 4 +- fs/kernfs/inode.c | 4 +- fs/kernfs/mount.c | 7 ++-- include/linux/cgroup.h | 17 ++++---- include/linux/kernfs.h | 45 ++++++++++++--------- include/trace/events/writeback.h | 4 +- kernel/bpf/helpers.c | 2 +- kernel/bpf/local_storage.c | 2 +- kernel/cgroup/cgroup.c | 3 +- kernel/trace/blktrace.c | 67 +++++++++++++++----------------- net/core/filter.c | 4 +- 12 files changed, 85 insertions(+), 84 deletions(-)
fs/kernfs/dir.c +5 -5
@@ -532,7 +532,7 @@ void kernfs_put(struct kernfs_node *kn)kmem_cache_free (kernfs_iattrs_cache, kn->iattr); }spin_lock (&kernfs_idr_lock); -idr_remove (&root->ino_idr, kn->id.ino); +idr_remove (&root->ino_idr,kernfs_ino (kn));spin_unlock (&kernfs_idr_lock);kmem_cache_free (kernfs_node_cache, kn);
@@ -639,8 +639,8 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,idr_preload_end ();if (ret <0 ) goto err_out2; - kn->id.ino = ret; - kn->id.generation = gen; + + kn->id = (u64 )gen <<32 | ret;atomic_set (&kn->count,1 );atomic_set (&kn->active,KN_DEACTIVATED_BIAS );
@@ -671,7 +671,7 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,return kn; err_out3: -idr_remove (&root->ino_idr, kn->id.ino); +idr_remove (&root->ino_idr,kernfs_ino (kn)); err_out2:kmem_cache_free (kernfs_node_cache, kn); err_out1:
@@ -1656,7 +1656,7 @@ static int kernfs_fop_readdir(struct file *file, struct dir_context *ctx)const char *name = pos->name;unsigned int type =dt_type (pos);int len =strlen (name); -ino_t ino = pos->id.ino; +ino_t ino =kernfs_ino (pos); ctx->pos = pos->hash; file->private_data = pos;
fs/kernfs/file.c +2 -2
@@ -892,7 +892,7 @@ static void kernfs_notify_workfn(struct work_struct *work)* have the matching @file available. Look up the inodes * and generate the events manually. */ - inode =ilookup (info->sb, kn->id.ino); + inode =ilookup (info->sb,kernfs_ino (kn));if (!inode)continue ;
@@ -901,7 +901,7 @@ static void kernfs_notify_workfn(struct work_struct *work)if (parent) {struct inode *p_inode; - p_inode =ilookup (info->sb, parent->id.ino); + p_inode =ilookup (info->sb,kernfs_ino (parent));if (p_inode) {fsnotify (p_inode,FS_MODIFY |FS_EVENT_ON_CHILD , inode,FSNOTIFY_EVENT_INODE , &name,0 );
fs/kernfs/inode.c +2 -2
@@ -201,7 +201,7 @@ static void kernfs_init_inode(struct kernfs_node *kn, struct inode *inode) inode->i_private = kn; inode->i_mapping->a_ops = &kernfs_aops; inode->i_op = &kernfs_iops; - inode->i_generation = kn->id.generation; + inode->i_generation =kernfs_gen (kn);set_default_inode_attr (inode, kn->mode);kernfs_refresh_inode (kn, inode);
@@ -247,7 +247,7 @@ struct inode *kernfs_get_inode(struct super_block *sb, struct kernfs_node *kn) {struct inode *inode; - inode =iget_locked (sb, kn->id.ino); + inode =iget_locked (sb,kernfs_ino (kn));if (inode && (inode->i_state &I_NEW ))kernfs_init_inode (kn, inode);
fs/kernfs/mount.c +3 -4
@@ -57,15 +57,14 @@ const struct super_operations kernfs_sops = {* Similar to kernfs_fh_get_inode, this one gets kernfs node from inode * number and generation */ -struct kernfs_node *kernfs_get_node_by_id (struct kernfs_root *root, -const union kernfs_node_id *id) +struct kernfs_node *kernfs_get_node_by_id (struct kernfs_root *root,u64 id) {struct kernfs_node *kn; - kn =kernfs_find_and_get_node_by_ino (root, id->ino); + kn =kernfs_find_and_get_node_by_ino (root,kernfs_id_ino (id));if (!kn)return NULL ; -if (kn->id.generation != id->generation) { +if (kernfs_gen (kn) !=kernfs_id_gen (id)) {kernfs_put (kn);return NULL ; }
include/linux/cgroup.h +8 -9
@@ -616,7 +616,7 @@ static inline bool cgroup_is_populated(struct cgroup *cgrp)/* returns ino associated with a cgroup */ static inline ino_t cgroup_ino (struct cgroup *cgrp) { -return cgrp->kn->id.ino; +return kernfs_ino (cgrp->kn); }/* cft/css accessors for cftype->write() operation */
@@ -687,13 +687,12 @@ static inline void cgroup_kthread_ready(void) current->no_cgroup_migration = 0; } -static inline union kernfs_node_id *cgroup_get_kernfs_id (struct cgroup *cgrp) +static inline u64 cgroup_get_kernfs_id (struct cgroup *cgrp) { -return &cgrp->kn->id; +return cgrp->kn->id; } -void cgroup_path_from_kernfs_id (const union kernfs_node_id *id, -char *buf,size_t buflen); +void cgroup_path_from_kernfs_id (u64 id,char *buf,size_t buflen);#else /* !CONFIG_CGROUPS */ struct cgroup_subsys_state ;
@@ -718,9 +717,9 @@ static inline int cgroup_init_early(void) { return 0; }static inline int cgroup_init (void ) {return 0 ; }static inline void cgroup_init_kthreadd (void ) {}static inline void cgroup_kthread_ready (void ) {} -static inline union kernfs_node_id *cgroup_get_kernfs_id (struct cgroup *cgrp) +static inline union u64 cgroup_get_kernfs_id (struct cgroup *cgrp) { -return NULL ; +return 0 ; }static inline struct cgroup *cgroup_parent (struct cgroup *cgrp)
@@ -739,8 +738,8 @@ static inline bool task_under_cgroup_hierarchy(struct task_struct *task, return true; } -static inline void cgroup_path_from_kernfs_id (const union kernfs_node_id *id, -char *buf,size_t buflen) {} +static inline void cgroup_path_from_kernfs_id (u64 id,char *buf,size_t buflen) +{}#endif /* !CONFIG_CGROUPS */ #ifdef CONFIG_CGROUPS
include/linux/kernfs.h +27 -18
69 lines not on this page · raw message
include/trace/events/writeback.h +2 -2
@@ -152,7 +152,7 @@ DEFINE_EVENT(writeback_dirty_inode_template, writeback_dirty_inode,static inline ino_t __trace_wb_assign_cgroup (struct bdi_writeback *wb) { -return wb->memcg_css->cgroup->kn->id.ino; +return cgroup_ino (wb->memcg_css->cgroup); }static inline ino_t __trace_wbc_assign_cgroup (struct writeback_control *wbc)
@@ -260,7 +260,7 @@ TRACE_EVENT(track_foreign_dirty, __entry->ino = inode ? inode->i_ino :0 ; __entry->memcg_id = wb->memcg_css->id; __entry->cgroup_ino =__trace_wb_assign_cgroup (wb); - __entry->page_cgroup_ino = page->mem_cgroup->css.cgroup->kn->id.ino; + __entry->page_cgroup_ino =cgroup_ino (page->mem_cgroup->css.cgroup); ), TP_printk("bdi %s[%llu]: ino=%lu memcg_id=%u cgroup_ino=%lu page_cgroup_ino=%lu",
kernel/bpf/helpers.c +1 -1
@@ -317,7 +317,7 @@ BPF_CALL_0(bpf_get_current_cgroup_id) {struct cgroup *cgrp =task_dfl_cgroup (current); -return cgrp->kn->id.id; +return cgrp->kn->id; }const struct bpf_func_proto bpf_get_current_cgroup_id_proto = {
kernel/bpf/local_storage.c +1 -1
@@ -569,7 +569,7 @@ void bpf_cgroup_storage_link(struct bpf_cgroup_storage *storage,return ; storage->key.attach_type = type; - storage->key.cgroup_inode_id = cgroup->kn->id.id; + storage->key.cgroup_inode_id = cgroup->kn->id; map = storage->map;
kernel/cgroup/cgroup.c +1 -2
@@ -5786,8 +5786,7 @@ static int __init cgroup_wq_init(void) }core_initcall (cgroup_wq_init); -void cgroup_path_from_kernfs_id (const union kernfs_node_id *id, -char *buf,size_t buflen) +void cgroup_path_from_kernfs_id (u64 id,char *buf,size_t buflen) {struct kernfs_node *kn;
kernel/trace/blktrace.c +31 -36
200 lines not on this page · raw message
net/core/filter.c +2 -2
@@ -4089,7 +4089,7 @@ BPF_CALL_1(bpf_skb_cgroup_id, const struct sk_buff *, skb)return 0 ; cgrp =sock_cgroup_ptr (&sk->sk_cgrp_data); -return cgrp->kn->id.id; +return cgrp->kn->id; }static const struct bpf_func_proto bpf_skb_cgroup_id_proto = {
@@ -4114,7 +4114,7 @@ BPF_CALL_2(bpf_skb_ancestor_cgroup_id, const struct sk_buff *, skb, int,if (!ancestor)return 0 ; -return ancestor->kn->id.id; +return ancestor->kn->id; }static const struct bpf_func_proto bpf_skb_ancestor_cgroup_id_proto = {
Signature · 1 line
2.17.1
Tejun Heo
maintainerPATCH 7/10 kernfs: combine ino/id lookup functions into kernfs_find_and_get_node_by_id()
In reply to Tejun Heokernfs_find_and_get_node_by_ino() looks the kernfs_node matching the specified ino. On top of that, kernfs_get_node_by_id() and kernfs_fh_get_inode() implement full ID matching by testing the rest of ID.
On surface, confusingly, the two are slightly different in that the latter uses 0 gen as wildcard while the former doesn't - does it mean that the latter can't uniquely identify inodes w/ 0 gen? In practice, this is a distinction without a difference because generation number starts at 1. There are no actual IDs with 0 gen, so it can always safely used as wildcard.
Let's simplify the code by renaming kernfs_find_and_get_node_by_ino() to kernfs_find_and_get_node_by_id(), moving all lookup logics into it, and removing now unnecessary kernfs_get_node_by_id().
--- fs/kernfs/dir.c | 17 +++++++++++++---- fs/kernfs/kernfs-internal.h | 2 -- fs/kernfs/mount.c | 26 ++------------------------ include/linux/kernfs.h | 3 ++- kernel/cgroup/cgroup.c | 2 +- 5 files changed, 18 insertions(+), 32 deletions(-)
fs/kernfs/dir.c +13 -4
@@ -696,17 +696,22 @@ struct kernfs_node *kernfs_new_node(struct kernfs_node *parent, }/* -* kernfs_find_and_get_node_by_ino - get kernfs_node from inode number +* kernfs_find_and_get_node_by_id - get kernfs_node from node id * @root: the kernfs root -* @ino: inode number +* @id: the target node id +* +* @id's lower 32bits encode ino and upper gen. If the gen portion is +* zero, all generations are matched. * * RETURNS: * NULL on failure. Return a kernfs node with reference counter incremented */ -struct kernfs_node *kernfs_find_and_get_node_by_ino (struct kernfs_root *root, -unsigned int ino) +struct kernfs_node *kernfs_find_and_get_node_by_id (struct kernfs_root *root, +u64 id) {struct kernfs_node *kn; +ino_t ino =kernfs_id_ino (id); +u32 gen =kernfs_id_gen (id);spin_lock (&kernfs_idr_lock);
@@ -714,6 +719,10 @@ struct kernfs_node *kernfs_find_and_get_node_by_ino(struct kernfs_root *root,if (!kn) goto err_unlock; +/* 0 matches all generations */ +if (unlikely (gen &&kernfs_gen (kn) != gen)) + goto err_unlock; +/* * ACTIVATED is protected with kernfs_mutex but it was clear when * @kn was added to idr and we just wanna see it set. No need to
fs/kernfs/kernfs-internal.h +0 -2
@@ -109,8 +109,6 @@ struct kernfs_node *kernfs_new_node(struct kernfs_node *parent, const char *name, umode_t mode, kuid_t uid, kgid_t gid, unsigned flags); -struct kernfs_node *kernfs_find_and_get_node_by_ino (struct kernfs_root *root, -unsigned int ino);/* * file.c
fs/kernfs/mount.c +2 -24
@@ -53,24 +53,6 @@ const struct super_operations kernfs_sops = { .show_path = kernfs_sop_show_path, }; -/* -* Similar to kernfs_fh_get_inode, this one gets kernfs node from inode -* number and generation -*/ -struct kernfs_node *kernfs_get_node_by_id (struct kernfs_root *root,u64 id) -{ -struct kernfs_node *kn; - - kn =kernfs_find_and_get_node_by_ino (root,kernfs_id_ino (id)); -if (!kn) -return NULL ; -if (kernfs_gen (kn) !=kernfs_id_gen (id)) { -kernfs_put (kn); -return NULL ; - } -return kn; -} -static struct inode *kernfs_fh_get_inode (struct super_block *sb,u64 ino,u32 generation) {
@@ -81,7 +63,8 @@ static struct inode *kernfs_fh_get_inode(struct super_block *sb,if (ino ==0 )return ERR_PTR (-ESTALE ); - kn =kernfs_find_and_get_node_by_ino (info->root, ino); + kn =kernfs_find_and_get_node_by_id (info->root, + ino | ((u64 )generation <<32 ));if (!kn)return ERR_PTR (-ESTALE ); inode =kernfs_get_inode (sb, kn);
@@ -89,11 +72,6 @@ static struct inode *kernfs_fh_get_inode(struct super_block *sb,if (!inode)return ERR_PTR (-ESTALE ); -if (generation && inode->i_generation != generation) { -/* we didn't find the right inode.. */ -iput (inode); -return ERR_PTR (-ESTALE ); - }return inode; }
include/linux/kernfs.h +2 -1
@@ -393,7 +393,8 @@ void kernfs_kill_sb(struct super_block *sb);void kernfs_init (void ); -struct kernfs_node *kernfs_get_node_by_id (struct kernfs_root *root,u64 id); +struct kernfs_node *kernfs_find_and_get_node_by_id (struct kernfs_root *root, +u64 id);#else /* CONFIG_KERNFS */ static inline enum kernfs_node_type kernfs_type (struct kernfs_node *kn)
kernel/cgroup/cgroup.c +1 -1
@@ -5790,7 +5790,7 @@ void cgroup_path_from_kernfs_id(u64 id, char *buf, size_t buflen) {struct kernfs_node *kn; - kn =kernfs_get_node_by_id (cgrp_dfl_root.kf_root, id); + kn =kernfs_find_and_get_node_by_id (cgrp_dfl_root.kf_root, id);if (!kn)return ;kernfs_path (kn, buf, buflen);
Signature · 1 line
2.17.1
Tejun Heo
maintainerPATCH 8/10 kernfs: implement custom exportfs ops and fid type
In reply to Tejun HeoThe current kernfs exportfs implementation uses the generic_fh_*() helpers and FILEID_INO32_GEN[_PARENT] which limits ino to 32bits. Let's implement custom exportfs operations and fid type to remove the restriction.
* FILEID_KERNFS is a single u64 value whose content is kernfs_node->id. This is the only native fid type.
* For backward compatibility with blk_log_action() path which exposes (ino,gen) pairs which userland assembles into FILEID_INO32_GEN keys, combine the generic keys into 64bit IDs in the same order.
--- fs/kernfs/mount.c | 77 +++++++++++++++++++++++++++++++--------- include/linux/exportfs.h | 5 +++ 2 files changed, 66 insertions(+), 16 deletions(-)
fs/kernfs/mount.c +61 -16
@@ -53,40 +53,84 @@ const struct super_operations kernfs_sops = { .show_path = kernfs_sop_show_path, }; -static struct inode *kernfs_fh_get_inode (struct super_block *sb, -u64 ino,u32 generation) +static int kernfs_encode_fh (struct inode *inode,__u32 *fh,int *max_len, +struct inode *parent) +{ +struct kernfs_node *kn = inode->i_private; + +if (*max_len <2 ) { + *max_len =2 ; +return FILEID_INVALID ; + } + + *max_len =2 ; + *(u64 *)fh = kn->id; +return FILEID_KERNFS ; +} + +static struct dentry *__kernfs_fh_to_dentry (struct super_block *sb, +struct fid *fid,int fh_len, +int fh_type,bool get_parent) {struct kernfs_super_info *info =kernfs_info (sb); -struct inode *inode;struct kernfs_node *kn; +struct inode *inode; +u64 id; -if (ino ==0 ) -return ERR_PTR (-ESTALE ); +if (fh_len <2 ) +return NULL ; + +switch (fh_type) { +case FILEID_KERNFS : + id = *(u64 *)fid; +break ; +case FILEID_INO32_GEN : +case FILEID_INO32_GEN_PARENT : +/* +* blk_log_action() exposes (ino,gen) pair without type and +* userland can call us with generic fid constructed from +* them. Combine it back to ID. See blk_log_action(). +*/ + id = ((u64 )fid->i32.gen <<32 ) | fid->i32.ino; +break ; +default : +return NULL ; + } - kn =kernfs_find_and_get_node_by_id (info->root, - ino | ((u64 )generation <<32 )); + kn =kernfs_find_and_get_node_by_id (info->root, id);if (!kn)return ERR_PTR (-ESTALE ); + +if (get_parent) { +struct kernfs_node *parent; + + parent =kernfs_get_parent (kn); +kernfs_put (kn); + kn = parent; +if (!kn) +return ERR_PTR (-ESTALE ); + } + inode =kernfs_get_inode (sb, kn);kernfs_put (kn);if (!inode)return ERR_PTR (-ESTALE ); -return inode; +return d_obtain_alias (inode); } -static struct dentry *kernfs_fh_to_dentry (struct super_block *sb,struct fid *fid, -int fh_len,int fh_type) +static struct dentry *kernfs_fh_to_dentry (struct super_block *sb, +struct fid *fid,int fh_len, +int fh_type) { -return generic_fh_to_dentry (sb, fid, fh_len, fh_type, - kernfs_fh_get_inode); +return __kernfs_fh_to_dentry (sb, fid, fh_len, fh_type, false); } -static struct dentry *kernfs_fh_to_parent (struct super_block *sb,struct fid *fid, -int fh_len,int fh_type) +static struct dentry *kernfs_fh_to_parent (struct super_block *sb, +struct fid *fid,int fh_len, +int fh_type) { -return generic_fh_to_parent (sb, fid, fh_len, fh_type, - kernfs_fh_get_inode); +return __kernfs_fh_to_dentry (sb, fid, fh_len, fh_type, true); }static struct dentry *kernfs_get_parent_dentry (struct dentry *child)
@@ -97,6 +141,7 @@ static struct dentry *kernfs_get_parent_dentry(struct dentry *child) }static const struct export_operations kernfs_export_ops = { + .encode_fh = kernfs_encode_fh, .fh_to_dentry = kernfs_fh_to_dentry, .fh_to_parent = kernfs_fh_to_parent, .get_parent = kernfs_get_parent_dentry,
include/linux/exportfs.h +5 -0
@@ -104,6 +104,11 @@ enum fid_type {*/ FILEID_LUSTRE =0x97 , +/* +* 64 bit unique kernfs id +*/ + FILEID_KERNFS = 0xfe, +/* * Filesystems must not use 0xff file ID. */
Signature · 1 line
2.17.1
Tejun Heo
maintainerPATCH 9/10 kernfs: use 64bit inos if ino_t is 64bit
In reply to Tejun HeoEach kernfs_node is identified with a 64bit ID. The low 32bit is exposed as ino and the high gen. While this already allows using inos as keys by looking up with wildcard generation number of 0, it's adding unnecessary complications for 64bit ino archs which can directly use kernfs_node IDs as inos to uniquely identify each cgroup instance.
This patch exposes IDs directly as inos on 64bit ino archs. The conversion is mostly straight-forward.
* 32bit ino archs behave the same as before. 64bit ino archs now use the whole 64bit ID as ino and the generation number is fixed at 1.
* 64bit inos still use the same idr allocator which gurantees that the lower 32bits identify the current live instance uniquely and the high 32bits are incremented whenever the low bits wrap. As the upper 32bits are no longer used as gen and we don't wanna start ino allocation with 33rd bit set, the initial value for highbits allocation is changed to 0 on 64bit ino archs.
* blktrace exposes two 32bit numbers - (INO,GEN) pair - to identify the issuing cgroup. Userland builds FILEID_INO32_GEN fids from these numbers to look up the cgroups. To remain compatible with the behavior, always output (LOW32,HIGH32) which will be constructed back to the original 64bit ID by __kernfs_fh_to_dentry().
--- fs/kernfs/dir.c | 42 ++++++++++++++++++++++++++++------------- fs/kernfs/mount.c | 7 ++++--- include/linux/kernfs.h | 20 ++++++++++++++------ kernel/trace/blktrace.c | 21 +++++++++++++++++---- 4 files changed, 64 insertions(+), 26 deletions(-)
fs/kernfs/dir.c +29 -13
@@ -532,7 +532,7 @@ void kernfs_put(struct kernfs_node *kn)kmem_cache_free (kernfs_iattrs_cache, kn->iattr); }spin_lock (&kernfs_idr_lock); -idr_remove (&root->ino_idr,kernfs_ino (kn)); +idr_remove (&root->ino_idr, (u32 )kernfs_ino (kn));spin_unlock (&kernfs_idr_lock);kmem_cache_free (kernfs_node_cache, kn);
@@ -617,7 +617,7 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root, unsigned flags) {struct kernfs_node *kn; -u32 gen; +u32 id_highbits;int ret; name =kstrdup_const (name,GFP_KERNEL );
@@ -631,16 +631,16 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,idr_preload (GFP_KERNEL );spin_lock (&kernfs_idr_lock); ret =idr_alloc_cyclic (&root->ino_idr, kn,1 ,0 ,GFP_ATOMIC ); -if (ret >=0 && ret < root->last_ino) - root->next_generation++; - gen = root->next_generation; - root->last_ino = ret; +if (ret >=0 && ret < root->last_id_lowbits) + root->id_highbits++; + id_highbits = root->id_highbits; + root->last_id_lowbits = ret;spin_unlock (&kernfs_idr_lock);idr_preload_end ();if (ret <0 ) goto err_out2; - kn->id = (u64 )gen <<32 | ret; + kn->id = (u64 )id_highbits <<32 | ret;atomic_set (&kn->count,1 );atomic_set (&kn->active,KN_DEACTIVATED_BIAS );
@@ -671,7 +671,7 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,return kn; err_out3: -idr_remove (&root->ino_idr,kernfs_ino (kn)); +idr_remove (&root->ino_idr, (u32 )kernfs_ino (kn)); err_out2:kmem_cache_free (kernfs_node_cache, kn); err_out1:
@@ -715,13 +715,19 @@ struct kernfs_node *kernfs_find_and_get_node_by_id(struct kernfs_root *root,spin_lock (&kernfs_idr_lock); - kn =idr_find (&root->ino_idr, ino); + kn =idr_find (&root->ino_idr, (u32 )ino);if (!kn) goto err_unlock; -/* 0 matches all generations */ -if (unlikely (gen &&kernfs_gen (kn) != gen)) - goto err_unlock; +if (sizeof (ino_t) >=sizeof (u64)) { +/* we looked up with the low 32bits, compare the whole */ +if (kernfs_ino (kn) != ino) + goto err_unlock; + }else { +/* 0 matches all generations */ +if (unlikely (gen &&kernfs_gen (kn) != gen)) + goto err_unlock; + }/* * ACTIVATED is protected with kernfs_mutex but it was clear when
@@ -949,7 +955,17 @@ struct kernfs_root *kernfs_create_root(struct kernfs_syscall_ops *scops,idr_init (&root->ino_idr);INIT_LIST_HEAD (&root->supers); - root->next_generation =1 ; + +/* +* On 64bit ino setups, id is ino. On 32bit, low 32bits are ino. +* High bits generation. The starting value for both ino and +* genenration is 1. Initialize upper 32bit allocation +* accordingly. +*/ +if (sizeof (ino_t) >=sizeof (u64)) + root->id_highbits =0 ; +else + root->id_highbits =1 ; kn = __kernfs_new_node(root, NULL, "", S_IFDIR | S_IRUGO | S_IXUGO, GLOBAL_ROOT_UID, GLOBAL_ROOT_GID,
fs/kernfs/mount.c +4 -3
@@ -87,9 +87,10 @@ static struct dentry *__kernfs_fh_to_dentry(struct super_block *sb,case FILEID_INO32_GEN :case FILEID_INO32_GEN_PARENT :/* -* blk_log_action() exposes (ino,gen) pair without type and -* userland can call us with generic fid constructed from -* them. Combine it back to ID. See blk_log_action(). +* blk_log_action() exposes "LOW32,HIGH32" pair without +* type and userland can call us with generic fid +* constructed from them. Combine it back to ID. See +* blk_log_action(). */ id = ((u64 )fid->i32.gen <<32 ) | fid->i32.ino;break ;
include/linux/kernfs.h +14 -6
@@ -141,8 +141,8 @@ struct kernfs_node {void *priv;/* -* 64bit unique ID. Lower 32bits carry the inode number and lower -* generation. +* 64bit unique ID. On 64bit ino setups, id is the ino. On 32bit, +* the low 32bits are ino and upper generation. */ u64 id;
@@ -177,8 +177,8 @@ struct kernfs_root {/* private fields, do not use outside kernfs proper */ struct idr ino_idr; -u32 last_ino; -u32 next_generation; +u32 last_id_lowbits; +u32 id_highbits;struct kernfs_syscall_ops *syscall_ops;/* list of kernfs_super_info of this root, protected by kernfs_mutex */
@@ -284,12 +284,20 @@ static inline enum kernfs_node_type kernfs_type(struct kernfs_node *kn)static inline ino_t kernfs_id_ino (u64 id) { -return (u32 )id; +/* id is ino if ino_t is 64bit; otherwise, low 32bits */ +if (sizeof (ino_t) >=sizeof (u64)) +return id; +else +return (u32 )id; }static inline u32 kernfs_id_gen (u64 id) { -return id >>32 ; +/* gen is fixed at 1 if ino_t is 64bit; otherwise, high 32bits */ +if (sizeof (ino_t) >=sizeof (u64)) +return 1 ; +else +return id >>32 ; }static inline ino_t kernfs_ino (struct kernfs_node *kn)
kernel/trace/blktrace.c +17 -4
@@ -1261,12 +1261,25 @@ static void blk_log_action(struct trace_iterator *iter, const char *act,trace_seq_printf (&iter->seq,"%3d,%-3d %s %2s %3s " ,MAJOR (t->device),MINOR (t->device), blkcg_name_buf, act, rwbs); - }else + }else { +/* +* The cgid portion used to be "INO,GEN". Userland +* builds a FILEID_INO32_GEN fid out of them and +* opens the cgroup using open_by_handle_at(2). +* While 32bit ino setups are still the same, 64bit +* ones now use the 64bit ino as the whole ID and +* no longer use generation. +* +* Regarldess of the content, always output +* "LOW32,HIGH32" so that FILEID_INO32_GEN fid can +* be mapped back to @id on both 64 and 32bit ino +* setups. See __kernfs_fh_to_dentry(). +*/ trace_seq_printf (&iter->seq, -"%3d,%-3d %lx,%-x %2s %3s " , +"%3d,%-3d %llx,%-llx %2s %3s " ,MAJOR (t->device),MINOR (t->device), -kernfs_id_ino (id),kernfs_id_gen (id), - act, rwbs); + id &U32_MAX , id >>32 , act, rwbs); + } }else trace_seq_printf (&iter->seq,"%3d,%-3d %2s %3s " ,MAJOR (t->device),MINOR (t->device), act, rwbs);
Signature · 1 line
2.17.1
Tejun Heo
maintainerPATCH 10/10 cgroup: use cgrp->kn->id as the cgroup ID
In reply to Tejun Heocgroup ID is currently allocated using a dedicated per-hierarchy idr and used internally and exposed through tracepoints and bpf. This is confusing because there are tracepoints and other interfaces which use the cgroupfs ino as IDs.
The preceding changes made kn->id exposed as ino as 64bit ino on supported archs or ino+gen (low 32bits as ino, high gen). There's no reason for cgroup to use different IDs. The kernfs IDs are unique and userland can easily discover them and map them back to paths using standard file operations.
This patch replaces cgroup IDs with kernfs IDs.
* cgroup_id() is added and all cgroup ID users are converted to use it.
* kernfs_node creation is moved to earlier during cgroup init so that cgroup_id() is available during init.
* While at it, s/cgroup/cgrp/ in psi helpers for consistency.
* Fallback ID value is changed to 1 to be consistent with root cgroup ID.
--- include/linux/cgroup-defs.h | 17 +------- include/linux/cgroup.h | 17 ++++---- include/trace/events/cgroup.h | 6 +-- kernel/bpf/helpers.c | 2 +- kernel/bpf/local_storage.c | 2 +- kernel/cgroup/cgroup.c | 76 ++++++++++++----------------------- kernel/trace/blktrace.c | 4 +- net/core/filter.c | 4 +- 8 files changed, 43 insertions(+), 85 deletions(-)
include/linux/cgroup-defs.h +2 -15
@@ -354,16 +354,6 @@ struct cgroup {unsigned long flags;/* "unsigned long" so bitops work */ -/* -* idr allocated in-hierarchy ID. -* -* ID 0 is not used, the ID of the root cgroup is always 1, and a -* new cgroup will be assigned with a smallest available ID. -* -* Allocating/Removing ID must be protected by cgroup_mutex. -*/ -int id; -/* * The depth this cgroup is at. The root is at depth zero and each * step down the hierarchy increments the level. This along with
@@ -488,7 +478,7 @@ struct cgroup {struct cgroup_freezer_state freezer;/* ids of the ancestors at each level including self */ -int ancestor_ids[]; +u64 ancestor_ids[]; };/*
@@ -509,7 +499,7 @@ struct cgroup_root {struct cgroup cgrp;/* for cgrp->ancestor_ids[0] */ -int cgrp_ancestor_id_storage; +u64 cgrp_ancestor_id_storage;/* Number of cgroups in the hierarchy, used only for /proc/cgroups */ atomic_t nr_cgrps;
@@ -520,9 +510,6 @@ struct cgroup_root {/* Hierarchy-specific flags */ unsigned int flags; -/* IDs for cgroups in this hierarchy */ -struct idr cgroup_idr; -/* The path to use for release notifications. */ char release_agent_path[PATH_MAX ];
include/linux/cgroup.h +7 -10
@@ -304,6 +304,11 @@ void css_task_iter_end(struct css_task_iter *it);* Inline functions. */ +static inline u64 cgroup_id (struct cgroup *cgrp) +{ +return cgrp->kn->id; +} +/** * css_get - obtain a reference on the specified css * @css: target css
@@ -565,7 +570,7 @@ static inline bool cgroup_is_descendant(struct cgroup *cgrp, {if (cgrp->root != ancestor->root || cgrp->level < ancestor->level)return false; -return cgrp->ancestor_ids[ancestor->level] == ancestor->id; +return cgrp->ancestor_ids[ancestor->level] ==cgroup_id (ancestor); }/**
@@ -687,17 +692,13 @@ static inline void cgroup_kthread_ready(void) current->no_cgroup_migration =0 ; } -static inline u64 cgroup_get_kernfs_id (struct cgroup *cgrp) -{ -return cgrp->kn->id; -} -void cgroup_path_from_kernfs_id (u64 id,char *buf,size_t buflen);#else /* !CONFIG_CGROUPS */ struct cgroup_subsys_state ;struct cgroup ; +static inline u64 cgroup_id (struct cgroup *cgrp) {return 1 ; }static inline void css_get (struct cgroup_subsys_state *css) {}static inline void css_put (struct cgroup_subsys_state *css) {} static inline int cgroup_attach_task_all(struct task_struct *from,
@@ -717,10 +718,6 @@ static inline int cgroup_init_early(void) { return 0; }static inline int cgroup_init (void ) {return 0 ; }static inline void cgroup_init_kthreadd (void ) {}static inline void cgroup_kthread_ready (void ) {} -static inline union u64 cgroup_get_kernfs_id (struct cgroup *cgrp) -{ -return 0 ; -}static inline struct cgroup *cgroup_parent (struct cgroup *cgrp) {
include/trace/events/cgroup.h +3 -3
@@ -66,7 +66,7 @@ DECLARE_EVENT_CLASS(cgroup,TP_fast_assign ( __entry->root = cgrp->root->hierarchy_id; - __entry->id = cgrp->id; + __entry->id =cgroup_id (cgrp); __entry->level = cgrp->level;__assign_str (path, path); ),
@@ -135,7 +135,7 @@ DECLARE_EVENT_CLASS(cgroup_migrate,TP_fast_assign ( __entry->dst_root = dst_cgrp->root->hierarchy_id; - __entry->dst_id = dst_cgrp->id; + __entry->dst_id =cgroup_id (dst_cgrp); __entry->dst_level = dst_cgrp->level;__assign_str (dst_path, path); __entry->pid = task->pid;
@@ -179,7 +179,7 @@ DECLARE_EVENT_CLASS(cgroup_event,TP_fast_assign ( __entry->root = cgrp->root->hierarchy_id; - __entry->id = cgrp->id; + __entry->id =cgroup_id (cgrp); __entry->level = cgrp->level;__assign_str (path, path); __entry->val = val;
kernel/bpf/helpers.c +1 -1
@@ -317,7 +317,7 @@ BPF_CALL_0(bpf_get_current_cgroup_id) {struct cgroup *cgrp =task_dfl_cgroup (current); -return cgrp->kn->id; +return cgroup_id (cgrp); }const struct bpf_func_proto bpf_get_current_cgroup_id_proto = {
kernel/bpf/local_storage.c +1 -1
@@ -569,7 +569,7 @@ void bpf_cgroup_storage_link(struct bpf_cgroup_storage *storage,return ; storage->key.attach_type = type; - storage->key.cgroup_inode_id = cgroup->kn->id; + storage->key.cgroup_inode_id =cgroup_id (cgroup); map = storage->map;
kernel/cgroup/cgroup.c +25 -51
191 lines not on this page · raw message
kernel/trace/blktrace.c +2 -2
@@ -171,7 +171,7 @@ void __trace_note_message(struct blk_trace *bt, struct blkcg *blkcg, blkcg =NULL ;#ifdef CONFIG_BLK_CGROUP trace_note (bt,0 ,BLK_TN_MESSAGE , buf, n, - blkcg ?cgroup_get_kernfs_id (blkcg->css.cgroup) :0 ); + blkcg ?cgroup_id (blkcg->css.cgroup) :1 );#else trace_note (bt,0 ,BLK_TN_MESSAGE , buf, n,0 );#endif
@@ -759,7 +759,7 @@ static u64 blk_trace_bio_get_cgid(struct request_queue *q, struct bio *bio)if (!bio->bi_blkg)return 0 ; - return cgroup_get_kernfs_id(bio_blkcg(bio)->css.cgroup); + return cgroup_id(bio_blkcg(bio)->css.cgroup); }#else u64 blk_trace_bio_get_cgid (struct request_queue *q,struct bio *bio)
net/core/filter.c +2 -2
@@ -4089,7 +4089,7 @@ BPF_CALL_1(bpf_skb_cgroup_id, const struct sk_buff *, skb)return 0 ; cgrp =sock_cgroup_ptr (&sk->sk_cgrp_data); -return cgrp->kn->id; +return cgroup_id (cgrp); }static const struct bpf_func_proto bpf_skb_cgroup_id_proto = {
@@ -4114,7 +4114,7 @@ BPF_CALL_2(bpf_skb_ancestor_cgroup_id, const struct sk_buff *, skb, int,if (!ancestor)return 0 ; -return ancestor->kn->id; +return cgroup_id (ancestor); }static const struct bpf_func_proto bpf_skb_ancestor_cgroup_id_proto = {
Signature · 1 line
2.17.1
Hi Tejun,
Quoted 53 lines · Tejun Heo
Hello,
Currently, there are three IDs which are being used to identify a cgroup.
1.
cgroup->id
2. cgroupfs 32bit ino
3. cgroupfs 32bit ino + 32bit genAll three IDs are visible to userland through different interfaces. This is very confusing and #1 can't even be resolved to cgroups from userland.
A 64bit number is sufficient to identify a cgroup instance uniquely and
ino_tis 64bit on all archs except for alpha. There's no reason for three different IDs at all. This patchset updates kernfs so that it supports 64bit ino and associated exportfs operations and unifies the cgroup IDs.* On 64bit ino archs, ino is kernfs node ID which is also the cgroup ID. The ino can be passed directly into
open_by_handle_at(2)w/ the new key typeFILEID_KERNFS. Backward compatibility is maintained forFILEID_INO32_GENkeys.* On 32bit ino archs, kernfs node ID is still 64bit and the cgroup ID. ino is the low 32bits and gen is the high 32bits. If the high 32bits is zero,
open_by_handle_at(2)only matches the ino part of the ID allowing userland to resolve inos to cgroups as long as distinguishing recycled inos isn't necessary.This patchset contains the following 10 patches.
0001-kernfs-fix-ino-wrap-around-detection.patch 0002-writeback-use-ino_t-for-inodes-in-tracepoints.patch 0003-netprio-use-css-ID-instead-of-cgroup-ID.patch 0004-kernfs-use-dumber-locking-for-kernfs_find_and_get_no.patch 0005-kernfs-kernfs_find_and_get_node_by_ino-should-only-l.patch 0006-kernfs-convert-kernfs_node-id-from-union-kernfs_node.patch 0007-kernfs-combine-ino-id-lookup-functions-into-kernfs_f.patch 0008-kernfs-implement-custom-exportfs-ops-and-fid-type.patch 0009-kernfs-use-64bit-inos-if-ino_t-is-64bit.patch 0010-cgroup-use-cgrp-kn-id-as-the-cgroup-ID.patch
0001 is a fix which should be backported through -stable. 0002 and 0003 are prep patches. 0004-0009 make
kernfs_node->ida u64 and use it as ino on 64bit ino archs. 0010 replacescgroup->idwith the kernfs node ID.Greg, how do you want to route the patches? We can route 0001-0009 through your tree and the last one through cgroup after pulling in. I'd be happy to route them all too.
Quoted 5 lines
This patchset is also available in the following git branch.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.gitreview-unified-cgiddiffstat follows. Thanks.
Thanks a lot for doing this! I've tested it with my perf cgroup patchset based on top of this series and it looks good. You can add my
Thanks
Namhyung
Tejun Heo
maintainerQuoted 4 lines · Namhyung Kim
Thanks a lot for doing this! I've tested it with my perf cgroup patchset based on top of this series and it looks good. You can add my
Tested-by Namhyung Kim <[email protected]>
Thanks for testing, sorry about the delay!
Signature · 1 line
tejun
Tejun Heo
maintainerHello, Greg.
A gentle ping. I can route these through cgroup/for-5.5 if you're okay with the patch series.
Thanks.
Signature · 1 line
tejun
Greg KH
maintainerQuoted 4 lines · Tejun Heo
Hello, Greg.
A gentle ping. I can route these through cgroup/for-5.5 if you're okay with the patch series.
Oops, let me go review...
Quoted 43 lines · Tejun Heo
Hello,
Currently, there are three IDs which are being used to identify a cgroup.
1.
cgroup->id
2. cgroupfs 32bit ino
3. cgroupfs 32bit ino + 32bit genAll three IDs are visible to userland through different interfaces. This is very confusing and #1 can't even be resolved to cgroups from userland.
A 64bit number is sufficient to identify a cgroup instance uniquely and
ino_tis 64bit on all archs except for alpha. There's no reason for three different IDs at all. This patchset updates kernfs so that it supports 64bit ino and associated exportfs operations and unifies the cgroup IDs.* On 64bit ino archs, ino is kernfs node ID which is also the cgroup ID. The ino can be passed directly into
open_by_handle_at(2)w/ the new key typeFILEID_KERNFS. Backward compatibility is maintained forFILEID_INO32_GENkeys.* On 32bit ino archs, kernfs node ID is still 64bit and the cgroup ID. ino is the low 32bits and gen is the high 32bits. If the high 32bits is zero,
open_by_handle_at(2)only matches the ino part of the ID allowing userland to resolve inos to cgroups as long as distinguishing recycled inos isn't necessary.This patchset contains the following 10 patches.
0001-kernfs-fix-ino-wrap-around-detection.patch 0002-writeback-use-ino_t-for-inodes-in-tracepoints.patch 0003-netprio-use-css-ID-instead-of-cgroup-ID.patch 0004-kernfs-use-dumber-locking-for-kernfs_find_and_get_no.patch 0005-kernfs-kernfs_find_and_get_node_by_ino-should-only-l.patch 0006-kernfs-convert-kernfs_node-id-from-union-kernfs_node.patch 0007-kernfs-combine-ino-id-lookup-functions-into-kernfs_f.patch 0008-kernfs-implement-custom-exportfs-ops-and-fid-type.patch 0009-kernfs-use-64bit-inos-if-ino_t-is-64bit.patch 0010-cgroup-use-cgrp-kn-id-as-the-cgroup-ID.patch
Quoted 8 lines
0001 is a fix which should be backported through -stable. 0002 and 0003 are prep patches. 0004-0009 make
kernfs_node->ida u64 and use it as ino on 64bit ino archs. 0010 replacescgroup->idwith the kernfs node ID.Greg, how do you want to route the patches? We can route 0001-0009 through your tree and the last one through cgroup after pulling in. I'd be happy to route them all too.
Sorry for the delay. Feel free to take all of these through your tree, that probably is easiest:
Tejun Heo
maintainerHello, Greg.
Quoted 4 lines · Greg KH
Sorry for the delay. Feel free to take all of these through your tree, that probably is easiest:
Reviewed-by Greg Kroah-Hartman <[email protected]>
Thanks a lot for the review! Applying 1-10 to cgroup/for-5.5.
Signature · 1 line
tejun