tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-5.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull cgroup fixes from Tejun Heo:
"Two cgroup fixes:

- fix a NULL deref when trying to poll PSI in the root cgroup

- fix confusing controller parsing corner case when mounting cgroup
v1 hierarchies

And doc / maintainer file updates"

* 'for-5.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: update PSI file description in docs
cgroup: fix psi monitor for root cgroup
MAINTAINERS: Update my email address
MAINTAINERS: Remove stale URLs for cpuset
cgroup-v1: add disabled controller check in cgroup1_parse_param()

Linus Torvalds ac30d8ce 25cbda46

+11 -8
+3 -3
Documentation/admin-guide/cgroup-v2.rst
··· 1029 1029 one number is written, $MAX is updated. 1030 1030 1031 1031 cpu.pressure 1032 - A read-only nested-key file which exists on non-root cgroups. 1032 + A read-write nested-keyed file. 1033 1033 1034 1034 Shows pressure stall information for CPU. See 1035 1035 :ref:`Documentation/accounting/psi.rst <psi>` for details. ··· 1475 1475 reduces the impact on the workload and memory management. 1476 1476 1477 1477 memory.pressure 1478 - A read-only nested-key file which exists on non-root cgroups. 1478 + A read-only nested-keyed file. 1479 1479 1480 1480 Shows pressure stall information for memory. See 1481 1481 :ref:`Documentation/accounting/psi.rst <psi>` for details. ··· 1714 1714 8:16 rbps=2097152 wbps=max riops=max wiops=max 1715 1715 1716 1716 io.pressure 1717 - A read-only nested-key file which exists on non-root cgroups. 1717 + A read-only nested-keyed file. 1718 1718 1719 1719 Shows pressure stall information for IO. See 1720 1720 :ref:`Documentation/accounting/psi.rst <psi>` for details.
+2 -4
MAINTAINERS
··· 4468 4468 4469 4469 CONTROL GROUP (CGROUP) 4470 4470 M: Tejun Heo <tj@kernel.org> 4471 - M: Li Zefan <lizefan@huawei.com> 4471 + M: Zefan Li <lizefan.x@bytedance.com> 4472 4472 M: Johannes Weiner <hannes@cmpxchg.org> 4473 4473 L: cgroups@vger.kernel.org 4474 4474 S: Maintained ··· 4492 4492 F: include/linux/blk-cgroup.h 4493 4493 4494 4494 CONTROL GROUP - CPUSET 4495 - M: Li Zefan <lizefan@huawei.com> 4495 + M: Zefan Li <lizefan.x@bytedance.com> 4496 4496 L: cgroups@vger.kernel.org 4497 4497 S: Maintained 4498 - W: http://www.bullopensource.org/cpuset/ 4499 - W: http://oss.sgi.com/projects/cpusets/ 4500 4498 T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git 4501 4499 F: Documentation/admin-guide/cgroup-v1/cpusets.rst 4502 4500 F: include/linux/cpuset.h
+3
kernel/cgroup/cgroup-v1.c
··· 917 917 for_each_subsys(ss, i) { 918 918 if (strcmp(param->key, ss->legacy_name)) 919 919 continue; 920 + if (!cgroup_ssid_enabled(i) || cgroup1_ssid_disabled(i)) 921 + return invalfc(fc, "Disabled controller '%s'", 922 + param->key); 920 923 ctx->subsys_mask |= (1 << i); 921 924 return 0; 922 925 }
+3 -1
kernel/cgroup/cgroup.c
··· 3564 3564 { 3565 3565 struct psi_trigger *new; 3566 3566 struct cgroup *cgrp; 3567 + struct psi_group *psi; 3567 3568 3568 3569 cgrp = cgroup_kn_lock_live(of->kn, false); 3569 3570 if (!cgrp) ··· 3573 3572 cgroup_get(cgrp); 3574 3573 cgroup_kn_unlock(of->kn); 3575 3574 3576 - new = psi_trigger_create(&cgrp->psi, buf, nbytes, res); 3575 + psi = cgroup_ino(cgrp) == 1 ? &psi_system : &cgrp->psi; 3576 + new = psi_trigger_create(psi, buf, nbytes, res); 3577 3577 if (IS_ERR(new)) { 3578 3578 cgroup_put(cgrp); 3579 3579 return PTR_ERR(new);