mbox series

[v3,0/5] KVM: s390: selftests: Add regression tests for CPU subfunctions

Message ID 20240823130947.38323-1-hari55@linux.ibm.com
Headers show
Series KVM: s390: selftests: Add regression tests for CPU subfunctions | expand

Message

Hariharan Mari Aug. 23, 2024, 1:05 p.m. UTC 
This patch series introduces a set of regression tests for various s390x
CPU subfunctions in KVM. The tests ensure that the KVM implementation accurately
reflects the behavior of actual CPU instructions for these subfunctions.

The series adds tests for a total of 15 instructions across five patches,
covering a range of operations including sorting, compression, and various
cryptographic functions. Each patch follows a consistent testing pattern:

1. Obtain the KVM_S390_VM_CPU_MACHINE_SUBFUNC attribute for the VM.
2. Execute the relevant asm instructions.
3. Compare KVM-reported results with direct instruction execution results.

Testing has been performed on s390x hardware with KVM support. All tests
pass successfully, verifying the correct implementation of these
subfunctions in KVM.

---
v2: 
* Fix facility_bit type from bool to int
v3:
* Global variable in the header is moved to facility.c file in selftests/kvm/lib/s390x/
* Fixed the line length 
* Fixed single line comments and multiline comments 
* Renamed the PLO macro
* Removed the unnecessary type cast where Implicit type promotion applies
---

Hariharan Mari (5):
  KVM: s390: selftests: Add regression tests for SORTL and DFLTCC CPU
    subfunctions
  KVM: s390: selftests: Add regression tests for PRNO, KDSA and KMA
    crypto subfunctions
  KVM: s390: selftests: Add regression tests for KMCTR, KMF, KMO and PCC
    crypto subfunctions
  KVM: s390: selftests: Add regression tests for KMAC, KMC, KM, KIMD and
    KLMD crypto subfunctions
  KVM: s390: selftests: Add regression tests for PLO subfunctions

 tools/testing/selftests/kvm/Makefile          |   2 +
 .../selftests/kvm/include/s390x/facility.h    |  50 +++
 .../selftests/kvm/lib/s390x/facility.c        |  14 +
 .../kvm/s390x/cpumodel_subfuncs_test.c        | 286 ++++++++++++++++++
 4 files changed, 352 insertions(+)
 create mode 100644 tools/testing/selftests/kvm/include/s390x/facility.h
 create mode 100644 tools/testing/selftests/kvm/lib/s390x/facility.c
 create mode 100644 tools/testing/selftests/kvm/s390x/cpumodel_subfuncs_test.c

Comments

Christoph Schlameuss Aug. 23, 2024, 1:57 p.m. UTC | #1 
On Fri Aug 23, 2024 at 3:05 PM CEST, Hariharan Mari wrote:
> Extend the existing regression test framework for s390x CPU subfunctions
> to include tests for the Perform Locked Operation (PLO) subfunction
> functions.
>
> PLO was introduced in the very first 64-bit machine generation.
> Hence it is assumed PLO is always installed in the Z Arch.
> The test procedure follows the established pattern.
>
> Suggested-by: Janosch Frank <frankja@linux.ibm.com>
> Signed-off-by: Hariharan Mari <hari55@linux.ibm.com>
> Reviewed-by: Janosch Frank <frankja@linux.ibm.com>

LGTM

Reviewed-by: Christoph Schlameuss <schlameuss@linux.ibm.com>

