Hey Greg, thanks for your review.

On 2/17/22 13:33, Greg KH wrote:

On Thu, Feb 17, 2022 at 06:37:15AM -0500, Steffen Eiden wrote:

...

This patch adds a new miscdevice to expose some Ultravisor functions to userspace. Userspace can send IOCTLis to the uvdevice that will then emit a corresponding Ultravisor Call and hands the result over to userspace. The uvdevice is available if the Ultravisor Call facility is present.

Userspace is now able to call the Query Ultravisor Information Ultravisor Command through the uvdevice.

Signed-off-by: Steffen Eiden seiden@linux.ibm.com

MAINTAINERS | 2 + arch/s390/include/uapi/asm/uvdevice.h | 27 +++++ drivers/s390/char/Kconfig | 9 ++ drivers/s390/char/Makefile | 1 + drivers/s390/char/uvdevice.c | 162 ++++++++++++++++++++++++++ 5 files changed, 201 insertions(+) create mode 100644 arch/s390/include/uapi/asm/uvdevice.h create mode 100644 drivers/s390/char/uvdevice.c

diff --git a/MAINTAINERS b/MAINTAINERS index 5250298d2817..c7d8d0fe48cf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10457,9 +10457,11 @@ F: Documentation/virt/kvm/s390* F: arch/s390/include/asm/gmap.h F: arch/s390/include/asm/kvm* F: arch/s390/include/uapi/asm/kvm* +F: arch/s390/include/uapi/asm/uvdevice.h F: arch/s390/kernel/uv.c F: arch/s390/kvm/ F: arch/s390/mm/gmap.c +F: drivers/s390/char/uvdevice.c F: tools/testing/selftests/kvm/*/s390x/ F: tools/testing/selftests/kvm/s390x/ diff --git a/arch/s390/include/uapi/asm/uvdevice.h b/arch/s390/include/uapi/asm/uvdevice.h new file mode 100644 index 000000000000..f2e4984a6e2e --- /dev/null +++ b/arch/s390/include/uapi/asm/uvdevice.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/*

• • Copyright IBM Corp. 2022
• • Author(s): Steffen Eiden seiden@linux.ibm.com
• */

+#ifndef __S390X_ASM_UVDEVICE_H +#define __S390X_ASM_UVDEVICE_H

+#include <linux/types.h>

+struct uvio_ioctl_cb {

• __u32 flags; /* Currently no flags defined, must be zero */
• __u16 uv_rc; /* UV header rc value */
• __u16 uv_rrc; /* UV header rrc value */
• __u64 argument_addr; /* Userspace address of uvio argument */
• __u32 argument_len;
• __u8 reserved14[0x40 - 0x14]; /* must be zero */

+};

+#define UVIO_QUI_MAX_LEN 0x8000

+#define UVIO_DEVICE_NAME "uv" +#define UVIO_TYPE_UVC 'u'

+#define UVIO_IOCTL_QUI _IOWR(UVIO_TYPE_UVC, 0x01, struct uvio_ioctl_cb)

+#endif /* __S390X_ASM_UVDEVICE_H */ diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig index 6cc4b19acf85..933c0d0062d6 100644 --- a/drivers/s390/char/Kconfig +++ b/drivers/s390/char/Kconfig @@ -184,3 +184,12 @@ config S390_VMUR depends on S390 help Character device driver for z/VM reader, puncher and printer.

+config UV_UAPI

• def_tristate m
• prompt "Ultravisor userspace API"
• depends on PROTECTED_VIRTUALIZATION_GUEST
• help

•  Selecting exposes parts of the UV interface to userspace
  

•  by providing a misc character device. Using IOCTLs one
  

•  can interact with the UV.
  

diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile index c6fdb81a068a..b5c83092210e 100644 --- a/drivers/s390/char/Makefile +++ b/drivers/s390/char/Makefile @@ -48,6 +48,7 @@ obj-$(CONFIG_MONREADER) += monreader.o obj-$(CONFIG_MONWRITER) += monwriter.o obj-$(CONFIG_S390_VMUR) += vmur.o obj-$(CONFIG_CRASH_DUMP) += sclp_sdias.o zcore.o +obj-$(CONFIG_UV_UAPI) += uvdevice.o hmcdrv-objs := hmcdrv_mod.o hmcdrv_dev.o hmcdrv_ftp.o hmcdrv_cache.o diag_ftp.o sclp_ftp.o obj-$(CONFIG_HMC_DRV) += hmcdrv.o diff --git a/drivers/s390/char/uvdevice.c b/drivers/s390/char/uvdevice.c new file mode 100644 index 000000000000..e8efcbf0e7ab --- /dev/null +++ b/drivers/s390/char/uvdevice.c @@ -0,0 +1,162 @@ +// SPDX-License-Identifier: GPL-2.0 +/*

