From: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
To: Alex Williamson <alex.williamson@redhat.com>,
Cao jin <caoj.fnst@cn.fujitsu.com>,
qemu-devel@nongnu.org
Cc: mst@redhat.com
Subject: Re: [Qemu-devel] [PATCH v14 Resend 08/13] vfio: add check host bus reset is support or not
Date: Fri, 18 Dec 2015 09:14:28 +0800 [thread overview]
Message-ID: <56735DF4.5030009@cn.fujitsu.com> (raw)
In-Reply-To: <1450384325.2674.112.camel@redhat.com>
On 12/18/2015 04:32 AM, Alex Williamson wrote:
> On Thu, 2015-12-17 at 09:41 +0800, Cao jin wrote:
>> From: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
>>
>> when init vfio devices done, we should test all the devices supported
>> aer whether conflict with others. For each one, get the hot reset
>> info for the affected device list. For each affected device, all
>> should attach to the VM and on/below the same bus. also, we should test
>> all of the non-AER supporting vfio-pci devices on or below the target
>> bus to verify they have a reset mechanism.
>>
>> Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
>> ---
>> hw/vfio/pci.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
>> hw/vfio/pci.h | 1 +
>> 2 files changed, 230 insertions(+), 7 deletions(-)
>>
>> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
>> index d00b0e4..6926dcc 100644
>> --- a/hw/vfio/pci.c
>> +++ b/hw/vfio/pci.c
>> @@ -1806,6 +1806,216 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos)
>> return 0;
>> }
>>
>> +static bool vfio_pci_host_slot_match(PCIHostDeviceAddress *host1,
>> + PCIHostDeviceAddress *host2)
>> +{
>> + return (host1->domain == host2->domain && host1->bus == host2->bus &&
>> + host1->slot == host2->slot);
>> +}
>> +
>> +static bool vfio_pci_host_match(PCIHostDeviceAddress *host1,
>> + PCIHostDeviceAddress *host2)
>> +{
>> + return (vfio_pci_host_slot_match(host1, host2) &&
>> + host1->function == host2->function);
>> +}
>> +
>> +struct VFIODeviceFind {
>> + PCIDevice *pdev;
>> + bool found;
>> +};
>> +
>> +static void vfio_check_device_noreset(PCIBus *bus, PCIDevice *pdev,
>> + void *opaque)
>> +{
>> + DeviceState *dev = DEVICE(pdev);
>> + DeviceClass *dc = DEVICE_GET_CLASS(dev);
>> + VFIOPCIDevice *vdev;
>> + struct VFIODeviceFind *find = opaque;
>> +
>> + if (find->found) {
>> + return;
>> + }
>> +
>> + if (!object_dynamic_cast(OBJECT(dev), "vfio-pci")) {
>> + if (!dc->reset) {
>> + goto found;
>> + }
>> + return;
>> + }
>> + vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);
>> + if (!(vdev->features & VFIO_FEATURE_ENABLE_AER) &&
>> + !vdev->vbasedev.reset_works) {
>> + goto found;
>> + }
>> +
>> + return;
>> +found:
>> + find->pdev = pdev;
>> + find->found = true;
>> +}
>> +
>> +static void device_find(PCIBus *bus, PCIDevice *pdev, void *opaque)
>> +{
>> + struct VFIODeviceFind *find = opaque;
>> +
>> + if (find->found) {
>> + return;
>> + }
>> +
>> + if (pdev == find->pdev) {
>> + find->found = true;
>> + }
>> +}
>> +
>> +static int vfio_check_host_bus_reset(VFIOPCIDevice *vdev)
>> +{
>> + PCIBus *bus = vdev->pdev.bus;
>> + struct vfio_pci_hot_reset_info *info = NULL;
>> + struct vfio_pci_dependent_device *devices;
>> + VFIOGroup *group;
>> + struct VFIODeviceFind find;
>> + int ret, i;
>> +
>> + ret = vfio_get_hot_reset_info(vdev, &info);
>> + if (ret) {
>> + error_report("vfio: Cannot enable AER for device %s,"
>> + " device does not support hot reset.",
>> + vdev->vbasedev.name);
>> + goto out;
>> + }
>> +
>> + /* List all affected devices by bus reset */
>> + devices = &info->devices[0];
>> +
>> + /* Verify that we have all the groups required */
>> + for (i = 0; i < info->count; i++) {
>> + PCIHostDeviceAddress host;
>> + VFIOPCIDevice *tmp;
>> + VFIODevice *vbasedev_iter;
>> + bool found = false;
>> +
>> + host.domain = devices[i].segment;
>> + host.bus = devices[i].bus;
>> + host.slot = PCI_SLOT(devices[i].devfn);
>> + host.function = PCI_FUNC(devices[i].devfn);
>> +
>> + /* Skip the current device */
>> + if (vfio_pci_host_match(&host, &vdev->host)) {
>> + continue;
>> + }
>> +
>> + /* Ensure we own the group of the affected device */
>> + QLIST_FOREACH(group, &vfio_group_list, next) {
>> + if (group->groupid == devices[i].group_id) {
>> + break;
>> + }
>> + }
>> +
>> + if (!group) {
>> + error_report("vfio: Cannot enable AER for device %s, "
>> + "depends on group %d which is not owned.",
>> + vdev->vbasedev.name, devices[i].group_id);
>> + ret = -1;
>> + goto out;
>> + }
>> +
>> + /* Ensure affected devices for reset on/blow the bus */
>> + QLIST_FOREACH(vbasedev_iter, &group->device_list, next) {
>> + if (vbasedev_iter->type != VFIO_DEVICE_TYPE_PCI) {
>> + continue;
>> + }
>> + tmp = container_of(vbasedev_iter, VFIOPCIDevice, vbasedev);
>> + if (vfio_pci_host_match(&host, &tmp->host)) {
>> + PCIDevice *pci = PCI_DEVICE(tmp);
>> +
>> + /*
>> + * For multifunction device, due to vfio driver signal all
>> + * functions under the upstream link of the end point. here
>> + * we validate all functions whether enable AER.
>> + */
>> + if (vfio_pci_host_slot_match(&vdev->host, &tmp->host) &&
>> + !(tmp->features & VFIO_FEATURE_ENABLE_AER)) {
>> + error_report("vfio: Cannot enable AER for device %s, on same slot"
>> + " the dependent device %s which does not enable AER.",
>> + vdev->vbasedev.name, tmp->vbasedev.name);
>> + ret = -1;
>> + goto out;
>> + }
> It took me a while to understand this code block, so I've updated the
> comment to read as follows:
>
> /*
> * AER errors may be broadcast to all functions of a multi-
> * function endpoint. If any of those sibling functions are
> * also assigned, they need to have AER enabled or else an
> * error may continue to cause a vm_stop condition. IOW,
> * AER setup of this function would be pointless.
> */
>
> Does that match your intention?
Yes, this is the code's mean. your explanation is much better, I will
update the common in next version.
Thanks,
Chen
>
>> +
>> + find.pdev = pci;
>> + find.found = false;
>> + pci_for_each_device(bus, pci_bus_num(bus),
>> + device_find, &find);
>> + if (!find.found) {
>> + error_report("vfio: Cannot enable AER for device %s, "
>> + "the dependent device %s is not under the same bus",
>> + vdev->vbasedev.name, tmp->vbasedev.name);
>> + ret = -1;
>> + goto out;
>> + }
>> + found = true;
>> + break;
>> + }
>> + }
>> +
>> + /* Ensure all affected devices assigned to VM */
>> + if (!found) {
>> + error_report("vfio: Cannot enable AER for device %s, "
>> + "the dependent device %04x:%02x:%02x.%x "
>> + "is not assigned to VM.",
>> + vdev->vbasedev.name, host.domain, host.bus,
>> + host.slot, host.function);
>> + ret = -1;
>> + goto out;
>> + }
>> + }
>> +
>> + /*
>> + * Check the all pci devices on or below the target bus
>> + * have a reset mechanism at least.
>> + */
>> + find.pdev = NULL;
>> + find.found = false;
>> + pci_for_each_device(bus, pci_bus_num(bus),
>> + vfio_check_device_noreset, &find);
>> + if (find.found) {
>> + error_report("vfio: Cannot enable AER for device %s, "
>> + "the affected device %s does not have a reset mechanism.",
>> + vdev->vbasedev.name, find.pdev->name);
>> + ret = -1;
>> + goto out;
>> + }
>> +
>> + ret = 0;
>> +out:
>> + g_free(info);
>> + return ret;
>> +}
>> +
>> +static int vfio_check_devices_host_bus_reset(void)
>> +{
>> + VFIOGroup *group;
>> + VFIODevice *vbasedev;
>> + VFIOPCIDevice *vdev;
>> +
>> + /* Check All vfio-pci devices if have bus reset capability */
>> + QLIST_FOREACH(group, &vfio_group_list, next) {
>> + QLIST_FOREACH(vbasedev, &group->device_list, next) {
>> + if (vbasedev->type != VFIO_DEVICE_TYPE_PCI) {
>> + continue;
>> + }
>> + vdev = container_of(vbasedev, VFIOPCIDevice, vbasedev);
>> + if ((vdev->features & VFIO_FEATURE_ENABLE_AER) &&
>> + vfio_check_host_bus_reset(vdev)) {
>> + return -1;
>> + }
>> + }
>> + }
>> +
>> + return 0;
>> +}
>> +
>> static int vfio_setup_aer(VFIOPCIDevice *vdev, uint8_t cap_ver,
>> int pos, uint16_t size)
>> {
>> @@ -1983,13 +2193,6 @@ static void vfio_pci_post_reset(VFIOPCIDevice *vdev)
>> vfio_intx_enable(vdev);
>> }
>>
>> -static bool vfio_pci_host_match(PCIHostDeviceAddress *host1,
>> - PCIHostDeviceAddress *host2)
>> -{
>> - return (host1->domain == host2->domain && host1->bus == host2->bus &&
>> - host1->slot == host2->slot && host1->function == host2->function);
>> -}
>> -
>> static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single)
>> {
>> VFIOGroup *group;
>> @@ -2495,6 +2698,20 @@ static void vfio_unregister_req_notifier(VFIOPCIDevice *vdev)
>> vdev->req_enabled = false;
>> }
>>
>> +static void vfio_pci_machine_done_notify(Notifier *notifier, void *unused)
>> +{
>> + int ret;
>> +
>> + ret = vfio_check_devices_host_bus_reset();
>> + if (ret) {
>> + exit(1);
>> + }
>> +}
>> +
>> +static Notifier machine_notifier = {
>> + .notify = vfio_pci_machine_done_notify,
>> +};
>> +
>> static int vfio_initfn(PCIDevice *pdev)
>> {
>> VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);
>> @@ -2841,6 +3058,11 @@ static const TypeInfo vfio_pci_dev_info = {
>> static void register_vfio_pci_dev_type(void)
>> {
>> type_register_static(&vfio_pci_dev_info);
>> + /*
>> + * Register notifier when machine init is done, since we need
>> + * check the configration manner after all vfio device are inited.
>> + */
>> + qemu_add_machine_init_done_notifier(&machine_notifier);
>> }
>>
>> type_init(register_vfio_pci_dev_type)
>> diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
>> index 48c1f69..59ae194 100644
>> --- a/hw/vfio/pci.h
>> +++ b/hw/vfio/pci.h
>> @@ -15,6 +15,7 @@
>> #include "qemu-common.h"
>> #include "exec/memory.h"
>> #include "hw/pci/pci.h"
>> +#include "hw/pci/pci_bus.h"
>> #include "hw/pci/pci_bridge.h"
>> #include "hw/vfio/vfio-common.h"
>> #include "qemu/event_notifier.h"
>
>
> .
>
next prev parent reply other threads:[~2015-12-18 1:21 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-17 8:41 [Qemu-devel] [PATCH v14 00/13] vfio-pci: pass the aer error to guest Cao jin
2015-11-17 8:41 ` [Qemu-devel] [PATCH v14 01/13] vfio: extract vfio_get_hot_reset_info as a single function Cao jin
2015-11-17 8:41 ` [Qemu-devel] [PATCH v14 02/13] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset Cao jin
2015-11-17 8:41 ` [Qemu-devel] [PATCH v14 03/13] pcie: modify the capability size assert Cao jin
2015-11-17 8:41 ` [Qemu-devel] [PATCH v14 04/13] vfio: make the 4 bytes aligned for capability size Cao jin
2015-11-17 8:41 ` [Qemu-devel] [PATCH v14 05/13] vfio: add pcie extanded capability support Cao jin
2015-11-17 8:41 ` [Qemu-devel] [PATCH v14 06/13] aer: impove pcie_aer_init to support vfio device Cao jin
2015-11-17 8:41 ` [Qemu-devel] [PATCH v14 07/13] vfio: add aer support for " Cao jin
2015-11-17 8:41 ` [Qemu-devel] [PATCH v14 08/13] vfio: add check host bus reset is support or not Cao jin
2015-12-17 20:32 ` [Qemu-devel] [PATCH v14 Resend " Alex Williamson
2015-12-18 1:14 ` Chen Fan [this message]
2015-12-24 14:32 ` Michael S. Tsirkin
2015-12-24 17:47 ` Alex Williamson
2015-12-24 18:06 ` Michael S. Tsirkin
2015-12-24 18:20 ` Alex Williamson
2015-12-24 18:23 ` Michael S. Tsirkin
2015-12-24 18:41 ` Alex Williamson
2015-12-24 19:42 ` Michael S. Tsirkin
2015-11-17 8:42 ` [Qemu-devel] [PATCH v14 09/13] add check reset mechanism when hotplug vfio device Cao jin
2015-12-17 20:32 ` [Qemu-devel] [PATCH v14 Resend " Alex Williamson
2015-11-17 8:42 ` [Qemu-devel] [PATCH v14 10/13] pci: add pci device pre-post reset callbacks for host bus reset Cao jin
2015-12-17 20:31 ` [Qemu-devel] [PATCH v14 Resend " Alex Williamson
2015-12-18 3:29 ` Chen Fan
2015-12-21 21:07 ` Alex Williamson
2015-12-22 7:18 ` Chen Fan
2015-12-24 5:10 ` Chen Fan
2015-12-24 14:34 ` Michael S. Tsirkin
2015-12-25 1:18 ` Chen Fan
2015-12-23 12:00 ` Michael S. Tsirkin
2015-12-24 5:14 ` Chen Fan
2015-11-17 8:42 ` [Qemu-devel] [PATCH v14 11/13] pcie_aer: expose pcie_aer_msg() interface Cao jin
2015-11-17 8:42 ` [Qemu-devel] [PATCH v14 12/13] vfio-pci: pass the aer error to guest Cao jin
2015-11-17 8:42 ` [Qemu-devel] [PATCH v14 13/13] vfio: add 'aer' property to expose aercap Cao jin
2015-11-18 17:06 ` [Qemu-devel] [PATCH v14 00/13] vfio-pci: pass the aer error to guest Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56735DF4.5030009@cn.fujitsu.com \
--to=chen.fan.fnst@cn.fujitsu.com \
--cc=alex.williamson@redhat.com \
--cc=caoj.fnst@cn.fujitsu.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.