Commit 86e98ed1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull cgroup updates from Tejun Heo:

 - cpuset changes including the fix for an incorrect interaction with
   CPU hotplug and an optimization

 - Other doc and cosmetic changes

* tag 'cgroup-for-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  docs: cgroup-v1/cpusets: update libcgroup project link
  cgroup/cpuset: Minor updates to test_cpuset_prs.sh
  cgroup/cpuset: Include offline CPUs when tasks' cpumasks in top_cpuset are updated
  cgroup/cpuset: Skip task update if hotplug doesn't affect current cpuset
  cpuset: Clean up cpuset_node_allowed
  cgroup: bpf: use cgroup_lock()/cgroup_unlock() wrappers
parents cd546fa3 9403d9cb

Documentation/admin-guide/cgroup-v1/cpusets.rst

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ There are ways to query or modify cpusets: 
   cat, rmdir commands from the shell, or their equivalent from C.

 - via the C library libcpuset.

 - via the C library libcgroup.

   (http://sourceforge.net/projects/libcg/)

   (https://github.com/libcgroup/libcgroup/)

 - via the python application cset.

   (http://code.google.com/p/cpuset/)

include/linux/cpuset.h

+2 −14
Original line number Diff line number Diff line
@@ -80,18 +80,11 @@ extern nodemask_t cpuset_mems_allowed(struct task_struct *p); 
void cpuset_init_current_mems_allowed(void);

int cpuset_nodemask_valid_mems_allowed(nodemask_t *nodemask);



extern bool __cpuset_node_allowed(int node, gfp_t gfp_mask);



static inline bool cpuset_node_allowed(int node, gfp_t gfp_mask)

{

	if (cpusets_enabled())

		return __cpuset_node_allowed(node, gfp_mask);

	return true;

}

extern bool cpuset_node_allowed(int node, gfp_t gfp_mask);



static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)

{

	return __cpuset_node_allowed(zone_to_nid(z), gfp_mask);

	return cpuset_node_allowed(zone_to_nid(z), gfp_mask);

}



static inline bool cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
@@ -223,11 +216,6 @@ static inline int cpuset_nodemask_valid_mems_allowed(nodemask_t *nodemask) 
	return 1;

}



static inline bool cpuset_node_allowed(int node, gfp_t gfp_mask)

{

	return true;

}



static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)