> ---
>  .../kvm/s390x/cpumodel_subfuncs_test.c        | 32 +++++++++++++++++++
>  1 file changed, 32 insertions(+)
>
> diff --git a/tools/testing/selftests/kvm/s390x/cpumodel_subfuncs_test.c b/tools/testing/selftests/kvm/s390x/cpumodel_subfuncs_test.c
> index fe45fb131583..222ba1cc3cac 100644
> --- a/tools/testing/selftests/kvm/s390x/cpumodel_subfuncs_test.c
> +++ b/tools/testing/selftests/kvm/s390x/cpumodel_subfuncs_test.c
> @@ -19,6 +19,8 @@
>  
>  #include "kvm_util.h"
>  
> +#define PLO_FUNCTION_MAX 256
> +
>  /* Query available CPU subfunctions */
>  struct kvm_s390_vm_cpu_subfunc cpu_subfunc;
>  
> @@ -33,6 +35,31 @@ static void get_cpu_machine_subfuntions(struct kvm_vm *vm,
>  	TEST_ASSERT(!r, "Get cpu subfunctions failed r=%d errno=%d", r, errno);
>  }
>  
> +static inline int plo_test_bit(unsigned char nr)
> +{
> +	unsigned long function = nr | 0x100;
> +	int cc;
> +
> +	asm volatile("	lgr	0,%[function]\n"
> +			/* Parameter registers are ignored for "test bit" */
> +			"	plo	0,0,0,0(0)\n"
> +			"	ipm	%0\n"
> +			"	srl	%0,28\n"
> +			: "=d" (cc)
> +			: [function] "d" (function)
> +			: "cc", "0");
> +	return cc == 0;
> +}
> +
> +/* Testing Perform Locked Operation (PLO) CPU subfunction's ASM block */
> +static void test_plo_asm_block(u8 (*query)[32])
> +{
> +	for (int i = 0; i < PLO_FUNCTION_MAX; ++i) {
> +		if (plo_test_bit(i))
> +			(*query)[i >> 3] |= 0x80 >> (i & 7);
> +	}
> +}
> +
>  /* Testing Crypto Compute Message Authentication Code (KMAC) CPU subfunction's ASM block */
>  static void test_kmac_asm_block(u8 (*query)[16])
>  {
> @@ -196,6 +223,11 @@ struct testdef {
>  	testfunc_t test;
>  	int facility_bit;
>  } testlist[] = {
> +	/*
> +	 * PLO was introduced in the very first 64-bit machine generation.
> +	 * Hence it is assumed PLO is always installed in Z Arch.
> +	 */
> +	{ "PLO", cpu_subfunc.plo, sizeof(cpu_subfunc.plo), test_plo_asm_block, 1 },
>  	/* MSA - Facility bit 17 */
>  	{ "KMAC", cpu_subfunc.kmac, sizeof(cpu_subfunc.kmac), test_kmac_asm_block, 17 },
>  	{ "KMC", cpu_subfunc.kmc, sizeof(cpu_subfunc.kmc), test_kmc_asm_block, 17 },
Christoph Schlameuss Aug. 23, 2024, 2:47 p.m. UTC | #2 
On Fri Aug 23, 2024 at 3:05 PM CEST, Hariharan Mari wrote:
> Introduce new regression tests to verify the ASM inline block in the SORTL
> and DFLTCC CPU subfunctions for the s390x architecture. These tests ensure
> that future changes to the ASM code are properly validated.
>
> The test procedure:
>
> 1. Create a VM and request the KVM_S390_VM_CPU_MACHINE_SUBFUNC attribute
>    from the KVM_S390_VM_CPU_MODEL group for this VM. This SUBFUNC attribute
>    contains the results of all CPU subfunction instructions.
> 2. For each tested subfunction (SORTL and DFLTCC), execute the
>    corresponding ASM instruction and capture the result array.
> 3. Perform a memory comparison between the results stored in the SUBFUNC
>    attribute (obtained in step 1) and the ASM instruction results (obtained
>    in step 2) for each tested subfunction.
>
> This process ensures that the KVM implementation accurately reflects the
> behavior of the actual CPU instructions for the tested subfunctions.
>
> Suggested-by: Janosch Frank <frankja@linux.ibm.com>
> Signed-off-by: Hariharan Mari <hari55@linux.ibm.com>
> Reviewed-by: Janosch Frank <frankja@linux.ibm.com>

LGTM

Reviewed-by: Christoph Schlameuss <schlameuss@linux.ibm.com>

> ---
>  tools/testing/selftests/kvm/Makefile          |   2 +
>  .../selftests/kvm/include/s390x/facility.h    |  50 +++++++++
>  .../selftests/kvm/lib/s390x/facility.c        |  14 +++
>  .../kvm/s390x/cpumodel_subfuncs_test.c        | 105 ++++++++++++++++++
>  4 files changed, 171 insertions(+)
>  create mode 100644 tools/testing/selftests/kvm/include/s390x/facility.h
>  create mode 100644 tools/testing/selftests/kvm/lib/s390x/facility.c
>  create mode 100644 tools/testing/selftests/kvm/s390x/cpumodel_subfuncs_test.c

[...]
Janosch Frank Sept. 24, 2024, 12:07 p.m. UTC | #3 
On 8/23/24 3:05 PM, Hariharan Mari wrote:
> This patch series introduces a set of regression tests for various s390x
> CPU subfunctions in KVM. The tests ensure that the KVM implementation accurately
> reflects the behavior of actual CPU instructions for these subfunctions.
> 
> The series adds tests for a total of 15 instructions across five patches,
> covering a range of operations including sorting, compression, and various
> cryptographic functions. Each patch follows a consistent testing pattern:
> 
> 1. Obtain the KVM_S390_VM_CPU_MACHINE_SUBFUNC attribute for the VM.
> 2. Execute the relevant asm instructions.
> 3. Compare KVM-reported results with direct instruction execution results.
> 
> Testing has been performed on s390x hardware with KVM support. All tests
> pass successfully, verifying the correct implementation of these
> subfunctions in KVM.

I've picked this up but seem to have missed adding it to 6.12 since I 
have a lot going on.

It will be in 6.13 though.