Revert "init: Mount cpuset in v2 mode if possible"
This reverts commit 0614530defbccd7b048aa53c9c704c84641fd94e.
Reason for revert: This is a possible cause of b/153026763.
Original change's description:
> init: Mount cpuset in v2 mode if possible
>
> On systems with cpuset_v2_mode, we should use it to get cgroup v2 cpuset
> behavior in cgroup v1 so that the kernel does not need cpuset hotplug
> fixes to v1 and makes backporting efforts much less of ancient kernel
> patches (both in terms of forgetting to backport, and backporting
> incorrectly).
>
> The difference between v1 vs v2 is:
> 1. Offlining all cpus in a set don't migrate tasks in v1.
> 2. Offlining and onlining cpus restores CPUs in v2.
> 3. Differences in behavior of having child be subset of parent's CPUs.
>
> For ChromeOS, we want the behavior in #2. #1 and #3. don't effect us. We
> can make v1 cpusets behave like v2 with the cpuset_v2_mode mount option
> which fixes the hotplug issue.
>
> BUG=b:152062524
> TEST=Boot with both types of systems and verify cpuset mount.
>
> Change-Id: I5ace34766c7d117051f069ed6a01ff5f2b180dea
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2122436
> Tested-by: Joel Fernandes <joelaf@google.com>
> Tested-by: Sonny Rao <sonnyrao@chromium.org>
> Auto-Submit: Joel Fernandes <joelaf@google.com>
> Reviewed-by: Mike Frysinger <vapier@chromium.org>
> Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
> Commit-Queue: Sonny Rao <sonnyrao@chromium.org>
Bug: b:152062524
Bug: b:153026763
Change-Id: Ic959d9e71fb432eaf2b2264e5669b29ef8e8d0db
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2133509
Commit-Queue: Sonny Rao <sonnyrao@chromium.org>
Tested-by: Sonny Rao <sonnyrao@chromium.org>
Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Auto-Submit: Yoshiki Iguchi <yoshiki@chromium.org>
diff --git a/init/upstart/cgroups.conf b/init/upstart/cgroups.conf
index 690deea..21f3232 100644
--- a/init/upstart/cgroups.conf
+++ b/init/upstart/cgroups.conf
@@ -32,22 +32,8 @@
if [ "${subsys}" = "cpuset" ] && [ "${CPUSET_NOPREFIX}" = true ]; then
mount_opts="${mount_opts},noprefix"
fi
-
- # Mount cpuset cgroup controllers.
- if [ "${subsys}" = "cpuset" ]; then
- # First try v2 mode, avoids need for cpuset hotplug on kernel >= 4.14.
- if ! mount -t cgroup cgroup "/sys/fs/cgroup/${subsys}" \
- -o "${subsys},${mount_opts},cpuset_v2_mode"; then
- # If failed try regular cpuset, kernel < 4.14 needs hotplug fixes.
- mount -t "cgroup cgroup /sys/fs/cgroup/${subsys}" \
- -o "${subsys},${mount_opts}" || log "${subsys}"
- fi
- else
- # Mount non-cpuset cgroup controllers.
- mount -t cgroup cgroup "/sys/fs/cgroup/${subsys}" \
- -o "${subsys},${mount_opts}" || log "${subsys}"
- fi
-
+ mount -t cgroup cgroup /sys/fs/cgroup/${subsys} \
+ -o ${subsys},${mount_opts} || log ${subsys}
mkdir -p /sys/fs/cgroup/${subsys}/session_manager_containers
if id -u android-root 2>/dev/null; then
chown android-root:android-root \