• • Copyright IBM Corp. 2022
• • Author(s): Steffen Eiden seiden@linux.ibm.com
• */

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt ".\n"

+#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/miscdevice.h> +#include <linux/types.h> +#include <linux/stddef.h> +#include <linux/vmalloc.h> +#include <linux/slab.h>

+#include <asm/uvdevice.h> +#include <asm/uv.h>

+/**

• • uvio_qui() - Perform a Query Ultravisor Information UVC.
• • uv_ioctl: ioctl control block
• • uvio_qui() does a Query Ultravisor Information (QUI) Ultravisor Call.
• • It creates the uvc qui request and sends it to the Ultravisor. After that
• • it copies the response to userspace and fills the rc and rrc of uv_ioctl
• • uv_call with the response values of the Ultravisor.
• • Create the UVC structure, send the UVC to UV and write the response in the ioctl struct.
• • Return: 0 on success or a negative error code on error.
• */

+static int uvio_qui(struct uvio_ioctl_cb *uv_ioctl) +{

• u8 __user *user_buf_addr = (__user u8 *)uv_ioctl->argument_addr;
• size_t user_buf_len = uv_ioctl->argument_len;
• struct uv_cb_header *uvcb_qui = NULL;
• int ret;
• /*

• * Do not check for a too small buffer. If userspace provides a buffer
  

• * that is too small the Ultravisor will complain.
  

• */
  

• ret = -EINVAL;
• if (!user_buf_len || user_buf_len > UVIO_QUI_MAX_LEN)

• goto out;
  

• ret = -ENOMEM;
• uvcb_qui = kvzalloc(user_buf_len, GFP_KERNEL);
• if (!uvcb_qui)

• goto out;
  

• uvcb_qui->len = user_buf_len;
• uvcb_qui->cmd = UVC_CMD_QUI;
• uv_call(0, (u64)uvcb_qui);
• ret = -EFAULT;
• if (copy_to_user(user_buf_addr, uvcb_qui, uvcb_qui->len))

• goto out;
  

• uv_ioctl->uv_rc = uvcb_qui->rc;
• uv_ioctl->uv_rrc = uvcb_qui->rrc;
• ret = 0;

+out:

• kvfree(uvcb_qui);
• return ret;

+}

+static int uvio_copy_and_check_ioctl(struct uvio_ioctl_cb *ioctl, void __user *argp) +{

• u64 sum = 0;
• u64 i;
• if (copy_from_user(ioctl, argp, sizeof(*ioctl)))

• return -EFAULT;
  

• if (ioctl->flags != 0)

• return -EINVAL;
  

• for (i = 0; i < ARRAY_SIZE(ioctl->reserved14); i++)

• sum += ioctl->reserved14[i];
  

• if (sum)

• return -EINVAL;
  

So you can have -1, 1, -1, 1, and so on and cause this to be an incorrect check. Just test for 0 and bail out early please.

These ints are unsigned, your szenario cannot happen. However, I changed it to bailout early anyway.

...

• return 0;

+}

+static int uvio_dev_open(struct inode *inode, struct file *filp) +{

• return 0;

+}

+static int uvio_dev_close(struct inode *inodep, struct file *filp) +{

• return 0;

+}

If open/close do nothing, no need to provide it at all, just drop them.

Makes sense.

...

+/*

• • IOCTL entry point for the Ultravisor device.
• */

