From patchwork Wed Jan 10 22:51:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 13516646 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 58EE64EB55 for ; Wed, 10 Jan 2024 22:52:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Pvj0Samd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1704927125; x=1736463125; h=from:date:subject:mime-version:content-transfer-encoding: message-id:to:cc; bh=7eNi4ita6qhMkZWaq4C5Pm4vhV16KTsgKYOX0Z5VSnY=; b=Pvj0SamdeFemOgLKnlZUWmljXWdqThQDSy+ycD15zV3NlwQCggcCHQJC uNB75tDSCWAF311udJkBtFMPNtz6d0zObN9pO1FQy+G9Ru4ZTrzgHQAw6 l+9tq0yU9Wm0K6Y9o52aXILLQi3vmd+YLwhV45SB4uRFdg9mnzlEIYhPt 2k0Y2hCSpbEQtsRhUH8+QLZh+D2qwH6l5drz1uv1MTbD0xg8rlvhH8/oW Cb4/eHnB8QPgRWS70OWsnHFtj2bk8gtobdQdYGa7oW5+dMXv92YmrhP4N thzG+xDjFPQ0tSNRwjKL+HZWyQUwYUafe0E4BiWr3oOzCyPDS373Ym+g3 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10949"; a="6038220" X-IronPort-AV: E=Sophos;i="6.04,184,1695711600"; d="scan'208";a="6038220" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2024 14:52:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10949"; a="905718684" X-IronPort-AV: E=Sophos;i="6.04,184,1695711600"; d="scan'208";a="905718684" Received: from vverma7-desk1.amr.corp.intel.com (HELO [192.168.1.200]) ([10.209.156.82]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2024 14:52:03 -0800 From: Vishal Verma Date: Wed, 10 Jan 2024 15:51:59 -0700 Subject: [PATCH ndctl] test/daxctl-create.sh: remove region and dax device assumptions Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240110-vv-daxctl-create-v1-1-01f5d58afcd8@intel.com> X-B4-Tracking: v=1; b=H4sIAI4fn2UC/x3MQQqAIBBA0avErBtQCcuuEi1EpxqICg0RxLsnL d/i/wKRAlOEuSsQKHHk+2qQfQfusNdOyL4ZlFCDkFJgSuhtdu+JLpB9CZ22I0kjJmU0tOwJtHH +l8ta6we7KgaqYgAAAA== To: linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev Cc: Dan Williams , Joao Martins , Vishal Verma X-Mailer: b4 0.13-dev-433a8 X-Developer-Signature: v=1; a=openpgp-sha256; l=7953; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=7eNi4ita6qhMkZWaq4C5Pm4vhV16KTsgKYOX0Z5VSnY=; b=owGbwMvMwCXGf25diOft7jLG02pJDKnz5Sf86pppM8N/t+75FZnqm/Sqe09or7yndZ7pnafQF IY3PgsYO0pZGMS4GGTFFFn+7vnIeExuez5PYIIjzBxWJpAhDFycAjCRi1EM/7PWbTQSWXI9aKss R4luzt5Yjr/s6zn4jjV2aC0/cEP79kdGhp9NB/O2BQa1PzRTcE/6cn51/5sPO1j9Vs1M4tLStj4 lxQ8A X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF The daxctl-create.sh test had some hard-coded assumptions about what dax device it expects to find, and what region number it will be under. This usually worked when the unit test environment only had efi_fake_mem devices as the sources of hmem memory. With CXL however, the region numbering namespace is shared with CXL regions, often pushing the efi_fake_mem region to something other than 'region0'. Remove any region and device number assumptions from this test so it works regardless of how regions get enumerated. Cc: Joao Martins Cc: Dan Williams Signed-off-by: Vishal Verma --- test/daxctl-create.sh | 62 +++++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 27 deletions(-) --- base-commit: 14b4c6f9116b1c7a32e0e83d7b201b78de3fa02f change-id: 20240110-vv-daxctl-create-c6a7e1908296 Best regards, diff --git a/test/daxctl-create.sh b/test/daxctl-create.sh index d319a39..a5df6f2 100755 --- a/test/daxctl-create.sh +++ b/test/daxctl-create.sh @@ -29,14 +29,20 @@ find_testdev() fi # find a victim region provided by dax_hmem - testpath=$("$DAXCTL" list -r 0 | jq -er '.[0].path | .//""') + region_json="$("$DAXCTL" list -R)" + testpath=$(jq -er '.[0].path | .//""' <<< "$region_json") if [[ ! "$testpath" == *"hmem"* ]]; then printf "Unable to find a victim region\n" exit "$rc" fi + region_id=$(jq -er '.[0].id | .//""' <<< "$region_json") + if [[ ! "$region_id" ]]; then + printf "Unable to determine victim region id\n" + exit "$rc" + fi # find a victim device - testdev=$("$DAXCTL" list -D -r 0 | jq -er '.[0].chardev | .//""') + testdev=$("$DAXCTL" list -D -r "$region_id" | jq -er '.[0].chardev | .//""') if [[ ! $testdev ]]; then printf "Unable to find a victim device\n" exit "$rc" @@ -56,9 +62,10 @@ setup_dev() exit "$rc" fi + "$DAXCTL" reconfigure-device -m devdax -f "$testdev" "$DAXCTL" disable-device "$testdev" "$DAXCTL" reconfigure-device -s 0 "$testdev" - available=$("$DAXCTL" list -r 0 | jq -er '.[0].available_size | .//""') + available=$("$DAXCTL" list -r "$region_id" | jq -er '.[0].available_size | .//""') } reset_dev() @@ -74,8 +81,8 @@ reset_dax() { test -n "$testdev" - "$DAXCTL" disable-device -r 0 all - "$DAXCTL" destroy-device -r 0 all + "$DAXCTL" disable-device -r "$region_id" all + "$DAXCTL" destroy-device -r "$region_id" all "$DAXCTL" reconfigure-device -s "$available" "$testdev" } @@ -90,7 +97,7 @@ test_pass() local rc=1 # Available size - _available_size=$("$DAXCTL" list -r 0 | jq -er '.[0].available_size | .//""') + _available_size=$("$DAXCTL" list -r "$region_id" | jq -er '.[0].available_size | .//""') if [[ ! $_available_size == "$available" ]]; then echo "Unexpected available size $_available_size != $available" exit "$rc" @@ -101,7 +108,7 @@ fail_if_available() { local rc=1 - _size=$("$DAXCTL" list -r 0 | jq -er '.[0].available_size | .//""') + _size=$("$DAXCTL" list -r "$region_id" | jq -er '.[0].available_size | .//""') if [[ $_size ]]; then echo "Unexpected available size $_size" exit "$rc" @@ -170,30 +177,31 @@ daxctl_test_multi() "$DAXCTL" reconfigure-device -s $size "$testdev" fi - daxdev_1=$("$DAXCTL" create-device -r 0 -s $size | jq -er '.[].chardev') + daxdev_1=$("$DAXCTL" create-device -r "$region_id" -s $size | jq -er '.[].chardev') test -n "$daxdev_1" - daxdev_2=$("$DAXCTL" create-device -r 0 -s $size | jq -er '.[].chardev') + daxdev_2=$("$DAXCTL" create-device -r "$region_id" -s $size | jq -er '.[].chardev') test -n "$daxdev_2" if [[ ! $2 ]]; then - daxdev_3=$("$DAXCTL" create-device -r 0 -s $size | jq -er '.[].chardev') + daxdev_3=$("$DAXCTL" create-device -r "$region_id" -s $size | jq -er '.[].chardev') test -n "$daxdev_3" fi # Hole - "$DAXCTL" disable-device "$1" && "$DAXCTL" destroy-device "$1" + "$DAXCTL" disable-device "$1" + "$DAXCTL" destroy-device "$1" # Pick space in the created hole and at the end new_size=$((size * 2)) - daxdev_4=$("$DAXCTL" create-device -r 0 -s "$new_size" | jq -er '.[].chardev') + daxdev_4=$("$DAXCTL" create-device -r "$region_id" -s "$new_size" | jq -er '.[].chardev') test -n "$daxdev_4" test "$(daxctl_get_nr_mappings "$daxdev_4")" -eq 2 fail_if_available - "$DAXCTL" disable-device -r 0 all - "$DAXCTL" destroy-device -r 0 all + "$DAXCTL" disable-device -r "$region_id" all + "$DAXCTL" destroy-device -r "$region_id" all } daxctl_test_multi_reconfig() @@ -210,7 +218,7 @@ daxctl_test_multi_reconfig() "$DAXCTL" reconfigure-device -s $size "$testdev" "$DAXCTL" disable-device "$testdev" - daxdev_1=$("$DAXCTL" create-device -r 0 -s $size | jq -er '.[].chardev') + daxdev_1=$("$DAXCTL" create-device -r "$region_id" -s $size | jq -er '.[].chardev') "$DAXCTL" disable-device "$daxdev_1" start=$((size + size)) @@ -249,16 +257,16 @@ daxctl_test_adjust() start=$((size + size)) for i in $(seq 1 1 $ncfgs) do - daxdev=$("$DAXCTL" create-device -r 0 -s "$size" | jq -er '.[].chardev') + daxdev=$("$DAXCTL" create-device -r "$region_id" -s "$size" | jq -er '.[].chardev') test "$(daxctl_get_nr_mappings "$daxdev")" -eq 1 done - daxdev=$(daxctl_get_dev "dax0.1") + daxdev=$(daxctl_get_dev "dax$region_id.1") "$DAXCTL" disable-device "$daxdev" && "$DAXCTL" destroy-device "$daxdev" - daxdev=$(daxctl_get_dev "dax0.4") + daxdev=$(daxctl_get_dev "dax$region_id.4") "$DAXCTL" disable-device "$daxdev" && "$DAXCTL" destroy-device "$daxdev" - daxdev=$(daxctl_get_dev "dax0.2") + daxdev=$(daxctl_get_dev "dax$region_id.2") "$DAXCTL" disable-device "$daxdev" "$DAXCTL" reconfigure-device -s $((size * 2)) "$daxdev" # Allocates space at the beginning: expect two mappings as @@ -266,7 +274,7 @@ daxctl_test_adjust() # preserve the relative page_offset of existing allocations test "$(daxctl_get_nr_mappings "$daxdev")" -eq 2 - daxdev=$(daxctl_get_dev "dax0.3") + daxdev=$(daxctl_get_dev "dax$region_id.3") "$DAXCTL" disable-device "$daxdev" "$DAXCTL" reconfigure-device -s $((size * 2)) "$daxdev" # Adjusts space at the end, expect one mapping because we are @@ -275,9 +283,9 @@ daxctl_test_adjust() fail_if_available - daxdev=$(daxctl_get_dev "dax0.3") + daxdev=$(daxctl_get_dev "dax$region_id.3") "$DAXCTL" disable-device "$daxdev" && "$DAXCTL" destroy-device "$daxdev" - daxdev=$(daxctl_get_dev "dax0.2") + daxdev=$(daxctl_get_dev "dax$region_id.2") "$DAXCTL" disable-device "$daxdev" && "$DAXCTL" destroy-device "$daxdev" } @@ -295,7 +303,7 @@ daxctl_test1() { local daxdev - daxdev=$("$DAXCTL" create-device -r 0 | jq -er '.[].chardev') + daxdev=$("$DAXCTL" create-device -r "$region_id" | jq -er '.[].chardev') test -n "$daxdev" test "$(daxctl_get_nr_mappings "$daxdev")" -eq 1 @@ -312,17 +320,17 @@ daxctl_test1() # having the region device reconfigured with some of the memory. daxctl_test2() { - daxctl_test_multi "dax0.1" 1 + daxctl_test_multi "$region_id.1" 1 clear_dev test_pass } # Test 3: space at the beginning and at the end # Successfully pick space in the beginning and space at the end, by -# having the region device emptied (so region beginning starts with dax0.1). +# having the region device emptied (so region beginning starts with daxX.1). daxctl_test3() { - daxctl_test_multi "dax0.1" + daxctl_test_multi "$region_id.1" clear_dev test_pass } @@ -366,7 +374,7 @@ daxctl_test6() size=$align fi - daxdev=$("$DAXCTL" create-device -r 0 -s $size -a $align | jq -er '.[].chardev') + daxdev=$("$DAXCTL" create-device -r "$region_id" -s $size -a $align | jq -er '.[].chardev') test -n "$daxdev"