Commit 623709b5 authored by Karol Latecki's avatar Karol Latecki Committed by Konrad Sztyber
Browse files

test/nvmf/digest: use DSA for both connection ends 



Run digest tests again if DSA acceleration flag is set,
but enable acceleration on Target side instead of Host.

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


Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 78cb0e19

test/common/skipped_tests.txt

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ vmd_perf 
# Waiting for CI tests on the platform equipped DSA and IAA accelerators

accel_scan_dsa_modules

accel_scan_iaa_modules

nvmf_digest_dsa_initiator

nvmf_digest_dsa_target



# nightly tests

bdev_fio_rw_verify_ext

test/nvmf/host/digest.sh

+21 −10
Original line number Diff line number Diff line
@@ -74,15 +74,16 @@ run_bperf_err() { 
}



run_bperf() {

	local rw bs qd

	local rw bs qd scan_dsa

	local acc_module acc_executed exp_module



	rw=$1 bs=$2 qd=$3

	rw=$1 bs=$2 qd=$3 scan_dsa=$4



	"$rootdir/build/examples/bdevperf" -m 2 -r "$bperfsock" -w $rw -o $bs -t $runtime -q $qd -z --wait-for-rpc &

	bperfpid=$!

	waitforlisten "$bperfpid" "$bperfsock"



	[[ $SPDK_TEST_ACCEL_DSA -eq 1 ]] && bperf_rpc dsa_scan_accel_module

	$scan_dsa && bperf_rpc dsa_scan_accel_module

	bperf_rpc framework_start_init



	bperf_rpc bdev_nvme_attach_controller --ddgst -t tcp -a "$NVMF_FIRST_TARGET_IP" \
@@ -90,7 +91,7 @@ run_bperf() { 


	bperf_py "perform_tests"

	read -r acc_module acc_executed < <(get_accel_stats)

	[[ $SPDK_TEST_ACCEL_DSA -eq 1 ]] && exp_module="dsa" || exp_module="software"

	$scan_dsa && exp_module="dsa" || exp_module="software"

	((acc_executed > 0))

	[[ "$acc_module" == "$exp_module" ]]
@@ -116,13 +117,18 @@ run_digest_error() { 
}



run_digest() {

	nvmfappstart --wait-for-rpc

	local dsa_initiator

	[[ "$1" == "dsa_initiator" ]] && dsa_initiator=true || dsa_initiator=false



	tgt_params=("--wait-for-rpc")

	nvmfappstart "${tgt_params[@]}"

	[[ "$1" == "dsa_target" ]] && rpc_cmd dsa_scan_accel_module

	common_target_config



	run_bperf randread 4096 128

	run_bperf randread $((128 * 1024)) 16

	run_bperf randwrite 4096 128

	run_bperf randwrite $((128 * 1024)) 16

	run_bperf randread 4096 128 $dsa_initiator

	run_bperf randread $((128 * 1024)) 16 $dsa_initiator

	run_bperf randwrite 4096 128 $dsa_initiator

	run_bperf randwrite $((128 * 1024)) 16 $dsa_initiator

	killprocess $nvmfpid

}
@@ -132,7 +138,12 @@ run_digest() { 
nvmftestinit



trap cleanup SIGINT SIGTERM EXIT

if [[ $SPDK_TEST_ACCEL_DSA -eq 1 ]]; then

	run_test "nvmf_digest_dsa_initiator" run_digest dsa_initiator

	run_test "nvmf_digest_dsa_target" run_digest dsa_target

else

	run_test "nvmf_digest_clean" run_digest

fi

run_test "nvmf_digest_error" run_digest_error



trap - SIGINT SIGTERM EXIT