OSDN Git Service

cgroup: kselftest: relax fs_spec checks
authorChris Down <chris@chrisdown.name>
Sat, 3 Aug 2019 04:49:15 +0000 (21:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Aug 2019 14:02:01 +0000 (07:02 -0700)
commitb59b1baab789eacdde809135542e3d4f256f6878
tree314ef0fa61ca3814e011a0c33792b92bc945c409
parentaa4996b3af19f8535177ba21cb7241348a34fb94
cgroup: kselftest: relax fs_spec checks

On my laptop most memcg kselftests were being skipped because it claimed
cgroup v2 hierarchy wasn't mounted, but this isn't correct.  Instead, it
seems current systemd HEAD mounts it with the name "cgroup2" instead of
"cgroup":

    % grep cgroup /proc/mounts
    cgroup2 /sys/fs/cgroup cgroup2 rw,nosuid,nodev,noexec,relatime,nsdelegate 0 0

I can't think of a reason to need to check fs_spec explicitly
since it's arbitrary, so we can just rely on fs_vfstype.

After these changes, `make TARGETS=cgroup kselftest` actually runs the
cgroup v2 tests in more cases.

Link: http://lkml.kernel.org/r/20190723210737.GA487@chrisdown.name
Signed-off-by: Chris Down <chris@chrisdown.name>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Roman Gushchin <guro@fb.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
tools/testing/selftests/cgroup/cgroup_util.c