Commit 46f5120c authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Tomasz Zawadzki
Browse files

test/vhost: fix cgroup path 



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

Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I238c1eae0e4708003726a721c445a0b62dc0cff7
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6425


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 6c0cebf1

test/vhost/perf_bench/vhost_perf.sh

+6 −8
Original line number Diff line number Diff line
@@ -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