KVM: s390: pv: fix two small bugs
Claudio Imbrenda
maintainerv2 cover KVM: s390: pv: fix two small bugs
This series fixes 2 small bugs introduced with asynchronous teardown.
The first patch (unmodified since v1, but did not get any reviews) fixes a potential race that can cause crashes during shutdown on machines that don't support protected virtualization.
The second patch adds a missing initialization when replacing the ASCE for a protected guest. This could potentially cause issues and crashes if lowcore is affected.
v1->v2:
* added the second patch
Claudio Imbrenda (2):
KVM: s390: pv: simplify shutdown and fix race
KVM: s390: pv: fix index value of replaced ASCE
arch/s390/kvm/pv.c | 8 ++++++-- arch/s390/mm/gmap.c | 1 + 2 files changed, 7 insertions(+), 2 deletions(-)
Signature · 1 line
2.41.0
Claudio Imbrenda
maintainerPATCH v2 1/2 KVM: s390: pv: simplify shutdown and fix race
Simplify the shutdown of non-protected VMs. There is no need to do complex manipulations of the counter if it was zero.
This also fixes a very rare race which caused pages to be torn down from the address space with a non-zero counter even on older machines that don't support the UVC instruction, causing a crash.
--- arch/s390/kvm/pv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/s390/kvm/pv.c +6 -2
@@ -411,8 +411,12 @@ int kvm_s390_pv_deinit_cleanup_all(struct kvm *kvm, u16 *rc, u16 *rrc)u16 _rc, _rrc;int cc =0 ; -/* Make sure the counter does not reach 0 before calling s390_uv_destroy_range */ -atomic_inc (&kvm->mm->context.protected_count); +/* +* Nothing to do if the counter was already 0. Otherwise make sure +* the counter does not reach 0 before calling s390_uv_destroy_range. +*/ +if (!atomic_inc_not_zero (&kvm->mm->context.protected_count)) +return 0 ; *rc =1 ;/* If the current VM is protected, destroy it */
Signature · 1 line
2.41.0
Re: [PATCH v2 1/2] KVM: s390: pv: simplify shutdown and fix race
Quoting Claudio Imbrenda (2023-07-05 13:19:36)
Quoted 10 lines
Simplify the shutdown of non-protected VMs. There is no need to do complex manipulations of the counter if it was zero.
This also fixes a very rare race which caused pages to be torn down from the address space with a non-zero counter even on older machines that don't support the UVC instruction, causing a crash.
Reported-by Marc Hartmayer <[email protected]>Fixes fb491d5500a7 ("KVM: s390: pv: asynchronous destroy for reboot")Signed-off-by Claudio Imbrenda <[email protected]>
Claudio Imbrenda
maintainerPATCH v2 2/2 KVM: s390: pv: fix index value of replaced ASCE
In reply to Claudio ImbrendaThe index field of the struct page corresponding to a guest ASCE should be 0. When replacing the ASCE in s390_replace_asce(), the index of the new ASCE should also be set to 0.
Having the wrong index might lead to the wrong addresses being passed around when notifying pte invalidations, and eventually to validity intercepts (VM crash) if the prefix gets unmapped and the notifier gets called with the wrong address.
--- arch/s390/mm/gmap.c | 1 + 1 file changed, 1 insertion(+)
arch/s390/mm/gmap.c +1 -0
@@ -2853,6 +2853,7 @@ int s390_replace_asce(struct gmap *gmap) page =alloc_pages (GFP_KERNEL_ACCOUNT ,CRST_ALLOC_ORDER );if (!page)return -ENOMEM ; + page->index =0 ; table =page_to_virt (page);memcpy (table, gmap->table,1UL << (CRST_ALLOC_ORDER +PAGE_SHIFT ));
Signature · 1 line
2.41.0
Re: [PATCH v2 2/2] KVM: s390: pv: fix index value of replaced ASCE
Quoted 8 lines · Claudio Imbrenda
The index field of the struct page corresponding to a guest ASCE should be 0. When replacing the ASCE in
s390_replace_asce(), the index of the new ASCE should also be set to 0.Having the wrong index might lead to the wrong addresses being passed around when notifying pte invalidations, and eventually to validity intercepts (VM crash) if the prefix gets unmapped and the notifier gets called with the wrong address.
Can that also happen in crst_table_alloc()?
Quoted 4 lines
Signed-off-by Claudio Imbrenda <[email protected]>--- arch/s390/mm/gmap.c | 1 + 1 file changed, 1 insertion(+)
Claudio Imbrenda
maintainerRe: [PATCH v2 2/2] KVM: s390: pv: fix index value of replaced ASCE
Quoted 11 lines · On Tue, 11 Jul 2023 16:12:54 +0200 Philippe Mathieu-Daudé <[email protected]>…
Quoted 8 lines · Claudio Imbrenda
The index field of the struct page corresponding to a guest ASCE should be 0. When replacing the ASCE in
s390_replace_asce(), the index of the new ASCE should also be set to 0.Having the wrong index might lead to the wrong addresses being passed around when notifying pte invalidations, and eventually to validity intercepts (VM crash) if the prefix gets unmapped and the notifier gets called with the wrong address.
Can that also happen in
crst_table_alloc()?
no. ->index is only used for gmap page tables (guest mapping), from the root to pmd tables. the last level (ptes) is shared between guest mapping and QEMU address space. i.e. the ptes are the ones from QEMU.
the last level of page tables is not expected to have ->index set (since that one actually belongs to QEMU and not to the guest mapping)
guest page tables (all levels, except ptes) are allocated with gmap_alloc_table(), which correctly sets ->index
the top level of a guest mapping is allocated in gmap_alloc(), which also correctly sets ->index to 0.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Claudio Imbrenda <[email protected]>--- arch/s390/mm/gmap.c | 1 + 1 file changed, 1 insertion(+)Reviewed-by Philippe Mathieu-Daudé <[email protected]>
thank you!
Re: [PATCH v2 2/2] KVM: s390: pv: fix index value of replaced ASCE
In reply to Claudio ImbrendaQuoted 10 lines · Claudio Imbrenda
The index field of the struct page corresponding to a guest ASCE should be 0. When replacing the ASCE in
s390_replace_asce(), the index of the new ASCE should also be set to 0.Having the wrong index might lead to the wrong addresses being passed around when notifying pte invalidations, and eventually to validity intercepts (VM crash) if the prefix gets unmapped and the notifier gets called with the wrong address.
Signed-off-by Claudio Imbrenda <[email protected]>
No fixes tag?
Claudio Imbrenda
maintainerRe: [PATCH v2 2/2] KVM: s390: pv: fix index value of replaced ASCE
Quoted 5 lines · On Wed, 12 Jul 2023 13:58:49 +0200 Janosch Frank <[email protected]> wrote:
Quoted 4 lines · Claudio Imbrenda
The index field of the struct page corresponding to a guest ASCE should be 0. When replacing the ASCE in
s390_replace_asce(), the index of the new ASCE should also be set to 0.
Quoted 8 lines
Quoted 6 lines
Having the wrong index might lead to the wrong addresses being passed around when notifying pte invalidations, and eventually to validity intercepts (VM crash) if the prefix gets unmapped and the notifier gets called with the wrong address.
Signed-off-by Claudio Imbrenda <[email protected]>No fixes tag?
oops, you're right
destroy fails")
Quoted 3 lines
Reviewed-by Janosch Frank <[email protected]>