ac9ef66832
With upstream kernel, especially after commit 98ba956f6a389 ("powerpc/pseries/eeh: Rework device EEH PE determination") we see that KVM guest isn't able to enable EEH option for PCI pass-through devices anymore. [root@atest-guest ~]# dmesg | grep EEH [ 0.032337] EEH: pSeries platform initialized [ 0.298207] EEH: No capable adapters found: recovery disabled. [root@atest-guest ~]# So far the linux kernel was assuming pe_config_addr equal to device's config_addr and using it to enable EEH on the PE through ibm,set-eeh-option RTAS call. Which wasn't the correct way as per PAPR. The linux kernel commit 98ba956f6a389 fixed this flow. With that fixed, linux now uses PE config address returned by ibm,get-config-addr-info2 RTAS call to enable EEH option per-PE basis instead of per-device basis. However this has uncovered a bug in qemu where ibm,set-eeh-option is treating PE config address as per-device config address. Hence in qemu guest with recent kernel the ibm,set-eeh-option RTAS call fails with -3 return value indicating that there is no PCI device exist for the specified PE config address. The rtas_ibm_set_eeh_option call uses pci_find_device() to get the PC device that matches specific bus and devfn extracted from PE config address passed as argument. Thus it tries to map the PE config address to a single specific PCI device 'bus->devices[devfn]' which always results into checking device on slot 0 'bus->devices[0]'. This succeeds when there is a pass-through device (vfio-pci) present on slot 0. But in cases where there is no pass-through device present in slot 0, but present in non-zero slots, ibm,set-eeh-option call fails to enable the EEH capability. hw/ppc/spapr_pci_vfio.c: spapr_phb_vfio_eeh_set_option() case RTAS_EEH_ENABLE: { PCIHostState *phb; PCIDevice *pdev; /* * The EEH functionality is enabled on basis of PCI device, * instead of PE. We need check the validity of the PCI * device address. */ phb = PCI_HOST_BRIDGE(sphb); pdev = pci_find_device(phb->bus, (addr >> 16) & 0xFF, (addr >> 8) & 0xFF); if (!pdev || !object_dynamic_cast(OBJECT(pdev), "vfio-pci")) { return RTAS_OUT_PARAM_ERROR; } hw/pci/pci.c:pci_find_device() PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn) { bus = pci_find_bus_nr(bus, bus_num); if (!bus) return NULL; return bus->devices[devfn]; } This patch fixes ibm,set-eeh-option to check for presence of any PCI device (vfio-pci) under specified bus and enable the EEH if found. The current code already makes sure that all the devices on that bus are from same iommu group (within same PE) and fail very early if it does not. After this fix guest is able to find EEH capable devices and enable EEH recovery on it. [root@atest-guest ~]# dmesg | grep EEH [ 0.048139] EEH: pSeries platform initialized [ 0.405115] EEH: Capable adapter found: recovery enabled. [root@atest-guest ~]# Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Signed-off-by: Mahesh Salgaonkar <mahesh@linux.ibm.com> Message-Id: <162158429107.145117.5843504911924013125.stgit@jupiter> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
218 lines
6.4 KiB
C
218 lines
6.4 KiB
C
/*
|
|
* QEMU sPAPR PCI host for VFIO
|
|
*
|
|
* Copyright (c) 2011-2014 Alexey Kardashevskiy, IBM Corporation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License,
|
|
* or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include <linux/vfio.h>
|
|
#include "hw/ppc/spapr.h"
|
|
#include "hw/pci-host/spapr.h"
|
|
#include "hw/pci/msix.h"
|
|
#include "hw/vfio/vfio.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
bool spapr_phb_eeh_available(SpaprPhbState *sphb)
|
|
{
|
|
return vfio_eeh_as_ok(&sphb->iommu_as);
|
|
}
|
|
|
|
static void spapr_phb_vfio_eeh_reenable(SpaprPhbState *sphb)
|
|
{
|
|
vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_ENABLE);
|
|
}
|
|
|
|
void spapr_phb_vfio_reset(DeviceState *qdev)
|
|
{
|
|
/*
|
|
* The PE might be in frozen state. To reenable the EEH
|
|
* functionality on it will clean the frozen state, which
|
|
* ensures that the contained PCI devices will work properly
|
|
* after reboot.
|
|
*/
|
|
spapr_phb_vfio_eeh_reenable(SPAPR_PCI_HOST_BRIDGE(qdev));
|
|
}
|
|
|
|
static void spapr_eeh_pci_find_device(PCIBus *bus, PCIDevice *pdev,
|
|
void *opaque)
|
|
{
|
|
bool *found = opaque;
|
|
|
|
if (object_dynamic_cast(OBJECT(pdev), "vfio-pci")) {
|
|
*found = true;
|
|
}
|
|
}
|
|
|
|
int spapr_phb_vfio_eeh_set_option(SpaprPhbState *sphb,
|
|
unsigned int addr, int option)
|
|
{
|
|
uint32_t op;
|
|
int ret;
|
|
|
|
switch (option) {
|
|
case RTAS_EEH_DISABLE:
|
|
op = VFIO_EEH_PE_DISABLE;
|
|
break;
|
|
case RTAS_EEH_ENABLE: {
|
|
PCIHostState *phb;
|
|
bool found = false;
|
|
|
|
/*
|
|
* The EEH functionality is enabled per sphb level instead of
|
|
* per PCI device. We have already identified this specific sphb
|
|
* based on buid passed as argument to ibm,set-eeh-option rtas
|
|
* call. Now we just need to check the validity of the PCI
|
|
* pass-through devices (vfio-pci) under this sphb bus.
|
|
* We have already validated that all the devices under this sphb
|
|
* are from same iommu group (within same PE) before comming here.
|
|
*
|
|
* Prior to linux commit 98ba956f6a389 ("powerpc/pseries/eeh:
|
|
* Rework device EEH PE determination") kernel would call
|
|
* eeh-set-option for each device in the PE using the device's
|
|
* config_address as the argument rather than the PE address.
|
|
* Hence if we check validity of supplied config_addr whether
|
|
* it matches to this PHB will cause issues with older kernel
|
|
* versions v5.9 and older. If we return an error from
|
|
* eeh-set-option when the argument isn't a valid PE address
|
|
* then older kernels (v5.9 and older) will interpret that as
|
|
* EEH not being supported.
|
|
*/
|
|
phb = PCI_HOST_BRIDGE(sphb);
|
|
pci_for_each_device(phb->bus, (addr >> 16) & 0xFF,
|
|
spapr_eeh_pci_find_device, &found);
|
|
|
|
if (!found) {
|
|
return RTAS_OUT_PARAM_ERROR;
|
|
}
|
|
|
|
op = VFIO_EEH_PE_ENABLE;
|
|
break;
|
|
}
|
|
case RTAS_EEH_THAW_IO:
|
|
op = VFIO_EEH_PE_UNFREEZE_IO;
|
|
break;
|
|
case RTAS_EEH_THAW_DMA:
|
|
op = VFIO_EEH_PE_UNFREEZE_DMA;
|
|
break;
|
|
default:
|
|
return RTAS_OUT_PARAM_ERROR;
|
|
}
|
|
|
|
ret = vfio_eeh_as_op(&sphb->iommu_as, op);
|
|
if (ret < 0) {
|
|
return RTAS_OUT_HW_ERROR;
|
|
}
|
|
|
|
return RTAS_OUT_SUCCESS;
|
|
}
|
|
|
|
int spapr_phb_vfio_eeh_get_state(SpaprPhbState *sphb, int *state)
|
|
{
|
|
int ret;
|
|
|
|
ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_GET_STATE);
|
|
if (ret < 0) {
|
|
return RTAS_OUT_PARAM_ERROR;
|
|
}
|
|
|
|
*state = ret;
|
|
return RTAS_OUT_SUCCESS;
|
|
}
|
|
|
|
static void spapr_phb_vfio_eeh_clear_dev_msix(PCIBus *bus,
|
|
PCIDevice *pdev,
|
|
void *opaque)
|
|
{
|
|
/* Check if the device is VFIO PCI device */
|
|
if (!object_dynamic_cast(OBJECT(pdev), "vfio-pci")) {
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* The MSIx table will be cleaned out by reset. We need
|
|
* disable it so that it can be reenabled properly. Also,
|
|
* the cached MSIx table should be cleared as it's not
|
|
* reflecting the contents in hardware.
|
|
*/
|
|
if (msix_enabled(pdev)) {
|
|
uint16_t flags;
|
|
|
|
flags = pci_host_config_read_common(pdev,
|
|
pdev->msix_cap + PCI_MSIX_FLAGS,
|
|
pci_config_size(pdev), 2);
|
|
flags &= ~PCI_MSIX_FLAGS_ENABLE;
|
|
pci_host_config_write_common(pdev,
|
|
pdev->msix_cap + PCI_MSIX_FLAGS,
|
|
pci_config_size(pdev), flags, 2);
|
|
}
|
|
|
|
msix_reset(pdev);
|
|
}
|
|
|
|
static void spapr_phb_vfio_eeh_clear_bus_msix(PCIBus *bus, void *opaque)
|
|
{
|
|
pci_for_each_device(bus, pci_bus_num(bus),
|
|
spapr_phb_vfio_eeh_clear_dev_msix, NULL);
|
|
}
|
|
|
|
static void spapr_phb_vfio_eeh_pre_reset(SpaprPhbState *sphb)
|
|
{
|
|
PCIHostState *phb = PCI_HOST_BRIDGE(sphb);
|
|
|
|
pci_for_each_bus(phb->bus, spapr_phb_vfio_eeh_clear_bus_msix, NULL);
|
|
}
|
|
|
|
int spapr_phb_vfio_eeh_reset(SpaprPhbState *sphb, int option)
|
|
{
|
|
uint32_t op;
|
|
int ret;
|
|
|
|
switch (option) {
|
|
case RTAS_SLOT_RESET_DEACTIVATE:
|
|
op = VFIO_EEH_PE_RESET_DEACTIVATE;
|
|
break;
|
|
case RTAS_SLOT_RESET_HOT:
|
|
spapr_phb_vfio_eeh_pre_reset(sphb);
|
|
op = VFIO_EEH_PE_RESET_HOT;
|
|
break;
|
|
case RTAS_SLOT_RESET_FUNDAMENTAL:
|
|
spapr_phb_vfio_eeh_pre_reset(sphb);
|
|
op = VFIO_EEH_PE_RESET_FUNDAMENTAL;
|
|
break;
|
|
default:
|
|
return RTAS_OUT_PARAM_ERROR;
|
|
}
|
|
|
|
ret = vfio_eeh_as_op(&sphb->iommu_as, op);
|
|
if (ret < 0) {
|
|
return RTAS_OUT_HW_ERROR;
|
|
}
|
|
|
|
return RTAS_OUT_SUCCESS;
|
|
}
|
|
|
|
int spapr_phb_vfio_eeh_configure(SpaprPhbState *sphb)
|
|
{
|
|
int ret;
|
|
|
|
ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_CONFIGURE);
|
|
if (ret < 0) {
|
|
return RTAS_OUT_PARAM_ERROR;
|
|
}
|
|
|
|
return RTAS_OUT_SUCCESS;
|
|
}
|