Commit 6e2332e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cgroup-for-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup 

Pull cgroup updates from Tejun Heo:

 - Whenever cpuset needs to rebuild sched_domain, it walked all tasks
   looking for DEADLINE tasks as they need to be accounted on the new
   domain. Walking all tasks can be expensive and there may not be any
   DEADLINE tasks at all. Task iteration is now omitted if there are no
   DEADLINE tasks

 - Fixes DEADLINE bandwidth misaccounting after task migration failures

 - When no controller is enabled, -Wstringop-overflow warning is
   triggered. The fix patch added an early exit which is too eager and
   got reverted for now. Will fix later

 - Everything else is minor cleanups

* tag 'cgroup-for-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  Revert "cgroup: Avoid -Wstringop-overflow warnings"
  cgroup/misc: Expose misc.current on cgroup v2 root
  cgroup: Avoid -Wstringop-overflow warnings
  cgroup: remove obsolete comment on cgroup_on_dfl()
  cgroup: remove unused task_cgroup_path()
  cgroup/cpuset: remove unneeded header files
  cgroup: make cgroup_is_threaded() and cgroup_is_thread_root() static
  rdmacg: fix kernel-doc warnings in rdmacg
  cgroup: Replace the css_set call with cgroup_get
  cgroup: remove unused macro for_each_e_css()
  cgroup: Update out-of-date comment in cgroup_migrate()
  cgroup: Replace all non-returning strlcpy with strscpy
  cgroup/cpuset: remove unneeded header files
  cgroup/cpuset: Free DL BW in case can_attach() fails
  sched/deadline: Create DL BW alloc, free & check overflow interface
  cgroup/cpuset: Iterate only if DEADLINE tasks are present
  sched/cpuset: Keep track of SCHED_DEADLINE task in cpusets
  sched/cpuset: Bring back cpuset_mutex
  cgroup/cpuset: Rename functions dealing with DEADLINE accounting
parents 72dc6db7 81621430

Documentation/admin-guide/cgroup-v2.rst

+1 −1
Original line number Diff line number Diff line
@@ -2443,7 +2443,7 @@ Miscellaneous controller provides 3 interface files. If two misc resources (res_ 
	  res_b 10



  misc.current

        A read-only flat-keyed file shown in the non-root cgroups.  It shows

        A read-only flat-keyed file shown in the all cgroups.  It shows

        the current usage of the resources in the cgroup and its children.::



	  $ cat misc.current

include/linux/cgroup.h

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ int cgroup_rm_cftypes(struct cftype *cfts); 
void cgroup_file_notify(struct cgroup_file *cfile);

void cgroup_file_show(struct cgroup_file *cfile, bool show);



int task_cgroup_path(struct task_struct *task, char *buf, size_t buflen);

int cgroupstats_build(struct cgroupstats *stats, struct dentry *dentry);

int proc_cgroup_show(struct seq_file *m, struct pid_namespace *ns,

		     struct pid *pid, struct task_struct *tsk);

include/linux/cpuset.h

+8 −4
Original line number Diff line number Diff line
@@ -71,8 +71,10 @@ extern void cpuset_init_smp(void); 
extern void cpuset_force_rebuild(void);

extern void cpuset_update_active_cpus(void);

extern void cpuset_wait_for_hotplug(void);

extern void cpuset_read_lock(void);

extern void cpuset_read_unlock(void);

extern void inc_dl_tasks_cs(struct task_struct *task);

extern void dec_dl_tasks_cs(struct task_struct *task);

extern void cpuset_lock(void);

extern void cpuset_unlock(void);

extern void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask);

extern bool cpuset_cpus_allowed_fallback(struct task_struct *p);

extern nodemask_t cpuset_mems_allowed(struct task_struct *p);
@@ -189,8 +191,10 @@ static inline void cpuset_update_active_cpus(void) 


static inline void cpuset_wait_for_hotplug(void) { }



static inline void cpuset_read_lock(void) { }

static inline void cpuset_read_unlock(void) { }

static inline void inc_dl_tasks_cs(struct task_struct *task) { }

static inline void dec_dl_tasks_cs(struct task_struct *task) { }

static inline void cpuset_lock(void) { }

static inline void cpuset_unlock(void) { }



static inline void cpuset_cpus_allowed(struct task_struct *p,

				       struct cpumask *mask)

include/linux/sched.h

+3 −1
Original line number Diff line number Diff line
@@ -1852,7 +1852,9 @@ current_restore_flags(unsigned long orig_flags, unsigned long flags) 
}



extern int cpuset_cpumask_can_shrink(const struct cpumask *cur, const struct cpumask *trial);

extern int task_can_attach(struct task_struct *p, const struct cpumask *cs_effective_cpus);

extern int task_can_attach(struct task_struct *p);

extern int dl_bw_alloc(int cpu, u64 dl_bw);

extern void dl_bw_free(int cpu, u64 dl_bw);

#ifdef CONFIG_SMP

extern void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask);

extern int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask);

kernel/cgroup/cgroup-internal.h

+0 −2
Original line number Diff line number Diff line
@@ -220,8 +220,6 @@ static inline void get_css_set(struct css_set *cset) 


bool cgroup_ssid_enabled(int ssid);

bool cgroup_on_dfl(const struct cgroup *cgrp);

bool cgroup_is_thread_root(struct cgroup *cgrp);

bool cgroup_is_threaded(struct cgroup *cgrp);



struct cgroup_root *cgroup_root_from_kf(struct kernfs_root *kf_root);

struct cgroup *task_cgroup_from_root(struct task_struct *task,