Commit 0773af99 authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

test/vhost_perf: detect cgroups version 



Detect which cgroups version is used to set IO
throttling in the guest system.

Change-Id: I4e7f482a8590dfe59da461cf5ef0a557b508fa98
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5981


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 288805a0

test/vhost/perf_bench/vhost_perf.sh

+15 −2
Original line number Diff line number Diff line
@@ -395,10 +395,23 @@ for vm_num in $used_vms; do 
	fi



	if [[ -n "$vm_throttle" ]]; then

		# Check whether cgroups or cgroupsv2 is used on guest system

		# Simple, naive & quick approach as it should do the trick for simple

		# VMs used for performance tests

		c_gr_ver=2

		if vm_exec "$vm_num" "grep '^cgroup ' /proc/mounts"; then

			c_gr_ver=1

		fi

		block=$(printf '%s' $SCSI_DISK)

		major_minor=$(vm_exec "$vm_num" "cat /sys/block/$block/dev")



		if [[ $c_gr_ver == 1 ]]; then

			vm_exec "$vm_num" "echo \"$major_minor $vm_throttle\" > /sys/fs/cgroup/blkio/blkio.throttle.read_iops_device"

			vm_exec "$vm_num" "echo \"$major_minor $vm_throttle\" > /sys/fs/cgroup/blkio/blkio.throttle.write_iops_device"

		elif [[ $c_gr_ver == 2 ]]; then

			vm_exec "$vm_num" "echo '+io' > /sys/fs/cgroup/cgroup.subtree_control"

			vm_exec "$vm_num" "echo \"$major_minor riops=$vm_throttle wiops=$vm_throttle\" > /sys/fs/cgroup/user.slice/io.max"

		fi

	fi



	fio_disks+=" --vm=${vm_num}$(printf ':/dev/%s' $SCSI_DISK)"