On 5/10/22 7:47 PM, Steffen Eiden wrote: > Adds some selftests to test ioctl error paths of the uv-uapi. > The Kconfig S390_UV_UAPI must be selected and the Ultravisor facility > must be available. The test can be executed by non-root, however, the > uvdevice special file /dev/uv must be accessible for reading and > writing which may imply root privileges. > > ./test-uv-device > TAP version 13 > 1..6 > # Starting 6 tests from 3 test cases. > # RUN uvio_fixture.att.fault_ioctl_arg ... > # OK uvio_fixture.att.fault_ioctl_arg > ok 1 uvio_fixture.att.fault_ioctl_arg > # RUN uvio_fixture.att.fault_uvio_arg ... > # OK uvio_fixture.att.fault_uvio_arg > ok 2 uvio_fixture.att.fault_uvio_arg > # RUN uvio_fixture.att.inval_ioctl_cb ... > # OK uvio_fixture.att.inval_ioctl_cb > ok 3 uvio_fixture.att.inval_ioctl_cb > # RUN uvio_fixture.att.inval_ioctl_cmd ... > # OK uvio_fixture.att.inval_ioctl_cmd > ok 4 uvio_fixture.att.inval_ioctl_cmd > # RUN attest_fixture.att_inval_request ... > # OK attest_fixture.att_inval_request > ok 5 attest_fixture.att_inval_request > # RUN attest_fixture.att_inval_addr ... > # OK attest_fixture.att_inval_addr > ok 6 attest_fixture.att_inval_addr > # PASSED: 6 / 6 tests passed. > # Totals: pass:6 fail:0 xfail:0 xpass:0 skip:0 error:0 Maybe we shouldn't add the result like this in the commit message. The test order may change and it may become invalid soon. Just put it after the commit message. > Signed-off-by: Steffen Eiden <seiden@xxxxxxxxxxxxx> > Acked-by: Janosch Frank <frankja@xxxxxxxxxxxxx> > --- > 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 | 276 ++++++++++++++++++ > 6 files changed, 302 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 b42ab4a35e18..46a9b1467380 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -10786,6 +10786,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 2319ec87f53d..d6b307371ef7 100644 > --- a/tools/testing/selftests/Makefile > +++ b/tools/testing/selftests/Makefile > @@ -10,6 +10,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 This doesn't work in different build cases. Please use $(KHDR_INCLUDES) instead. > +LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH)/include Which header files do you need from here? I'm not sure what is the purpose of the header files in $(top_srcdir)/tools/arch and where they are used. > + > +CFLAGS += -Wall -Werror -static -I$(khdr_dir) -I$(LINUX_TOOL_ARCH_INCLUDE) > + > +include ../../../lib.mk > + > +endif -- Muhammad Usama Anjum
