Skip to content

Commit f88fb13

Browse files
Tony Krowiakhcahca
authored andcommitted
s390/vfio-ap: make sure nib is shared
Since the NIB is visible by HW, KVM and the (PV) guest it needs to be in non-secure or secure but shared storage. Return code 6 is used to indicate to a PV guest that its NIB would be on secure, unshared storage and therefore the NIB address is invalid. Unfortunately we have no easy way to check if a page is unshared after vfio_pin_pages() since it will automatically export an unshared page if the UV pin shared call did not succeed due to a page being in unshared state. Therefore we use the fact that UV pinning it a second time is a nop but trying to pin an exported page is an error (0x102). If we encounter this error, we do a vfio unpin and import the page again, since vfio_pin_pages() exported it. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com> Acked-by: Halil Pasic <pasic@linux.ibm.com> Tested-by: Viktor Mihajlovski <mihajlov@linux.ibm.com> Link: https://lore.kernel.org/r/20230815184333.6554-13-akrowiak@linux.ibm.com Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent fb5040e commit f88fb13

File tree

1 file changed

+30
-0
lines changed

1 file changed

+30
-0
lines changed

drivers/s390/crypto/vfio_ap_ops.c

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,28 @@ static int vfio_ap_validate_nib(struct kvm_vcpu *vcpu, dma_addr_t *nib)
359359
return 0;
360360
}
361361

362+
static int ensure_nib_shared(unsigned long addr, struct gmap *gmap)
363+
{
364+
int ret;
365+
366+
/*
367+
* The nib has to be located in shared storage since guest and
368+
* host access it. vfio_pin_pages() will do a pin shared and
369+
* if that fails (possibly because it's not a shared page) it
370+
* calls export. We try to do a second pin shared here so that
371+
* the UV gives us an error code if we try to pin a non-shared
372+
* page.
373+
*
374+
* If the page is already pinned shared the UV will return a success.
375+
*/
376+
ret = uv_pin_shared(addr);
377+
if (ret) {
378+
/* vfio_pin_pages() likely exported the page so let's re-import */
379+
gmap_convert_to_secure(gmap, addr);
380+
}
381+
return ret;
382+
}
383+
362384
/**
363385
* vfio_ap_irq_enable - Enable Interruption for a APQN
364386
*
@@ -422,6 +444,14 @@ static struct ap_queue_status vfio_ap_irq_enable(struct vfio_ap_queue *q,
422444
h_nib = page_to_phys(h_page) | (nib & ~PAGE_MASK);
423445
aqic_gisa.gisc = isc;
424446

447+
/* NIB in non-shared storage is a rc 6 for PV guests */
448+
if (kvm_s390_pv_cpu_is_protected(vcpu) &&
449+
ensure_nib_shared(h_nib & PAGE_MASK, kvm->arch.gmap)) {
450+
vfio_unpin_pages(&q->matrix_mdev->vdev, nib, 1);
451+
status.response_code = AP_RESPONSE_INVALID_ADDRESS;
452+
return status;
453+
}
454+
425455
nisc = kvm_s390_gisc_register(kvm, isc);
426456
if (nisc < 0) {
427457
VFIO_AP_DBF_WARN("%s: gisc registration failed: nisc=%d, isc=%d, apqn=%#04x\n",

0 commit comments

Comments
 (0)