ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/vhost: fix cgroup path

Browse Source 
new fedora33 is using cgroup-v2 and old path in script give us error Permission denied

Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I238c1eae0e4708003726a721c445a0b62dc0cff7
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6425
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Maciej Wawryk 2021-02-16 11:02:56 +01:00 committed by Tomasz Zawadzki
parent 6c0cebf1c9
commit 46f5120c56
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/vhost/perf_bench/vhost_perf.sh
View File

@ -364,18 +364,20 @@ vm_run $used_vms
vm_wait_for_boot 300 $used_vms vm_wait_for_boot 300 $used_vms
if [[ -n "$kernel_cpus" ]]; then 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=$vhost_0_reactor_mask
kernel_mask=${kernel_mask#"["} kernel_mask=${kernel_mask#"["}
kernel_mask=${kernel_mask%"]"} kernel_mask=${kernel_mask%"]"}
echo "$kernel_mask" >> /sys/fs/cgroup/cpuset/spdk/cpuset.cpus echo "threaded" > /sys/fs/cgroup/spdk/cgroup.type
echo "0-1" >> /sys/fs/cgroup/cpuset/spdk/cpuset.mems 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) kernel_vhost_pids=$(pgrep "vhost" -U root)
for kpid in $kernel_vhost_pids; do for kpid in $kernel_vhost_pids; do
echo "Limiting kernel vhost pid ${kpid}" echo "Limiting kernel vhost pid ${kpid}"
echo "${kpid}" >> /sys/fs/cgroup/cpuset/spdk/tasks echo "${kpid}" > /sys/fs/cgroup/spdk/cgroup.threads
done done
fi fi
@ -478,7 +480,3 @@ else
fi fi
vhost_kill "${vhost_num}" vhost_kill "${vhost_num}"
fi fi
if [[ -n "$kernel_cpus" ]]; then
rmdir /sys/fs/cgroup/cpuset/spdk
fi