+static long uvio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{

• void __user *argp = (void __user *)arg;
• struct uvio_ioctl_cb *uv_ioctl;
• long ret;
• ret = -ENOMEM;
• uv_ioctl = vzalloc(sizeof(*uv_ioctl));
• if (!uv_ioctl)

• goto out;
  

• switch (cmd) {
• case UVIO_IOCTL_QUI:

• ret = uvio_copy_and_check_ioctl(uv_ioctl, argp);
  

• if (ret)
  

• 	goto out;
  

• ret = uvio_qui(uv_ioctl);
  

• break;
  

• default:

• ret = -EINVAL;
  

Wrong error value :(

changed

...

• break;
  

• }
• if (ret)

• goto out;
  

• if (copy_to_user(argp, uv_ioctl, sizeof(*uv_ioctl)))

• ret = -EFAULT;
  

• out:
• vfree(uv_ioctl);
• return ret;

+}

+static const struct file_operations uvio_dev_fops = {

• .owner = THIS_MODULE,
• .unlocked_ioctl = uvio_ioctl,
• .open = uvio_dev_open,
• .release = uvio_dev_close,
• .llseek = no_llseek,

+};

+static struct miscdevice uvio_dev_miscdev = {

• .minor = MISC_DYNAMIC_MINOR,
• .name = UVIO_DEVICE_NAME,
• .fops = &uvio_dev_fops,

+};

+static void __exit uvio_dev_exit(void) +{

• misc_deregister(&uvio_dev_miscdev);

+}

+static int __init uvio_dev_init(void) +{

• if (!test_facility(158))

• return -ENXIO;
  

• return misc_register(&uvio_dev_miscdev);

+}

+module_init(uvio_dev_init); +module_exit(uvio_dev_exit);

+MODULE_AUTHOR("IBM Corporation"); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Ultravisor UAPI driver");

Nothing to cause this to automatically be loaded when the "hardware" is present?

We do not have anything like a s390 facility bus which could trigger such automatic loads. Developing such a bus would be an overkill.

However we could do the approach e.g. kvm-s390 takes. Define MODULE_ALIAS(devname:uv) that will trigger an automatic module load if someone calls open on /dev/uv the first time. IIRC we need to define a fixed misc minor number with this approach.

something like that: --- a/drivers/s390/char/uvdevice.c +++ b/drivers/s390/char/uvdevice.c @@ -309,3 +309,5 MODULE_AUTHOR("IBM Corporation"); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Ultravisor UAPI driver"); +MODULE_ALIAS_MISCDEV(SOME_FIXED_MISC_MINOR); +MODULE_ALIAS("devname:uv");

We then maybe need to discuss if 'uv' is unique enough.

thanks,

greg k-h

Steffen

Hey Shuah, thanks for your review.

On 2/19/22 00:28, Shuah Khan wrote:

On 2/17/22 4:37 AM, Steffen Eiden wrote:

...

Adds some selftests to test ioctl error paths of the uv-uapi.

Please add information on how to run this test and example output.

I will do it in a v2

...

Signed-off-by: Steffen Eiden seiden@linux.ibm.com

MAINTAINERS                                   |   1 +   tools/testing/selftests/Makefile              |   1 +   tools/testing/selftests/drivers/.gitignore    |   1 +   .../selftests/drivers/s390x/uvdevice/Makefile |  22 ++   .../selftests/drivers/s390x/uvdevice/config   |   1 +   .../drivers/s390x/uvdevice/test_uvdevice.c    | 280 ++++++++++++++++++   6 files changed, 306 insertions(+)   create mode 100644 tools/testing/selftests/drivers/s390x/uvdevice/Makefile   create mode 100644 tools/testing/selftests/drivers/s390x/uvdevice/config   create mode 100644 tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c

diff --git a/MAINTAINERS b/MAINTAINERS index c7d8d0fe48cf..c6a0311c3fa8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10462,6 +10462,7 @@ F:    arch/s390/kernel/uv.c   F:    arch/s390/kvm/   F:    arch/s390/mm/gmap.c   F:    drivers/s390/char/uvdevice.c +F:    tools/testing/selftests/drivers/s390x/uvdevice/   F:    tools/testing/selftests/kvm/*/s390x/   F:    tools/testing/selftests/kvm/s390x/ diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index c852eb40c4f7..3b8abaee9271 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -9,6 +9,7 @@ TARGETS += core   TARGETS += cpufreq   TARGETS += cpu-hotplug   TARGETS += drivers/dma-buf +TARGETS += drivers/s390x/uvdevice   TARGETS += efivarfs   TARGETS += exec   TARGETS += filesystems diff --git a/tools/testing/selftests/drivers/.gitignore b/tools/testing/selftests/drivers/.gitignore index ca74f2e1c719..09e23b5afa96 100644 --- a/tools/testing/selftests/drivers/.gitignore +++ b/tools/testing/selftests/drivers/.gitignore @@ -1,2 +1,3 @@   # SPDX-License-Identifier: GPL-2.0-only   /dma-buf/udmabuf +/s390x/uvdevice/test_uvdevice diff --git a/tools/testing/selftests/drivers/s390x/uvdevice/Makefile b/tools/testing/selftests/drivers/s390x/uvdevice/Makefile new file mode 100644 index 000000000000..5e701d2708d4 --- /dev/null +++ b/tools/testing/selftests/drivers/s390x/uvdevice/Makefile @@ -0,0 +1,22 @@ +include ../../../../../build/Build.include

+UNAME_M := $(shell uname -m)

+ifneq ($(UNAME_M),s390x) +nothing: +.PHONY: all clean run_tests install +.SILENT: +else

+TEST_GEN_PROGS := test_uvdevice

+top_srcdir ?= ../../../../../.. +KSFT_KHDR_INSTALL := 1 +khdr_dir = $(top_srcdir)/usr/include +LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH)/include

+CFLAGS += -Wall -Werror -static -I$(khdr_dir) -I$(LINUX_TOOL_ARCH_INCLUDE)

+include ../../../lib.mk

+endif diff --git a/tools/testing/selftests/drivers/s390x/uvdevice/config b/tools/testing/selftests/drivers/s390x/uvdevice/config new file mode 100644 index 000000000000..f28a04b99eff --- /dev/null +++ b/tools/testing/selftests/drivers/s390x/uvdevice/config @@ -0,0 +1 @@ +CONFIG_S390_UV_UAPI=y diff --git a/tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c b/tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c new file mode 100644 index 000000000000..f23663bcab03 --- /dev/null +++ b/tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c @@ -0,0 +1,280 @@ +// SPDX-License-Identifier: GPL-2.0 +/*

• *  selftest for the Ultravisor UAPI device
• *  Copyright IBM Corp. 2022
• *  Author(s): Steffen Eiden seiden@linux.ibm.com
• */

+#include <stdint.h> +#include <fcntl.h> +#include <errno.h> +#include <sys/ioctl.h> +#include <sys/mman.h>

+#include <asm/uvdevice.h>

+#include "../../../kselftest_harness.h"

+#define BUFFER_SIZE 0x200 +FIXTURE(uvio_fixture) { +    int uv_fd; +    struct uvio_ioctl_cb uvio_ioctl; +    uint8_t buffer[BUFFER_SIZE]; +    __u64 fault_page; +};

+FIXTURE_VARIANT(uvio_fixture) { +    unsigned long ioctl_cmd; +    uint32_t arg_size; +};

+FIXTURE_VARIANT_ADD(uvio_fixture, qui) { +    .ioctl_cmd = UVIO_IOCTL_QUI, +    .arg_size = BUFFER_SIZE, +};

+FIXTURE_VARIANT_ADD(uvio_fixture, att) { +    .ioctl_cmd = UVIO_IOCTL_ATT, +    .arg_size = sizeof(struct uvio_attest), +};

+FIXTURE_SETUP(uvio_fixture) +{ +    self->uv_fd = open("/dev/uv", O_RDWR);

+    self->uvio_ioctl.argument_addr = (__u64)self->buffer; +    self->uvio_ioctl.argument_len = variant->arg_size; +    self->fault_page = +        (__u64)mmap(NULL, (size_t)getpagesize(), PROT_NONE, MAP_ANONYMOUS, -1, 0); +}

+FIXTURE_TEARDOWN(uvio_fixture) +{ +    if (self->uv_fd) +        close(self->uv_fd); +    munmap((void *)self->fault_page, (size_t)getpagesize()); +}

+TEST_F(uvio_fixture, fault_ioctl_arg) +{ +    int rc, errno_cache;

+    rc = ioctl(self->uv_fd, variant->ioctl_cmd, NULL); +    errno_cache = errno; +    ASSERT_EQ(rc, -1); +    ASSERT_EQ(errno_cache, EFAULT);

+    rc = ioctl(self->uv_fd, variant->ioctl_cmd, self->fault_page); +    errno_cache = errno; +    ASSERT_EQ(rc, -1); +    ASSERT_EQ(errno_cache, EFAULT); +}

+TEST_F(uvio_fixture, fault_uvio_arg) +{ +    int rc, errno_cache;

+    self->uvio_ioctl.argument_addr = 0; +    rc = ioctl(self->uv_fd, variant->ioctl_cmd, &self->uvio_ioctl); +    errno_cache = errno; +    ASSERT_EQ(rc, -1); +    ASSERT_EQ(errno_cache, EFAULT);

+    self->uvio_ioctl.argument_addr = self->fault_page; +    rc = ioctl(self->uv_fd, variant->ioctl_cmd, &self->uvio_ioctl); +    errno_cache = errno; +    ASSERT_EQ(rc, -1); +    ASSERT_EQ(errno_cache, EFAULT); +}

+/*

• • Test to verify that IOCTLs with invalid values in the

ioctl_control block

• • are rejected.
• */

+TEST_F(uvio_fixture, inval_ioctl_cb) +{ +    int rc, errno_cache;

+    self->uvio_ioctl.argument_len = 0; +    rc = ioctl(self->uv_fd, variant->ioctl_cmd, &self->uvio_ioctl); +    errno_cache = errno; +    ASSERT_EQ(rc, -1); +    ASSERT_EQ(errno_cache, EINVAL);

+    self->uvio_ioctl.argument_len = (uint32_t)-1; +    rc = ioctl(self->uv_fd, variant->ioctl_cmd, &self->uvio_ioctl); +    errno_cache = errno; +    ASSERT_EQ(rc, -1); +    ASSERT_EQ(errno_cache, EINVAL); +    self->uvio_ioctl.argument_len = variant->arg_size;

+    self->uvio_ioctl.flags = (uint32_t)-1; +    rc = ioctl(self->uv_fd, variant->ioctl_cmd, &self->uvio_ioctl); +    errno_cache = errno; +    ASSERT_EQ(rc, -1); +    ASSERT_EQ(errno_cache, EINVAL); +    self->uvio_ioctl.flags = 0;

+    memset(self->uvio_ioctl.reserved14, 0xff, sizeof(self->uvio_ioctl.reserved14)); +    rc = ioctl(self->uv_fd, variant->ioctl_cmd, &self->uvio_ioctl); +    errno_cache = errno; +    ASSERT_EQ(rc, -1); +    ASSERT_EQ(errno_cache, EINVAL);

+    memset(&self->uvio_ioctl, 0x11, sizeof(self->uvio_ioctl)); +    rc = ioctl(self->uv_fd, variant->ioctl_cmd, &self->uvio_ioctl); +    ASSERT_EQ(rc, -1); +}

+TEST_F(uvio_fixture, inval_ioctl_cmd) +{ +    int rc, errno_cache; +    uint8_t nr = _IOC_NR(variant->ioctl_cmd); +    unsigned long cmds[] = { +        _IOWR('a', nr, struct uvio_ioctl_cb), +        _IOWR(UVIO_TYPE_UVC, nr, int), +        _IO(UVIO_TYPE_UVC, nr), +        _IOR(UVIO_TYPE_UVC, nr, struct uvio_ioctl_cb), +        _IOW(UVIO_TYPE_UVC, nr, struct uvio_ioctl_cb), +    };

+    for (size_t i = 0; i < ARRAY_SIZE(cmds); i++) { +        rc = ioctl(self->uv_fd, cmds[i], &self->uvio_ioctl); +        errno_cache = errno; +        ASSERT_EQ(rc, -1); +        ASSERT_EQ(errno_cache, EINVAL); +    } +}

+struct test_attest_buffer { +    uint8_t arcb[0x180]; +    uint8_t meas[64]; +    uint8_t add[32]; +};

+FIXTURE(attest_fixture) { +    int uv_fd; +    struct uvio_ioctl_cb uvio_ioctl; +    struct uvio_attest uvio_attest; +    struct test_attest_buffer attest_buffer; +    __u64 fault_page; +};

+FIXTURE_SETUP(attest_fixture) +{ +    self->uv_fd = open("/dev/uv", O_RDWR);

So each test opne and closes the devuce. Can this file stay open for the duraction of the test run and close it in main() after test exits?

IIRC 'test_harness_run' will never return and instead exit the program. Therefore, I cannot do anything after that function including closing files if I want a clean cleanup of my test.

...

+    self->uvio_ioctl.argument_addr = (__u64)&self->uvio_attest; +    self->uvio_ioctl.argument_len = sizeof(self->uvio_attest);

+    self->uvio_attest.arcb_addr = (__u64)&self->attest_buffer.arcb; +    self->uvio_attest.arcb_len = sizeof(self->attest_buffer.arcb);

+    self->uvio_attest.meas_addr = (__u64)&self->attest_buffer.meas; +    self->uvio_attest.meas_len = sizeof(self->attest_buffer.meas);

+    self->uvio_attest.add_data_addr = (__u64)&self->attest_buffer.add; +    self->uvio_attest.add_data_len = sizeof(self->attest_buffer.add); +    self->fault_page = +        (__u64)mmap(NULL, (size_t)getpagesize(), PROT_NONE, MAP_ANONYMOUS, -1, 0); +}

+FIXTURE_TEARDOWN(attest_fixture) +{ +    if (self->uv_fd) +        close(self->uv_fd); +    munmap((void *)self->fault_page, (size_t)getpagesize()); +}

+static void att_inval_sizes_test(uint32_t *size, uint32_t max_size, bool test_zero, +                 struct __test_metadata *_metadata, +                 FIXTURE_DATA(attest_fixture) *self) +{ +    int rc, errno_cache; +    uint32_t tmp = *size;

+    if (test_zero) { +        *size = 0; +        rc = ioctl(self->uv_fd, UVIO_IOCTL_ATT, &self->uvio_ioctl); +        errno_cache = errno; +        ASSERT_EQ(rc, -1); +        ASSERT_EQ(errno_cache, EINVAL); +    } +    *size = max_size + 1; +    rc = ioctl(self->uv_fd, UVIO_IOCTL_ATT, &self->uvio_ioctl); +    errno_cache = errno; +    ASSERT_EQ(rc, -1); +    ASSERT_EQ(errno_cache, EINVAL); +    *size = tmp; +}

+/*

• • Test to verify that attestation IOCTLs with invalid values in the

UVIO

• • attestation control block are rejected.
• */

+TEST_F(attest_fixture, att_inval_request) +{ +    int rc, errno_cache;

+    att_inval_sizes_test(&self->uvio_attest.add_data_len, UVIO_ATT_ADDITIONAL_MAX_LEN, +                 false, _metadata, self); +    att_inval_sizes_test(&self->uvio_attest.meas_len, UVIO_ATT_MEASUREMENT_MAX_LEN, +                 true, _metadata, self); +    att_inval_sizes_test(&self->uvio_attest.arcb_len, UVIO_ATT_ARCB_MAX_LEN, +                 true, _metadata, self);

+    self->uvio_attest.reserved136 = (uint16_t)-1; +    rc = ioctl(self->uv_fd, UVIO_IOCTL_ATT, &self->uvio_ioctl); +    errno_cache = errno; +    ASSERT_EQ(rc, -1); +    ASSERT_EQ(errno_cache, EINVAL);

+    memset(&self->uvio_attest, 0x11, sizeof(self->uvio_attest)); +    rc = ioctl(self->uv_fd, UVIO_IOCTL_ATT, &self->uvio_ioctl); +    ASSERT_EQ(rc, -1); +}

+static void att_inval_addr_test(__u64 *addr, struct __test_metadata *_metadata, +                FIXTURE_DATA(attest_fixture) *self) +{ +    int rc, errno_cache; +    __u64 tmp = *addr;

+    *addr = 0; +    rc = ioctl(self->uv_fd, UVIO_IOCTL_ATT, &self->uvio_ioctl); +    errno_cache = errno; +    ASSERT_EQ(rc, -1); +    ASSERT_EQ(errno_cache, EFAULT); +    *addr = self->fault_page; +    rc = ioctl(self->uv_fd, UVIO_IOCTL_ATT, &self->uvio_ioctl); +    errno_cache = errno; +    ASSERT_EQ(rc, -1); +    ASSERT_EQ(errno_cache, EFAULT); +    *addr = tmp; +}

+TEST_F(attest_fixture, att_inval_addr) +{ +    att_inval_addr_test(&self->uvio_attest.arcb_addr, _metadata, self); +    att_inval_addr_test(&self->uvio_attest.add_data_addr, _metadata, self); +    att_inval_addr_test(&self->uvio_attest.meas_addr, _metadata, self); +}

+static void __attribute__((constructor)) __constructor_order_last(void) +{ +    if (!__constructor_order) +        __constructor_order = _CONSTRUCTOR_ORDER_BACKWARD; +}

+int main(int argc, char **argv) +{ +    int fd = open("/dev/uv", O_RDWR);

+    if (fd < 0) { +        ksft_exit_skip("No uv-device.\n");

Please add information on which confg options need to be enabled to run this test - CONFIG_S390_UV_UAPI?

OK.

Also add a check and skip when run by non-root if this test requires root privileges.

The test just needs RDWR access to /dev/uv.

...

+        ksft_exit(KSFT_SKIP);

You don't need this - ksft_exit_skip() calls exit(KSFT_SKIP)

thanks, I missed that.

...

+    } +    close(fd);

Closing the file before test inocation?

See comment about fixture setup/cleanup. If you prefer, I can skip the close and use fd in the tests instead of self->uv_fd. However, I am unabale to do an explicit close to /dev/uv after running the tests.

...

+    return test_harness_run(argc, argv); +}

thanks, -- Shuah

Steffen