From 46f5120c565b4a1524d6fbfc7d5433586145bb4c Mon Sep 17 00:00:00 2001 From: Maciej Wawryk Date: Tue, 16 Feb 2021 11:02:56 +0100 Subject: [PATCH] test/vhost: fix cgroup path new fedora33 is using cgroup-v2 and old path in script give us error Permission denied Signed-off-by: Maciej Wawryk Change-Id: I238c1eae0e4708003726a721c445a0b62dc0cff7 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6425 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Karol Latecki Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris --- test/vhost/perf_bench/vhost_perf.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/test/vhost/perf_bench/vhost_perf.sh b/test/vhost/perf_bench/vhost_perf.sh index 47eacc1a7..e1ad195ae 100755 --- a/test/vhost/perf_bench/vhost_perf.sh +++ b/test/vhost/perf_bench/vhost_perf.sh @@ -364,18 +364,20 @@ vm_run $used_vms vm_wait_for_boot 300 $used_vms if [[ -n "$kernel_cpus" ]]; then - mkdir -p /sys/fs/cgroup/cpuset/spdk + echo "+cpuset" > /sys/fs/cgroup/cgroup.subtree_control + mkdir -p /sys/fs/cgroup/spdk kernel_mask=$vhost_0_reactor_mask kernel_mask=${kernel_mask#"["} kernel_mask=${kernel_mask%"]"} - echo "$kernel_mask" >> /sys/fs/cgroup/cpuset/spdk/cpuset.cpus - echo "0-1" >> /sys/fs/cgroup/cpuset/spdk/cpuset.mems + echo "threaded" > /sys/fs/cgroup/spdk/cgroup.type + echo "$kernel_mask" > /sys/fs/cgroup/spdk/cpuset.cpus + echo "0-1" > /sys/fs/cgroup/spdk/cpuset.mems kernel_vhost_pids=$(pgrep "vhost" -U root) for kpid in $kernel_vhost_pids; do echo "Limiting kernel vhost pid ${kpid}" - echo "${kpid}" >> /sys/fs/cgroup/cpuset/spdk/tasks + echo "${kpid}" > /sys/fs/cgroup/spdk/cgroup.threads done fi @@ -478,7 +480,3 @@ else fi vhost_kill "${vhost_num}" fi - -if [[ -n "$kernel_cpus" ]]; then - rmdir /sys/fs/cgroup/cpuset/spdk -fi