Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH v3] KVM: selftests: Add a test for the KVM_S390_MEM_OP
 ioctl
To:     Thomas Huth <thuth@redhat.com>, kvm@vger.kernel.org,
        Janosch Frank <frankja@linux.ibm.com>
Cc:     linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
        David Hildenbrand <david@redhat.com>,
        Cornelia Huck <cohuck@redhat.com>,
        =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>
References: <20190829130732.580-1-thuth@redhat.com>
From:   Christian Borntraeger <borntraeger@de.ibm.com>
Openpgp: preference=signencrypt
Autocrypt: addr=borntraeger@de.ibm.com; prefer-encrypt=mutual; keydata=
 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
 syiRa+UVlsKmx1hsEg==
Date:   Thu, 29 Aug 2019 15:44:37 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.8.0
MIME-Version: 1.0
In-Reply-To: <20190829130732.580-1-thuth@redhat.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Message-Id: <0cc74231-d01e-2b2c-5f6d-252f328e547d@de.ibm.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

thanks applied. 

On 29.08.19 15:07, Thomas Huth wrote:
> Check that we can write and read the guest memory with this s390x
> ioctl, and that some error cases are handled correctly.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  v3:
>  - Replaced wrong copy-n-pasted report string with a proper one
>  - Check for errno after calling the ioctl with size = 0
>  
>  tools/testing/selftests/kvm/Makefile      |   1 +
>  tools/testing/selftests/kvm/s390x/memop.c | 166 ++++++++++++++++++++++
>  2 files changed, 167 insertions(+)
>  create mode 100644 tools/testing/selftests/kvm/s390x/memop.c
> 
> diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
> index 1b48a94b4350..62c591f87dab 100644
> --- a/tools/testing/selftests/kvm/Makefile
> +++ b/tools/testing/selftests/kvm/Makefile
> @@ -32,6 +32,7 @@ TEST_GEN_PROGS_aarch64 += clear_dirty_log_test
>  TEST_GEN_PROGS_aarch64 += dirty_log_test
>  TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus
>  
> +TEST_GEN_PROGS_s390x = s390x/memop
>  TEST_GEN_PROGS_s390x += s390x/sync_regs_test
>  TEST_GEN_PROGS_s390x += dirty_log_test
>  TEST_GEN_PROGS_s390x += kvm_create_max_vcpus
> diff --git a/tools/testing/selftests/kvm/s390x/memop.c b/tools/testing/selftests/kvm/s390x/memop.c
> new file mode 100644
> index 000000000000..9edaa9a134ce
> --- /dev/null
> +++ b/tools/testing/selftests/kvm/s390x/memop.c
> @@ -0,0 +1,166 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Test for s390x KVM_S390_MEM_OP
> + *
> + * Copyright (C) 2019, Red Hat, Inc.
> + */
> +
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
> +#include <sys/ioctl.h>
> +
> +#include "test_util.h"
> +#include "kvm_util.h"
> +
> +#define VCPU_ID 1
> +
> +static uint8_t mem1[65536];
> +static uint8_t mem2[65536];
> +
> +static void guest_code(void)
> +{
> +	int i;
> +
> +	for (;;) {
> +		for (i = 0; i < sizeof(mem2); i++)
> +			mem2[i] = mem1[i];
> +		GUEST_SYNC(0);
> +	}
> +}
> +
> +int main(int argc, char *argv[])
> +{
> +	struct kvm_vm *vm;
> +	struct kvm_run *run;
> +	struct kvm_s390_mem_op ksmo;
> +	int rv, i, maxsize;
> +
> +	setbuf(stdout, NULL);	/* Tell stdout not to buffer its content */
> +
> +	maxsize = kvm_check_cap(KVM_CAP_S390_MEM_OP);
> +	if (!maxsize) {
> +		fprintf(stderr, "CAP_S390_MEM_OP not supported -> skip test\n");
> +		exit(KSFT_SKIP);
> +	}
> +	if (maxsize > sizeof(mem1))
> +		maxsize = sizeof(mem1);
> +
> +	/* Create VM */
> +	vm = vm_create_default(VCPU_ID, 0, guest_code);
> +	run = vcpu_state(vm, VCPU_ID);
> +
> +	for (i = 0; i < sizeof(mem1); i++)
> +		mem1[i] = i * i + i;
> +
> +	/* Set the first array */
> +	ksmo.gaddr = addr_gva2gpa(vm, (uintptr_t)mem1);
> +	ksmo.flags = 0;
> +	ksmo.size = maxsize;
> +	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
> +	ksmo.buf = (uintptr_t)mem1;
> +	ksmo.ar = 0;
> +	vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
> +
> +	/* Let the guest code copy the first array to the second */
> +	vcpu_run(vm, VCPU_ID);
> +	TEST_ASSERT(run->exit_reason == KVM_EXIT_S390_SIEIC,
> +		    "Unexpected exit reason: %u (%s)\n",
> +		    run->exit_reason,
> +		    exit_reason_str(run->exit_reason));
> +
> +	memset(mem2, 0xaa, sizeof(mem2));
> +
> +	/* Get the second array */
> +	ksmo.gaddr = (uintptr_t)mem2;
> +	ksmo.flags = 0;
> +	ksmo.size = maxsize;
> +	ksmo.op = KVM_S390_MEMOP_LOGICAL_READ;
> +	ksmo.buf = (uintptr_t)mem2;
> +	ksmo.ar = 0;
> +	vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
> +
> +	TEST_ASSERT(!memcmp(mem1, mem2, maxsize),
> +		    "Memory contents do not match!");
> +
> +	/* Check error conditions - first bad size: */
> +	ksmo.gaddr = (uintptr_t)mem1;
> +	ksmo.flags = 0;
> +	ksmo.size = -1;
> +	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
> +	ksmo.buf = (uintptr_t)mem1;
> +	ksmo.ar = 0;
> +	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
> +	TEST_ASSERT(rv == -1 && errno == E2BIG, "ioctl allows insane sizes");
> +
> +	/* Zero size: */
> +	ksmo.gaddr = (uintptr_t)mem1;
> +	ksmo.flags = 0;
> +	ksmo.size = 0;
> +	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
> +	ksmo.buf = (uintptr_t)mem1;
> +	ksmo.ar = 0;
> +	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
> +	TEST_ASSERT(rv == -1 && (errno == EINVAL || errno == ENOMEM),
> +		    "ioctl allows 0 as size");
> +
> +	/* Bad flags: */
> +	ksmo.gaddr = (uintptr_t)mem1;
> +	ksmo.flags = -1;
> +	ksmo.size = maxsize;
> +	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
> +	ksmo.buf = (uintptr_t)mem1;
> +	ksmo.ar = 0;
> +	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
> +	TEST_ASSERT(rv == -1 && errno == EINVAL, "ioctl allows all flags");
> +
> +	/* Bad operation: */
> +	ksmo.gaddr = (uintptr_t)mem1;
> +	ksmo.flags = 0;
> +	ksmo.size = maxsize;
> +	ksmo.op = -1;
> +	ksmo.buf = (uintptr_t)mem1;
> +	ksmo.ar = 0;
> +	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
> +	TEST_ASSERT(rv == -1 && errno == EINVAL, "ioctl allows bad operations");
> +
> +	/* Bad guest address: */
> +	ksmo.gaddr = ~0xfffUL;
> +	ksmo.flags = KVM_S390_MEMOP_F_CHECK_ONLY;
> +	ksmo.size = maxsize;
> +	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
> +	ksmo.buf = (uintptr_t)mem1;
> +	ksmo.ar = 0;
> +	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
> +	TEST_ASSERT(rv > 0, "ioctl does not report bad guest memory access");
> +
> +	/* Bad host address: */
> +	ksmo.gaddr = (uintptr_t)mem1;
> +	ksmo.flags = 0;
> +	ksmo.size = maxsize;
> +	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
> +	ksmo.buf = 0;
> +	ksmo.ar = 0;
> +	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
> +	TEST_ASSERT(rv == -1 && errno == EFAULT,
> +		    "ioctl does not report bad host memory address");
> +
> +	/* Bad access register: */
> +	run->psw_mask &= ~(3UL << (63 - 17));
> +	run->psw_mask |= 1UL << (63 - 17);  /* Enable AR mode */
> +	vcpu_run(vm, VCPU_ID);              /* To sync new state to SIE block */
> +	ksmo.gaddr = (uintptr_t)mem1;
> +	ksmo.flags = 0;
> +	ksmo.size = maxsize;
> +	ksmo.op = KVM_S390_MEMOP_LOGICAL_WRITE;
> +	ksmo.buf = (uintptr_t)mem1;
> +	ksmo.ar = 17;
> +	rv = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_MEM_OP, &ksmo);
> +	TEST_ASSERT(rv == -1 && errno == EINVAL, "ioctl allows ARs > 15");
> +	run->psw_mask &= ~(3UL << (63 - 17));   /* Disable AR mode */
> +	vcpu_run(vm, VCPU_ID);                  /* Run to sync new state */
> +
> +	kvm_vm_free(vm);
> +
> +	return 0;
> +}
>