Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-26 06:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

KVM: s390: Fix for destroy page ultravisor call

Browse Source 
- handle response code from older firmware
 - add uv.c to KVM: s390/s390 maintainer list
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJftQ/EAAoJEBF7vIC1phx8eW0P/RQkoX/307h3Y+ywipqPwx+m
 5sTDbL728pSH3RbJWDm3iSLvuvsfNzUE9gqluM9MSoYmzpVbqfTkwU2f7e1JdJJp
 DMt55XTaeMWliOdrDGiSJ5tlmSDjoQA8OaXfnk9Z5LBt71duej6iMV4o1a0JItv2
 h8cCMyY8HcLceTApNk6arogLZ/S+IftvlsTlPov+pxxwXehIIfdKhpUYdIAGPXhS
 lRQUD9umIBhXPgD+u/NRdH3LsPkvJ31vqAhgqPJMp8TVH13rQjtirYF1rs/zC8Qi
 qVKHNpvxDYtzduBEXCpBbCvu1hOLZC3vyAFaBFiCzoqRzaCDjd8TI4OzjATzYjkX
 lEeRlEzjU0G+mseE2EvSfklGrHXXu5MUJ7x4ojfMOd0ZwZXoOe3Qg1o9+QX+chX/
 IZ1oWaiqm43eF2PNlrMeLbSQwJ65qO4IxtfAtiGAF8U99drEDjObpCVPeCDcy48U
 9jzwek/wI38JNqMY5sIYBF5qJIG3KwY1sGpEnsSLpjw+gsQlSxzscqZmmm+1xR7l
 RaLYKER+68vv7QdQhzK5CSGlHQU77EfZTYKDEhH1Sm/wZ5FNuHVQP2CYbwDEzq1O
 AsdvJh0HXZ+QARseDuQzrEe+70ghLKuF99mIi0NnJANgyhKxjOqySlKaSLYkXrDU
 GkW9isvZU1hnkTLli0iF
 =YfhG
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Paolo Bonzini 2020-11-18 12:04:05 -05:00
commit 79af02af1d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -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/

9
arch/s390/kernel/uv.c
View File

@ -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;
}