Commit 352526f4 authored by Linus Torvalds's avatar Linus Torvalds

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

Pull cgroup fixes from Tejun Heo:
 "Three cgroup fixes.  Nothing critical:

   - the pids controller could trigger suspicious RCU warning
     spuriously. Fixed.

   - in the debug controller, %p -> %pK to protect kernel pointer
     from getting exposed.

   - documentation formatting fix"

* 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroups: censor kernel pointer in debug files
  cgroup/pids: remove spurious suspicious RCU usage warning
  cgroup: Fix indenting in PID controller documentation
parents 6517569d b6a6759d
...@@ -1142,8 +1142,8 @@ used by the kernel. ...@@ -1142,8 +1142,8 @@ used by the kernel.
pids.max pids.max
A read-write single value file which exists on non-root cgroups. The A read-write single value file which exists on non-root
default is "max". cgroups. The default is "max".
Hard limit of number of processes. Hard limit of number of processes.
...@@ -1151,7 +1151,8 @@ used by the kernel. ...@@ -1151,7 +1151,8 @@ used by the kernel.
A read-only single value file which exists on all cgroups. A read-only single value file which exists on all cgroups.
The number of processes currently in the cgroup and its descendants. The number of processes currently in the cgroup and its
descendants.
Organisational operations are not blocked by cgroup policies, so it is Organisational operations are not blocked by cgroup policies, so it is
possible to have pids.current > pids.max. This can be done by either possible to have pids.current > pids.max. This can be done by either
......
...@@ -1329,7 +1329,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v) ...@@ -1329,7 +1329,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
struct task_struct *task; struct task_struct *task;
int count = 0; int count = 0;
seq_printf(seq, "css_set %p\n", cset); seq_printf(seq, "css_set %pK\n", cset);
list_for_each_entry(task, &cset->tasks, cg_list) { list_for_each_entry(task, &cset->tasks, cg_list) {
if (count++ > MAX_TASKS_SHOWN_PER_CSS) if (count++ > MAX_TASKS_SHOWN_PER_CSS)
......
...@@ -229,7 +229,7 @@ static int pids_can_fork(struct task_struct *task) ...@@ -229,7 +229,7 @@ static int pids_can_fork(struct task_struct *task)
/* Only log the first time events_limit is incremented. */ /* Only log the first time events_limit is incremented. */
if (atomic64_inc_return(&pids->events_limit) == 1) { if (atomic64_inc_return(&pids->events_limit) == 1) {
pr_info("cgroup: fork rejected by pids controller in "); pr_info("cgroup: fork rejected by pids controller in ");
pr_cont_cgroup_path(task_cgroup(current, pids_cgrp_id)); pr_cont_cgroup_path(css->cgroup);
pr_cont("\n"); pr_cont("\n");
} }
cgroup_file_notify(&pids->events_file); cgroup_file_notify(&pids->events_file);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment