Commit 9463523b authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/vhost: Limit kernel's vhost threads 



This is done in order to make sure kernel is running under a similar
environment as the SPDK's vhost during the tests.

Change-Id: I0d346c361848a6aa794d4797bbf7488bdec3cd78
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/19756


Reviewed-by: default avatarJim Harris <jim.harris@gmail.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent b78531c7

test/vhost/common.sh

+36 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ mkdir -p $TARGET_DIR 
# Source config describing QEMU and VHOST cores and NUMA

#

source $rootdir/test/vhost/common/autotest.config

source "$rootdir/test/scheduler/common.sh"



function vhosttestinit() {

	if [ "$TEST_MODE" == "iso" ]; then
@@ -1410,3 +1411,38 @@ function get_free_tcp_port() { 


	echo "$port"

}



function limit_vhost_kernel_threads() {

	local cpus=$1 nodes cpu _cpus=() _nodes=()

	local _pids=() pid cgroup pid



	xtrace_disable_per_cmd map_cpus



	_cpus=($(parse_cpu_list <(echo "$cpus")))



	for cpu in "${_cpus[@]}"; do

		_nodes+=("${cpu_node_map[cpu]}")

	done



	nodes=$(fold_array_onto_string "${_nodes[@]}")



	# vhost kernel threads are named as vhost-PID

	_pids=($(pgrep vhost))

	((${#_pids[@]} > 0)) || return 1



	# All threads should be located under the same initial cgroup. kthreadd does not put them

	# under root cgroup, but rather the cgroup of a session from which target/vhost was configured.

	# We create dedicated cgroup under the initial one to move all the threads only once instead of

	# having an extra step of moving them to the root cgroup first.

	set_cgroup_attr_top_bottom "${_pids[0]}" cgroup.subtree_control "+cpuset"



	cgroup=$(get_cgroup "${_pids[0]}")

	create_cgroup "$cgroup/vhost"



	set_cgroup_attr "$cgroup/vhost" cpuset.cpus "$cpus"

	set_cgroup_attr "$cgroup/vhost" cpuset.mems "$nodes"



	for pid in "${_pids[@]}"; do

		move_proc "$pid" "$cgroup/vhost" "$cgroup" cgroup.threads

	done

}

test/vhost/perf_bench/vhost_perf.sh

+4 −0
Original line number Diff line number Diff line
@@ -467,6 +467,10 @@ done 
# Gather perf stats only from the vhost cpus

perf_cpus=${vhost_reactor_mask//[\[\]]/}



if [[ $ctrl_type == "kernel_vhost" ]]; then

	limit_vhost_kernel_threads "$perf_cpus"

fi



# Run FIO traffic

for fio_job in ${fio_jobs//,/ }; do

	((enable_irq == 1)) && irqs $used_vms