30e35258e2
Typically we refresh the host fh during CLP enable, however it's possible
that the device goes through multiple reset events before the guest
performs another CLP enable. Let's handle this for now by refreshing the
host handle from vfio before disabling aif.
Fixes: 03451953c7 ("s390x/pci: reset ISM passthrough devices on shutdown and system reset")
Reported-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Message-ID: <20240118185151.265329-3-mjrosato@linux.ibm.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
83 lines
1.9 KiB
C
83 lines
1.9 KiB
C
/*
|
|
* s390 zPCI KVM interfaces
|
|
*
|
|
* Copyright 2022 IBM Corp.
|
|
* Author(s): Matthew Rosato <mjrosato@linux.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or (at
|
|
* your option) any later version. See the COPYING file in the top-level
|
|
* directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
#include <linux/kvm.h>
|
|
|
|
#include "kvm/kvm_s390x.h"
|
|
#include "target/s390x/kvm/pv.h"
|
|
#include "hw/s390x/s390-pci-bus.h"
|
|
#include "hw/s390x/s390-pci-kvm.h"
|
|
#include "hw/s390x/s390-pci-inst.h"
|
|
#include "hw/s390x/s390-pci-vfio.h"
|
|
#include "cpu_models.h"
|
|
|
|
bool s390_pci_kvm_interp_allowed(void)
|
|
{
|
|
return kvm_s390_get_zpci_op() && !s390_is_pv();
|
|
}
|
|
|
|
int s390_pci_kvm_aif_enable(S390PCIBusDevice *pbdev, ZpciFib *fib, bool assist)
|
|
{
|
|
int rc;
|
|
struct kvm_s390_zpci_op args = {
|
|
.fh = pbdev->fh,
|
|
.op = KVM_S390_ZPCIOP_REG_AEN,
|
|
.u.reg_aen.ibv = fib->aibv,
|
|
.u.reg_aen.sb = fib->aisb,
|
|
.u.reg_aen.noi = FIB_DATA_NOI(fib->data),
|
|
.u.reg_aen.isc = FIB_DATA_ISC(fib->data),
|
|
.u.reg_aen.sbo = FIB_DATA_AISBO(fib->data),
|
|
.u.reg_aen.flags = (assist) ? 0 : KVM_S390_ZPCIOP_REGAEN_HOST
|
|
};
|
|
|
|
if (pbdev->aif) {
|
|
return -EINVAL;
|
|
}
|
|
|
|
rc = kvm_vm_ioctl(kvm_state, KVM_S390_ZPCI_OP, &args);
|
|
if (rc == 0) {
|
|
pbdev->aif = true;
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
int s390_pci_kvm_aif_disable(S390PCIBusDevice *pbdev)
|
|
{
|
|
int rc;
|
|
|
|
struct kvm_s390_zpci_op args = {
|
|
.fh = pbdev->fh,
|
|
.op = KVM_S390_ZPCIOP_DEREG_AEN
|
|
};
|
|
|
|
if (!pbdev->aif) {
|
|
return -EINVAL;
|
|
}
|
|
|
|
/*
|
|
* The device may have already been reset but we still want to relinquish
|
|
* the guest ISC, so always be sure to use an up-to-date host fh.
|
|
*/
|
|
if (!s390_pci_get_host_fh(pbdev, &args.fh)) {
|
|
return -EPERM;
|
|
}
|
|
|
|
rc = kvm_vm_ioctl(kvm_state, KVM_S390_ZPCI_OP, &args);
|
|
if (rc == 0) {
|
|
pbdev->aif = false;
|
|
}
|
|
|
|
return rc;
|
|
}
|