diff mbox series

[NDCTL,v5,4/4] ndctl: add test for qos_class in CXL test suite

Message ID 20240201230646.1328211-5-dave.jiang@intel.com (mailing list archive)
State Superseded
Headers show
Series [NDCTL,v5,1/4] ndctl: cxl: Add QoS class retrieval for the root decoder | expand

Commit Message

Dave Jiang Feb. 1, 2024, 11:05 p.m. UTC 
Add tests in cxl-qos-class.sh to verify qos_class are set with the fake
qos_class create by the kernel.  Root decoders should have qos_class
attribute set. Memory devices should have ram_qos_class or pmem_qos_class
set depending on which partitions are valid.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---
v5:
- Split out from cxl-topology.sh (Vishal)
---
 test/common           |  4 +++
 test/cxl-qos-class.sh | 65 +++++++++++++++++++++++++++++++++++++++++++
 test/meson.build      |  2 ++
 3 files changed, 71 insertions(+)
 create mode 100755 test/cxl-qos-class.sh

Comments

Alison Schofield Feb. 2, 2024, 4:17 p.m. UTC | #1 
On Thu, Feb 01, 2024 at 04:05:07PM -0700, Dave Jiang wrote:
> Add tests in cxl-qos-class.sh to verify qos_class are set with the fake
> qos_class create by the kernel.  Root decoders should have qos_class
> attribute set. Memory devices should have ram_qos_class or pmem_qos_class
> set depending on which partitions are valid.
> 
> Signed-off-by: Dave Jiang <dave.jiang@intel.com>
> ---
> v5:
> - Split out from cxl-topology.sh (Vishal)
> ---
>  test/common           |  4 +++
>  test/cxl-qos-class.sh | 65 +++++++++++++++++++++++++++++++++++++++++++
>  test/meson.build      |  2 ++
>  3 files changed, 71 insertions(+)
>  create mode 100755 test/cxl-qos-class.sh
> 
> diff --git a/test/common b/test/common
> index f1023ef20f7e..5694820c7adc 100644
> --- a/test/common
> +++ b/test/common
> @@ -150,3 +150,7 @@ check_dmesg()
>  	grep -q "Call Trace" <<< $log && err $1
>  	true
>  }
> +
> +
> +# CXL COMMON
> +TEST_QOS_CLASS=42
> diff --git a/test/cxl-qos-class.sh b/test/cxl-qos-class.sh
> new file mode 100755
> index 000000000000..365a7df9c1e4
> --- /dev/null
> +++ b/test/cxl-qos-class.sh
> @@ -0,0 +1,65 @@
> +#!/bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (C) 2024 Intel Corporation. All rights reserved.
> +
> +check_qos_decoders () {
> +	# check root decoders have expected fake qos_class
> +	# also make sure the number of root decoders equal to the number
> +	# with qos_class found
> +	json=$($CXL list -b cxl_test -D -d root)
> +	decoders=$(echo "$json" | jq length)
> +	count=0
> +	while read -r qos_class
> +	do
> +		((qos_class == TEST_QOS_CLASS)) || err "$LINENO"
> +		count=$((count+1))
> +	done <<< "$(echo "$json" | jq -r '.[] | .qos_class')"
> +
> +	((count == decoders)) || err "$LINENO";
> +}
> +
> +check_qos_memdevs () {
> +	# Check that memdevs that expose ram_qos_class or pmem_qos_class have
> +	# expected fake value programmed.
> +	json=$(cxl list -b cxl_test -M)
> +	readarray -t lines < <(jq ".[] | .ram_size, .pmem_size, .ram_qos_class, .pmem_qos_class" <<<"$json")
> +	for (( i = 0; i < ${#lines[@]}; i += 4 ))
> +	do
> +		ram_size=${lines[i]}
> +		pmem_size=${lines[i+1]}
> +		ram_qos_class=${lines[i+2]}
> +		pmem_qos_class=${lines[i+3]}
> +
> +		if [[ "$ram_size" != null ]]
> +		then
> +			((ram_qos_class == TEST_QOS_CLASS)) || err "$LINENO"
> +		fi
> +		if [[ "$pmem_size" != null ]]
> +		then
> +			((pmem_qos_class == TEST_QOS_CLASS)) || err "$LINENO"
> +		fi
> +	done
> +}
> +
> +
> +. $(dirname $0)/common
> +
> +rc=77
> +
> +set -ex
> +
> +trap 'err $LINENO' ERR
> +
> +check_prereq "jq"
> +
> +modprobe -r cxl_test
> +modprobe cxl_test
> +rc=1

This different style, boiler plate not first in file, caught my eye.
Functionally no difference but stopped me for a second.

Reviewed-by: Alison Schofield <alison.schofield@intel.com>

> +
> +check_qos_decoders
> +
> +check_qos_memdevs
> +
> +check_dmesg "$LINEO"
> +
> +modprobe -r cxl_test
> diff --git a/test/meson.build b/test/meson.build
> index 5eb35749a95b..4892df11119f 100644
> --- a/test/meson.build
> +++ b/test/meson.build
> @@ -160,6 +160,7 @@ cxl_events = find_program('cxl-events.sh')
>  cxl_poison = find_program('cxl-poison.sh')
>  cxl_sanitize = find_program('cxl-sanitize.sh')
>  cxl_destroy_region = find_program('cxl-destroy-region.sh')
> +cxl_qos_class = find_program('cxl-qos-class.sh')
>  
>  tests = [
>    [ 'libndctl',               libndctl,		  'ndctl' ],
> @@ -192,6 +193,7 @@ tests = [
>    [ 'cxl-poison.sh',          cxl_poison,         'cxl'   ],
>    [ 'cxl-sanitize.sh',        cxl_sanitize,       'cxl'   ],
>    [ 'cxl-destroy-region.sh',  cxl_destroy_region, 'cxl'   ],
> +  [ 'cxl-qos-class.sh',       cxl_qos_class,      'cxl'   ],
>  ]
>  
>  if get_option('destructive').enabled()
> -- 
> 2.43.0
> 
>
diff mbox series

Patch

diff --git a/test/common b/test/common
index f1023ef20f7e..5694820c7adc 100644
--- a/test/common
+++ b/test/common
@@ -150,3 +150,7 @@  check_dmesg()
 	grep -q "Call Trace" <<< $log && err $1
 	true
 }
+
+
+# CXL COMMON
+TEST_QOS_CLASS=42
diff --git a/test/cxl-qos-class.sh b/test/cxl-qos-class.sh
new file mode 100755
index 000000000000..365a7df9c1e4
--- /dev/null
+++ b/test/cxl-qos-class.sh
@@ -0,0 +1,65 @@ 
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2024 Intel Corporation. All rights reserved.
+
+check_qos_decoders () {
+	# check root decoders have expected fake qos_class
+	# also make sure the number of root decoders equal to the number
+	# with qos_class found
+	json=$($CXL list -b cxl_test -D -d root)
+	decoders=$(echo "$json" | jq length)
+	count=0
+	while read -r qos_class
+	do
+		((qos_class == TEST_QOS_CLASS)) || err "$LINENO"
+		count=$((count+1))
+	done <<< "$(echo "$json" | jq -r '.[] | .qos_class')"
+
+	((count == decoders)) || err "$LINENO";
+}
+
+check_qos_memdevs () {
+	# Check that memdevs that expose ram_qos_class or pmem_qos_class have
+	# expected fake value programmed.
+	json=$(cxl list -b cxl_test -M)
+	readarray -t lines < <(jq ".[] | .ram_size, .pmem_size, .ram_qos_class, .pmem_qos_class" <<<"$json")
+	for (( i = 0; i < ${#lines[@]}; i += 4 ))
+	do
+		ram_size=${lines[i]}
+		pmem_size=${lines[i+1]}
+		ram_qos_class=${lines[i+2]}
+		pmem_qos_class=${lines[i+3]}
+
+		if [[ "$ram_size" != null ]]
+		then
+			((ram_qos_class == TEST_QOS_CLASS)) || err "$LINENO"
+		fi
+		if [[ "$pmem_size" != null ]]
+		then
+			((pmem_qos_class == TEST_QOS_CLASS)) || err "$LINENO"
+		fi
+	done
+}
+
+
+. $(dirname $0)/common
+
+rc=77
+
+set -ex
+
+trap 'err $LINENO' ERR
+
+check_prereq "jq"
+
+modprobe -r cxl_test
+modprobe cxl_test
+rc=1
+
+check_qos_decoders
+
+check_qos_memdevs
+
+check_dmesg "$LINEO"
+
+modprobe -r cxl_test
diff --git a/test/meson.build b/test/meson.build
index 5eb35749a95b..4892df11119f 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -160,6 +160,7 @@  cxl_events = find_program('cxl-events.sh')
 cxl_poison = find_program('cxl-poison.sh')
 cxl_sanitize = find_program('cxl-sanitize.sh')
 cxl_destroy_region = find_program('cxl-destroy-region.sh')
+cxl_qos_class = find_program('cxl-qos-class.sh')
 
 tests = [
   [ 'libndctl',               libndctl,		  'ndctl' ],
@@ -192,6 +193,7 @@  tests = [
   [ 'cxl-poison.sh',          cxl_poison,         'cxl'   ],
   [ 'cxl-sanitize.sh',        cxl_sanitize,       'cxl'   ],
   [ 'cxl-destroy-region.sh',  cxl_destroy_region, 'cxl'   ],
+  [ 'cxl-qos-class.sh',       cxl_qos_class,      'cxl'   ],
 ]
 
 if get_option('destructive').enabled()