Merge tag 'kvm-s390-master-5.10-2' of... (79af02af) · Commits · 戴 / test

Merge tag 'kvm-s390-master-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master KVM: s390: Fix for destroy page ultravisor call - handle response code from older firmware - add uv.c to KVM: s390/s390 maintainer list

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -9655,6 +9655,7 @@ 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/kernel/uv.c
		F: arch/s390/kvm/
		F: arch/s390/mm/gmap.c
		F: tools/testing/selftests/kvm/*/s390x/

arch/s390/kernel/uv.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -129,8 +129,15 @@ int uv_destroy_page(unsigned long paddr)
		.paddr = paddr
		};

		if (uv_call(0, (u64)&uvcb))
		if (uv_call(0, (u64)&uvcb)) {
		/*
		* Older firmware uses 107/d as an indication of a non secure
		* page. Let us emulate the newer variant (no-op).
		*/
		if (uvcb.header.rc == 0x107 && uvcb.header.rrc == 0xd)
		return 0;
		return -EINVAL;
		}
		return 0;
		}

Admin message