History

cgroup: Eliminate cgrp_ancestor_storage in cgroup_root

The cgrp_ancestor_storage has two drawbacks: - it's not guaranteed that the member immediately follows struct cgrp in cgroup_root (root cgroup's ancestors[0] might thus point to a padding and not in cgrp_ancestor_storage proper), - this idiom raises warnings with -Wflex-array-member-not-at-end. Instead of relying on the auxiliary member in cgroup_root, define the 0-th level ancestor inside struct cgroup (needed for static allocation of cgrp_dfl_root), deeper cgroups would allocate flexible _low_ancestors[]. Unionized alias through ancestors[] will transparently join the two ranges. The above change would still leave the flexible array at the end of struct cgroup inside cgroup_root, so move cgrp also towards the end of cgroup_root to resolve the -Wflex-array-member-not-at-end.

Michal Koutný committed 10 months ago

Commit ef565781 parent aa7d3a52 files · +15 −12Browse files

Unified · Split

2 files
  1. include/linux/cgroup-defs.h +14 −11
  2. kernel/cgroup/cgroup.c +1 −1
include/linux/cgroup-defs.h+14−11
@@ -626,7 +626,13 @@ struct cgroup { · 625 unmodified lines
626626 #endif
627627
628628 /* All ancestors including self */
629− struct cgroup *ancestors[];
629+ union {
630+ DECLARE_FLEX_ARRAY(struct cgroup *, ancestors);
631+ struct {
632+ struct cgroup *_root_ancestor;
633+ DECLARE_FLEX_ARRAY(struct cgroup *, _low_ancestors);
634+ };
635+ };
630636 };
631637
632638 /*
@@ -647,16 +653,6 @@ struct cgroup_root { · 14 unmodified lines
647653 struct list_head root_list;
648654 struct rcu_head rcu; /* Must be near the top */
649655
650− /*
651− * The root cgroup. The containing cgroup_root will be destroyed on its
652− * release. cgrp->ancestors[0] will be used overflowing into the
653− * following field. cgrp_ancestor_storage must immediately follow.
654− */
655− struct cgroup cgrp;
656−
657− /* must follow cgrp for cgrp->ancestors[0], see above */
658− struct cgroup *cgrp_ancestor_storage;
659−
660656 /* Number of cgroups in the hierarchy, used only for /proc/cgroups */
661657 atomic_t nr_cgrps;
662658
@@ -668,6 +664,13 @@ struct cgroup_root { · 5 unmodified lines
668664
669665 /* The name for this hierarchy - may be empty */
670666 char name[MAX_CGROUP_ROOT_NAMELEN];
667+
668+ /*
669+ * The root cgroup. The containing cgroup_root will be destroyed on its
670+ * release. This must be embedded last due to flexible array at the end
671+ * of struct cgroup.
672+ */
673+ struct cgroup cgrp;
671674 };
672675
673676 /*
kernel/cgroup/cgroup.c+1−1
@@ -5847,7 +5847,7 @@ static struct cgroup *cgroup_create(struct cgroup *parent, const char *name, · 5846 unmodified lines
58475847 int ret;
58485848
58495849 /* allocate the cgroup and its ID, 0 is reserved for the root */
5850− cgrp = kzalloc(struct_size(cgrp, ancestors, (level + 1)), GFP_KERNEL);
5850+ cgrp = kzalloc(struct_size(cgrp, _low_ancestors, level), GFP_KERNEL);
58515851 if (!cgrp)
58525852 return ERR_PTR(-ENOMEM);
58535853

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t