From e03fa66fce6fdfead641c18c40ec280e7e9fb5e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 15 Sep 2017 11:53:10 +0200 Subject: [PATCH] add cpuset v2 in v1 cherry-picks --- ...-accept-an-alternate-timestamp-strin.patch | 2 +- ...idge-keep-MAC-of-first-assigned-port.patch | 2 +- ...ides-for-missing-ACS-capabilities-4..patch | 2 +- ...-default-dynamic-halt-polling-growth.patch | 2 +- ...-flag-to-enable-cpuset-to-use-v2-beh.patch | 66 ++++++++ ...puset-Allow-v2-behavior-in-v1-cgroup.patch | 141 ++++++++++++++++++ 6 files changed, 211 insertions(+), 4 deletions(-) create mode 100644 patches/kernel/0005-cgroup-Add-mount-flag-to-enable-cpuset-to-use-v2-beh.patch create mode 100644 patches/kernel/0006-cpuset-Allow-v2-behavior-in-v1-cgroup.patch diff --git a/patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch b/patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch index 23aa2a2..6d9941e 100644 --- a/patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch +++ b/patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch @@ -1,7 +1,7 @@ From 3e7aff6b22287eb04b8b5c4966b886b0ac1e8b06 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 12 May 2015 19:29:22 +0100 -Subject: [PATCH 1/4] Make mkcompile_h accept an alternate timestamp string +Subject: [PATCH 1/6] Make mkcompile_h accept an alternate timestamp string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch b/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch index 85b6f01..a1b62bf 100644 --- a/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch +++ b/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch @@ -1,7 +1,7 @@ From 400ed0a6a0992f685b547e12f0fd5d35176e1275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 14 Sep 2017 11:02:18 +0200 -Subject: [PATCH 2/4] bridge: keep MAC of first assigned port +Subject: [PATCH 2/6] bridge: keep MAC of first assigned port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index 365d137..7084ff3 100644 --- a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -1,7 +1,7 @@ From e39d70502f7a981f821243160501303b7ee26d52 Mon Sep 17 00:00:00 2001 From: Mark Weiman Date: Sat, 29 Jul 2017 09:15:32 -0400 -Subject: [PATCH 3/4] pci: Enable overrides for missing ACS capabilities +Subject: [PATCH 3/6] pci: Enable overrides for missing ACS capabilities (4.12+) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch index 14b4779..0340025 100644 --- a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch +++ b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch @@ -1,7 +1,7 @@ From c60cb6add5a95c3e7bfb7b0d92c01ce66bfec8d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 14 Sep 2017 11:09:58 +0200 -Subject: [PATCH 4/4] kvm: disable default dynamic halt polling growth +Subject: [PATCH 4/6] kvm: disable default dynamic halt polling growth MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/patches/kernel/0005-cgroup-Add-mount-flag-to-enable-cpuset-to-use-v2-beh.patch b/patches/kernel/0005-cgroup-Add-mount-flag-to-enable-cpuset-to-use-v2-beh.patch new file mode 100644 index 0000000..e19261a --- /dev/null +++ b/patches/kernel/0005-cgroup-Add-mount-flag-to-enable-cpuset-to-use-v2-beh.patch @@ -0,0 +1,66 @@ +From 014fff8b14ccd85d8e9604bbf4e812784bcfc29b Mon Sep 17 00:00:00 2001 +From: Waiman Long +Date: Thu, 17 Aug 2017 15:33:09 -0400 +Subject: [PATCH 5/6] cgroup: Add mount flag to enable cpuset to use v2 + behavior in v1 cgroup +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +A new mount option "cpuset_v2_mode" is added to the v1 cgroupfs +filesystem to enable cpuset controller to use v2 behavior in a v1 +cgroup. This mount option applies only to cpuset controller and have +no effect on other controllers. + +Signed-off-by: Waiman Long +Signed-off-by: Tejun Heo +(cherry-picked from e1cba4b85daa71b710384d451ff6238d5e4d1ff6) +Signed-off-by: Fabian Grünbichler +--- + include/linux/cgroup-defs.h | 5 +++++ + kernel/cgroup/cgroup-v1.c | 6 ++++++ + 2 files changed, 11 insertions(+) + +diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h +index 09f4c7df1478..c344e77707a5 100644 +--- a/include/linux/cgroup-defs.h ++++ b/include/linux/cgroup-defs.h +@@ -74,6 +74,11 @@ enum { + * aren't writeable from inside the namespace. + */ + CGRP_ROOT_NS_DELEGATE = (1 << 3), ++ ++ /* ++ * Enable cpuset controller in v1 cgroup to use v2 behavior. ++ */ ++ CGRP_ROOT_CPUSET_V2_MODE = (1 << 4), + }; + + /* cftype->flags */ +diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c +index 7bf4b1533f34..ce7426b875f5 100644 +--- a/kernel/cgroup/cgroup-v1.c ++++ b/kernel/cgroup/cgroup-v1.c +@@ -846,6 +846,8 @@ static int cgroup1_show_options(struct seq_file *seq, struct kernfs_root *kf_roo + seq_puts(seq, ",noprefix"); + if (root->flags & CGRP_ROOT_XATTR) + seq_puts(seq, ",xattr"); ++ if (root->flags & CGRP_ROOT_CPUSET_V2_MODE) ++ seq_puts(seq, ",cpuset_v2_mode"); + + spin_lock(&release_agent_path_lock); + if (strlen(root->release_agent_path)) +@@ -900,6 +902,10 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) + opts->cpuset_clone_children = true; + continue; + } ++ if (!strcmp(token, "cpuset_v2_mode")) { ++ opts->flags |= CGRP_ROOT_CPUSET_V2_MODE; ++ continue; ++ } + if (!strcmp(token, "xattr")) { + opts->flags |= CGRP_ROOT_XATTR; + continue; +-- +2.11.0 + diff --git a/patches/kernel/0006-cpuset-Allow-v2-behavior-in-v1-cgroup.patch b/patches/kernel/0006-cpuset-Allow-v2-behavior-in-v1-cgroup.patch new file mode 100644 index 0000000..91359d5 --- /dev/null +++ b/patches/kernel/0006-cpuset-Allow-v2-behavior-in-v1-cgroup.patch @@ -0,0 +1,141 @@ +From eef40f89ccf3fc7ef5b1f88a4a6974fa7667f74f Mon Sep 17 00:00:00 2001 +From: Waiman Long +Date: Thu, 17 Aug 2017 15:33:10 -0400 +Subject: [PATCH 6/6] cpuset: Allow v2 behavior in v1 cgroup +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Cpuset v2 has some useful behaviors that are not present in v1 because +of backward compatibility concern. One of that is the restoration of +the original cpu and memory node mask after a hot removal and addition +event sequence. + +This patch makes the cpuset controller to check the +CGRP_ROOT_CPUSET_V2_MODE flag and use the v2 behavior if it is set. + +Signed-off-by: Waiman Long +Signed-off-by: Tejun Heo +(cherry-picked from b8d1b8ee93df8ffbabbeadd65d39853cfad6d698) +Signed-off-by: Fabian Grünbichler +--- + kernel/cgroup/cpuset.c | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) + +diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c +index 87a1213dd326..9b2c4babbd7f 100644 +--- a/kernel/cgroup/cpuset.c ++++ b/kernel/cgroup/cpuset.c +@@ -300,6 +300,16 @@ static DECLARE_WORK(cpuset_hotplug_work, cpuset_hotplug_workfn); + static DECLARE_WAIT_QUEUE_HEAD(cpuset_attach_wq); + + /* ++ * Cgroup v2 behavior is used when on default hierarchy or the ++ * cgroup_v2_mode flag is set. ++ */ ++static inline bool is_in_v2_mode(void) ++{ ++ return cgroup_subsys_on_dfl(cpuset_cgrp_subsys) || ++ (cpuset_cgrp_subsys.root->flags & CGRP_ROOT_CPUSET_V2_MODE); ++} ++ ++/* + * This is ugly, but preserves the userspace API for existing cpuset + * users. If someone tries to mount the "cpuset" filesystem, we + * silently switch it to mount "cgroup" instead +@@ -489,8 +499,7 @@ static int validate_change(struct cpuset *cur, struct cpuset *trial) + + /* On legacy hiearchy, we must be a subset of our parent cpuset. */ + ret = -EACCES; +- if (!cgroup_subsys_on_dfl(cpuset_cgrp_subsys) && +- !is_cpuset_subset(trial, par)) ++ if (!is_in_v2_mode() && !is_cpuset_subset(trial, par)) + goto out; + + /* +@@ -896,8 +905,7 @@ static void update_cpumasks_hier(struct cpuset *cs, struct cpumask *new_cpus) + * If it becomes empty, inherit the effective mask of the + * parent, which is guaranteed to have some CPUs. + */ +- if (cgroup_subsys_on_dfl(cpuset_cgrp_subsys) && +- cpumask_empty(new_cpus)) ++ if (is_in_v2_mode() && cpumask_empty(new_cpus)) + cpumask_copy(new_cpus, parent->effective_cpus); + + /* Skip the whole subtree if the cpumask remains the same. */ +@@ -914,7 +922,7 @@ static void update_cpumasks_hier(struct cpuset *cs, struct cpumask *new_cpus) + cpumask_copy(cp->effective_cpus, new_cpus); + spin_unlock_irq(&callback_lock); + +- WARN_ON(!cgroup_subsys_on_dfl(cpuset_cgrp_subsys) && ++ WARN_ON(!is_in_v2_mode() && + !cpumask_equal(cp->cpus_allowed, cp->effective_cpus)); + + update_tasks_cpumask(cp); +@@ -1150,8 +1158,7 @@ static void update_nodemasks_hier(struct cpuset *cs, nodemask_t *new_mems) + * If it becomes empty, inherit the effective mask of the + * parent, which is guaranteed to have some MEMs. + */ +- if (cgroup_subsys_on_dfl(cpuset_cgrp_subsys) && +- nodes_empty(*new_mems)) ++ if (is_in_v2_mode() && nodes_empty(*new_mems)) + *new_mems = parent->effective_mems; + + /* Skip the whole subtree if the nodemask remains the same. */ +@@ -1168,7 +1175,7 @@ static void update_nodemasks_hier(struct cpuset *cs, nodemask_t *new_mems) + cp->effective_mems = *new_mems; + spin_unlock_irq(&callback_lock); + +- WARN_ON(!cgroup_subsys_on_dfl(cpuset_cgrp_subsys) && ++ WARN_ON(!is_in_v2_mode() && + !nodes_equal(cp->mems_allowed, cp->effective_mems)); + + update_tasks_nodemask(cp); +@@ -1460,7 +1467,7 @@ static int cpuset_can_attach(struct cgroup_taskset *tset) + + /* allow moving tasks into an empty cpuset if on default hierarchy */ + ret = -ENOSPC; +- if (!cgroup_subsys_on_dfl(cpuset_cgrp_subsys) && ++ if (!is_in_v2_mode() && + (cpumask_empty(cs->cpus_allowed) || nodes_empty(cs->mems_allowed))) + goto out_unlock; + +@@ -1979,7 +1986,7 @@ static int cpuset_css_online(struct cgroup_subsys_state *css) + cpuset_inc(); + + spin_lock_irq(&callback_lock); +- if (cgroup_subsys_on_dfl(cpuset_cgrp_subsys)) { ++ if (is_in_v2_mode()) { + cpumask_copy(cs->effective_cpus, parent->effective_cpus); + cs->effective_mems = parent->effective_mems; + } +@@ -2056,7 +2063,7 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css) + mutex_lock(&cpuset_mutex); + spin_lock_irq(&callback_lock); + +- if (cgroup_subsys_on_dfl(cpuset_cgrp_subsys)) { ++ if (is_in_v2_mode()) { + cpumask_copy(top_cpuset.cpus_allowed, cpu_possible_mask); + top_cpuset.mems_allowed = node_possible_map; + } else { +@@ -2250,7 +2257,7 @@ static void cpuset_hotplug_update_tasks(struct cpuset *cs) + cpus_updated = !cpumask_equal(&new_cpus, cs->effective_cpus); + mems_updated = !nodes_equal(new_mems, cs->effective_mems); + +- if (cgroup_subsys_on_dfl(cpuset_cgrp_subsys)) ++ if (is_in_v2_mode()) + hotplug_update_tasks(cs, &new_cpus, &new_mems, + cpus_updated, mems_updated); + else +@@ -2281,7 +2288,7 @@ static void cpuset_hotplug_workfn(struct work_struct *work) + static cpumask_t new_cpus; + static nodemask_t new_mems; + bool cpus_updated, mems_updated; +- bool on_dfl = cgroup_subsys_on_dfl(cpuset_cgrp_subsys); ++ bool on_dfl = is_in_v2_mode(); + + mutex_lock(&cpuset_mutex); + +-- +2.11.0 + -- 2.39.2