[PATCH 0/2] Fix and MAINTAINER update for 5.10

[PATCH 0/2] Fix and MAINTAINER update for 5.10

[Christian Borntraeger]

Conny, David,

your chance for quick feedback. I plan to send a pull request for kvm
master soon.

I have agreed with Heiko to carry this via the KVM tree as
this is KVM s390 specific.

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(-)

-- 
2.28.0

[PATCH 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: 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

[PATCH 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>
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: [PATCH 0/2] Fix and MAINTAINER update for 5.10

[David Hildenbrand]

> Am 18.11.2020 um 10:39 schrieb Christian Borntraeger <borntraeger@de.ibm.com>:
> 
> Conny, David,
> 
> your chance for quick feedback. I plan to send a pull request for kvm
> master soon.
> 

LGTM

> I have agreed with Heiko to carry this via the KVM tree as
> this is KVM s390 specific.
> 
> 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(-)
> 
> -- 
> 2.28.0
> 

Re: [PATCH 0/2] Fix and MAINTAINER update for 5.10

[Cornelia Huck]

On Wed, 18 Nov 2020 10:39:40 +0100
Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> Conny, David,
> 
> your chance for quick feedback. I plan to send a pull request for kvm
> master soon.
> 
> I have agreed with Heiko to carry this via the KVM tree as
> this is KVM s390 specific.
> 
> 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(-)
> 

For both:

Acked-by: Cornelia Huck <cohuck@redhat.com>

Re: [PATCH 0/2] Fix and MAINTAINER update for 5.10

[David Hildenbrand]

On 18.11.20 10:43, David Hildenbrand wrote:
> 
>> Am 18.11.2020 um 10:39 schrieb Christian Borntraeger <borntraeger@de.ibm.com>:
>>
>> Conny, David,
>>
>> your chance for quick feedback. I plan to send a pull request for kvm
>> master soon.
>>
> 
> LGTM

Translating to

Reviewed-by: David Hildenbrand <david@redhat.com>

for both :)
-- 
Thanks,

David / dhildenb