{

	return true;

kernel/bpf/cgroup.c

+19 −19
Original line number Diff line number Diff line
@@ -173,11 +173,11 @@ void bpf_cgroup_atype_put(int cgroup_atype) 
{

	int i = cgroup_atype - CGROUP_LSM_START;



	mutex_lock(&cgroup_mutex);

	cgroup_lock();

	if (--cgroup_lsm_atype[i].refcnt <= 0)

		cgroup_lsm_atype[i].attach_btf_id = 0;

	WARN_ON_ONCE(cgroup_lsm_atype[i].refcnt < 0);

	mutex_unlock(&cgroup_mutex);

	cgroup_unlock();

}

#else

static enum cgroup_bpf_attach_type
@@ -282,7 +282,7 @@ static void cgroup_bpf_release(struct work_struct *work) 


	unsigned int atype;



	mutex_lock(&cgroup_mutex);

	cgroup_lock();



	for (atype = 0; atype < ARRAY_SIZE(cgrp->bpf.progs); atype++) {

		struct hlist_head *progs = &cgrp->bpf.progs[atype];
@@ -315,7 +315,7 @@ static void cgroup_bpf_release(struct work_struct *work) 
		bpf_cgroup_storage_free(storage);

	}



	mutex_unlock(&cgroup_mutex);

	cgroup_unlock();



	for (p = cgroup_parent(cgrp); p; p = cgroup_parent(p))

		cgroup_bpf_put(p);
@@ -729,9 +729,9 @@ static int cgroup_bpf_attach(struct cgroup *cgrp, 
{

	int ret;



	mutex_lock(&cgroup_mutex);

	cgroup_lock();

	ret = __cgroup_bpf_attach(cgrp, prog, replace_prog, link, type, flags);

	mutex_unlock(&cgroup_mutex);

	cgroup_unlock();

	return ret;

}
@@ -831,7 +831,7 @@ static int cgroup_bpf_replace(struct bpf_link *link, struct bpf_prog *new_prog, 


	cg_link = container_of(link, struct bpf_cgroup_link, link);



	mutex_lock(&cgroup_mutex);

	cgroup_lock();

	/* link might have been auto-released by dying cgroup, so fail */

	if (!cg_link->cgroup) {

		ret = -ENOLINK;
@@ -843,7 +843,7 @@ static int cgroup_bpf_replace(struct bpf_link *link, struct bpf_prog *new_prog, 
	}

	ret = __cgroup_bpf_replace(cg_link->cgroup, cg_link, new_prog);

out_unlock:

	mutex_unlock(&cgroup_mutex);

	cgroup_unlock();

	return ret;

}
@@ -1009,9 +1009,9 @@ static int cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog, 
{

	int ret;



	mutex_lock(&cgroup_mutex);

	cgroup_lock();

	ret = __cgroup_bpf_detach(cgrp, prog, NULL, type);

	mutex_unlock(&cgroup_mutex);

	cgroup_unlock();

	return ret;

}
@@ -1120,9 +1120,9 @@ static int cgroup_bpf_query(struct cgroup *cgrp, const union bpf_attr *attr, 
{

	int ret;



	mutex_lock(&cgroup_mutex);

	cgroup_lock();

	ret = __cgroup_bpf_query(cgrp, attr, uattr);

	mutex_unlock(&cgroup_mutex);

	cgroup_unlock();

	return ret;

}
@@ -1189,11 +1189,11 @@ static void bpf_cgroup_link_release(struct bpf_link *link) 
	if (!cg_link->cgroup)

		return;



	mutex_lock(&cgroup_mutex);

	cgroup_lock();



	/* re-check cgroup under lock again */

	if (!cg_link->cgroup) {

		mutex_unlock(&cgroup_mutex);

		cgroup_unlock();

		return;

	}
@@ -1205,7 +1205,7 @@ static void bpf_cgroup_link_release(struct bpf_link *link) 
	cg = cg_link->cgroup;

	cg_link->cgroup = NULL;



	mutex_unlock(&cgroup_mutex);

	cgroup_unlock();



	cgroup_put(cg);

}
@@ -1232,10 +1232,10 @@ static void bpf_cgroup_link_show_fdinfo(const struct bpf_link *link, 
		container_of(link, struct bpf_cgroup_link, link);

	u64 cg_id = 0;



	mutex_lock(&cgroup_mutex);

	cgroup_lock();

	if (cg_link->cgroup)

		cg_id = cgroup_id(cg_link->cgroup);

	mutex_unlock(&cgroup_mutex);

	cgroup_unlock();



	seq_printf(seq,

		   "cgroup_id:\t%llu\n"
@@ -1251,10 +1251,10 @@ static int bpf_cgroup_link_fill_link_info(const struct bpf_link *link, 
		container_of(link, struct bpf_cgroup_link, link);

	u64 cg_id = 0;



	mutex_lock(&cgroup_mutex);

	cgroup_lock();

	if (cg_link->cgroup)

		cg_id = cgroup_id(cg_link->cgroup);

	mutex_unlock(&cgroup_mutex);

	cgroup_unlock();



	info->cgroup.cgroup_id = cg_id;

	info->cgroup.attach_type = cg_link->type;

kernel/bpf/cgroup_iter.c

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static void *cgroup_iter_seq_start(struct seq_file *seq, loff_t *pos) 
{

	struct cgroup_iter_priv *p = seq->private;



	mutex_lock(&cgroup_mutex);

	cgroup_lock();



	/* cgroup_iter doesn't support read across multiple sessions. */

	if (*pos > 0) {
@@ -89,7 +89,7 @@ static void cgroup_iter_seq_stop(struct seq_file *seq, void *v) 
{

	struct cgroup_iter_priv *p = seq->private;



	mutex_unlock(&cgroup_mutex);

	cgroup_unlock();



	/* pass NULL to the prog for post-processing */

	if (!v) {

kernel/bpf/local_storage.c

+2 −2
Original line number Diff line number Diff line
@@ -333,14 +333,14 @@ static void cgroup_storage_map_free(struct bpf_map *_map) 
	struct list_head *storages = &map->list;

	struct bpf_cgroup_storage *storage, *stmp;



	mutex_lock(&cgroup_mutex);

	cgroup_lock();



	list_for_each_entry_safe(storage, stmp, storages, list_map) {

		bpf_cgroup_storage_unlink(storage);

		bpf_cgroup_storage_free(storage);

	}



	mutex_unlock(&cgroup_mutex);

	cgroup_unlock();



	WARN_ON(!RB_EMPTY_ROOT(&map->root));

	WARN_ON(!list_empty(&map->list));