[GIT PULL 0/2] KVM: s390: Fix for destroy page ultravisor call

[GIT PULL 0/2] KVM: s390: Fix for destroy page ultravisor call

[Christian Borntraeger]

Paolo,

one more fix for 5.10 in addition with an update of the MAINTAINERS
file. The uv.c file is mostly used by KVM and Heiko asked that we take
care of this patch.

The following changes since commit 6cbf1e960fa52e4c63a6dfa4cda8736375b34ccc:

  KVM: s390: remove diag318 reset code (2020-11-11 09:31:52 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git  tags/kvm-s390-master-5.10-2

for you to fetch changes up to 735931f9a51ab09cf795721b37696b420484625f:

  MAINTAINERS: add uv.c also to KVM/s390 (2020-11-18 13:09:21 +0100)

----------------------------------------------------------------
KVM: s390: Fix for destroy page ultravisor call

- handle response code from older firmware
- add uv.c to KVM: s390/s390 maintainer list

----------------------------------------------------------------
Christian Borntraeger (2):
      s390/uv: handle destroy page legacy interface
      MAINTAINERS: add uv.c also to KVM/s390

 MAINTAINERS           | 1 +
 arch/s390/kernel/uv.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

[GIT PULL 1/2] s390/uv: handle destroy page legacy interface

[Christian Borntraeger]

Older firmware can return rc=0x107 rrc=0xd for destroy page if the
page is already non-secure. This should be handled like a success
as already done by newer firmware.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Fixes: 1a80b54d1ce1 ("s390/uv: add destroy page call")
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
---
 arch/s390/kernel/uv.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c
index 14bd9d58edc9..883bfed9f5c2 100644
--- a/arch/s390/kernel/uv.c
+++ b/arch/s390/kernel/uv.c
@@ -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;
 }
 
-- 
2.28.0

[GIT PULL 2/2] MAINTAINERS: add uv.c also to KVM/s390

[Christian Borntraeger]

Most changes in uv.c are related to KVM. Involve also the KVM team
regarding changes to uv.c.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index e73636b75f29..06116d892a4b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9674,6 +9674,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/
-- 
2.28.0

Re: [GIT PULL 0/2] KVM: s390: Fix for destroy page ultravisor call

[Paolo Bonzini]

On 18/11/20 18:01, Christian Borntraeger wrote:
> Paolo,
> 
> one more fix for 5.10 in addition with an update of the MAINTAINERS
> file. The uv.c file is mostly used by KVM and Heiko asked that we take
> care of this patch.
> 
> The following changes since commit 6cbf1e960fa52e4c63a6dfa4cda8736375b34ccc:
> 
>    KVM: s390: remove diag318 reset code (2020-11-11 09:31:52 +0100)
> 
> are available in the Git repository at:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git  tags/kvm-s390-master-5.10-2
> 
> for you to fetch changes up to 735931f9a51ab09cf795721b37696b420484625f:
> 
>    MAINTAINERS: add uv.c also to KVM/s390 (2020-11-18 13:09:21 +0100)
> 
> ----------------------------------------------------------------
> KVM: s390: Fix for destroy page ultravisor call
> 
> - handle response code from older firmware
> - add uv.c to KVM: s390/s390 maintainer list
> 
> ----------------------------------------------------------------
> Christian Borntraeger (2):
>        s390/uv: handle destroy page legacy interface
>        MAINTAINERS: add uv.c also to KVM/s390
> 
>   MAINTAINERS           | 1 +
>   arch/s390/kernel/uv.c | 9 ++++++++-
>   2 files changed, 9 insertions(+), 1 deletion(-)
> 

Pulled, thanks.

Paolo