|
67 | 67 | /* let's not notify more than 100 times per second */ |
68 | 68 | #define CGROUP_FILE_NOTIFY_MIN_INTV DIV_ROUND_UP(HZ, 100) |
69 | 69 |
|
| 70 | +/* |
| 71 | + * To avoid confusing the compiler (and generating warnings) with code |
| 72 | + * that attempts to access what would be a 0-element array (i.e. sized |
| 73 | + * to a potentially empty array when CGROUP_SUBSYS_COUNT == 0), this |
| 74 | + * constant expression can be added. |
| 75 | + */ |
| 76 | +#define CGROUP_HAS_SUBSYS_CONFIG (CGROUP_SUBSYS_COUNT > 0) |
| 77 | + |
70 | 78 | /* |
71 | 79 | * cgroup_mutex is the master lock. Any modification to cgroup or its |
72 | 80 | * hierarchy must be performed while holding it. |
@@ -248,7 +256,7 @@ static int cgroup_addrm_files(struct cgroup_subsys_state *css, |
248 | 256 | */ |
249 | 257 | bool cgroup_ssid_enabled(int ssid) |
250 | 258 | { |
251 | | - if (CGROUP_SUBSYS_COUNT == 0) |
| 259 | + if (!CGROUP_HAS_SUBSYS_CONFIG) |
252 | 260 | return false; |
253 | 261 |
|
254 | 262 | return static_key_enabled(cgroup_subsys_enabled_key[ssid]); |
@@ -472,7 +480,7 @@ static u16 cgroup_ss_mask(struct cgroup *cgrp) |
472 | 480 | static struct cgroup_subsys_state *cgroup_css(struct cgroup *cgrp, |
473 | 481 | struct cgroup_subsys *ss) |
474 | 482 | { |
475 | | - if (ss) |
| 483 | + if (CGROUP_HAS_SUBSYS_CONFIG && ss) |
476 | 484 | return rcu_dereference_check(cgrp->subsys[ss->id], |
477 | 485 | lockdep_is_held(&cgroup_mutex)); |
478 | 486 | else |
@@ -550,6 +558,9 @@ struct cgroup_subsys_state *cgroup_e_css(struct cgroup *cgrp, |
550 | 558 | { |
551 | 559 | struct cgroup_subsys_state *css; |
552 | 560 |
|
| 561 | + if (!CGROUP_HAS_SUBSYS_CONFIG) |
| 562 | + return NULL; |
| 563 | + |
553 | 564 | do { |
554 | 565 | css = cgroup_css(cgrp, ss); |
555 | 566 |
|
@@ -577,6 +588,9 @@ struct cgroup_subsys_state *cgroup_get_e_css(struct cgroup *cgrp, |
577 | 588 | { |
578 | 589 | struct cgroup_subsys_state *css; |
579 | 590 |
|
| 591 | + if (!CGROUP_HAS_SUBSYS_CONFIG) |
| 592 | + return NULL; |
| 593 | + |
580 | 594 | rcu_read_lock(); |
581 | 595 |
|
582 | 596 | do { |
@@ -647,7 +661,7 @@ struct cgroup_subsys_state *of_css(struct kernfs_open_file *of) |
647 | 661 | * the matching css from the cgroup's subsys table is guaranteed to |
648 | 662 | * be and stay valid until the enclosing operation is complete. |
649 | 663 | */ |
650 | | - if (cft->ss) |
| 664 | + if (CGROUP_HAS_SUBSYS_CONFIG && cft->ss) |
651 | 665 | return rcu_dereference_raw(cgrp->subsys[cft->ss->id]); |
652 | 666 | else |
653 | 667 | return &cgrp->self; |
@@ -695,7 +709,7 @@ EXPORT_SYMBOL_GPL(of_css); |
695 | 709 | */ |
696 | 710 | #define do_each_subsys_mask(ss, ssid, ss_mask) do { \ |
697 | 711 | unsigned long __ss_mask = (ss_mask); \ |
698 | | - if (!CGROUP_SUBSYS_COUNT) { /* to avoid spurious gcc warning */ \ |
| 712 | + if (!CGROUP_HAS_SUBSYS_CONFIG) { \ |
699 | 713 | (ssid) = 0; \ |
700 | 714 | break; \ |
701 | 715 | } \ |
@@ -2372,7 +2386,7 @@ struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset, |
2372 | 2386 | struct css_set *cset = tset->cur_cset; |
2373 | 2387 | struct task_struct *task = tset->cur_task; |
2374 | 2388 |
|
2375 | | - while (&cset->mg_node != tset->csets) { |
| 2389 | + while (CGROUP_HAS_SUBSYS_CONFIG && &cset->mg_node != tset->csets) { |
2376 | 2390 | if (!task) |
2377 | 2391 | task = list_first_entry(&cset->mg_tasks, |
2378 | 2392 | struct task_struct, cg_list); |
@@ -4643,7 +4657,7 @@ void css_task_iter_start(struct cgroup_subsys_state *css, unsigned int flags, |
4643 | 4657 | it->ss = css->ss; |
4644 | 4658 | it->flags = flags; |
4645 | 4659 |
|
4646 | | - if (it->ss) |
| 4660 | + if (CGROUP_HAS_SUBSYS_CONFIG && it->ss) |
4647 | 4661 | it->cset_pos = &css->cgroup->e_csets[css->ss->id]; |
4648 | 4662 | else |
4649 | 4663 | it->cset_pos = &css->cgroup->cset_links; |
|
0 commit comments