Re: [Qemu-devel] [RFC PATCH 3/5] vfio/quirks: Automatic ioeventfd enabling for NVIDIA BAR0 quirks

2018-02-08 Thread Auger Eric
Hi Alex,

On 08/02/18 19:24, Alex Williamson wrote:
> On Thu, 8 Feb 2018 12:10:02 +0100
> Auger Eric  wrote:
> 
>> Hi Alex,
>>
>> On 07/02/18 01:26, Alex Williamson wrote:
>>> Record data writes that come through the NVIDIA BAR0 quirk, if we get
>>> enough in a row that we're only passing through, automatically enable
>>> an ioeventfd for it.  The primary target for this is the MSI-ACK
>>> that NVIDIA uses to allow the MSI interrupt to re-trigger, which is a
>>> 4-byte write, data value 0x0 to offset 0x704 into the quirk, 0x88704
>>> into BAR0 MMIO space.  For an interrupt latency sensitive micro-
>>> benchmark, this takes us from 83% of performance versus disabling the
>>> quirk entirely (which GeForce cannot do), to to almost 90%.
>>>
>>> Signed-off-by: Alex Williamson 
>>> ---
>>>  hw/vfio/pci-quirks.c |   89 
>>> +-
>>>  hw/vfio/pci.h|2 +
>>>  2 files changed, 89 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
>>> index e4cf4ea2dd9c..e739efe601b1 100644lg  
>>
>>> --- a/hw/vfio/pci-quirks.c
>>> +++ b/hw/vfio/pci-quirks.c
>>> @@ -203,6 +203,7 @@ typedef struct VFIOConfigMirrorQuirk {
>>>  uint32_t offset;
>>>  uint8_t bar;
>>>  MemoryRegion *mem;
>>> +uint8_t data[];  
>> Do you foresee other usages of data besides the LastDataSet?
> 
> Sure, LastDataSet is just a very crude tracking mechanism, I could
> imagine some kind of device specific LRU array.  Any quirk wanting to
> add additional analytics on top of this generic quirk could make use of
> it.  I didn't want to pollute the generic quirk with LastDataSet since
> there are other users, but I also didn't want to complicate the shared
> free'ing path we have by simply adding a pointer.  Thus embedding quirk
> specific data is what I went with here.

OK
> 
>>>  } VFIOConfigMirrorQuirk;
>>>  
>>>  static uint64_t vfio_generic_quirk_mirror_read(void *opaque,
>>> @@ -297,6 +298,50 @@ static void vfio_ioeventfd_exit(VFIOIOEventFD 
>>> *ioeventfd)
>>>  g_free(ioeventfd);
>>>  }
>>>
>> add a comment? user handler in case kvm ioeventfd setup failed?
> 
> As you correctly updated later, we're only setting up the kvm-user
> ioeventfd handler in this patch.  This is the handler when that
> succeeds.  Once we add vfio ioeventfd support, this handler will
> hopefully never get used, but we still need to support kernels that
> won't have vfio ioeventfd support and this alone does still provide a
> performance improvement.
> 
>>> +static void vfio_ioeventfd_handler(void *opaque)
>>> +{
>>> +VFIOIOEventFD *ioeventfd = opaque;
>>> +
>>> +if (event_notifier_test_and_clear(>e)) {
>>> +vfio_region_write(ioeventfd->region, ioeventfd->region_addr,
>>> +  ioeventfd->data, ioeventfd->size);
>>> +}
>>> +}
>>> +
>>> +static VFIOIOEventFD *vfio_ioeventfd_init(VFIOPCIDevice *vdev,
>>> +  MemoryRegion *mr, hwaddr addr,
>>> +  unsigned size, uint64_t data,
>>> +  VFIORegion *region,
>>> +  hwaddr region_addr)
>>> +{
>>> +VFIOIOEventFD *ioeventfd = g_malloc0(sizeof(*ioeventfd));
>>> +
>>> +if (event_notifier_init(>e, 0)) {
>>> +g_free(ioeventfd);
>>> +return NULL;
>>> +}
>>> +
>>> +ioeventfd->mr = mr;
>>> +ioeventfd->addr = addr;
>>> +ioeventfd->size = size;
>>> +ioeventfd->match_data = true;
>>> +ioeventfd->data = data;
>>> +ioeventfd->region = region;
>>> +ioeventfd->region_addr = region_addr;  
>> I found difficult to follow the different addr semantic.
>> I understand region_add is the offset % bar and addr is the offset %
>> mirror region. Maybe more explicit names would help (region = bar_region
>> and region_addr = bar_offset)
> 
> I was trying to avoid PCI specific fields for VFIOIOEventFD, but
> basically we're dealing with two different sets of base and offset.
> The first is the MemoryRegion of the quirk and the offset relative to
> that MemoryRegion.  Those are used by memory_region_add_eventfd() for
> establishing the kvm ioeventfd.  The second is the region and
> region_addr, which identify the vfio region and offset relative to the
> region so that we can actually handle it with vfio_region_write().
> 
> I agree though that these are confusing and maybe comments are a
> solution as I can't think of better names:
> 
> /*
>  * MemoryRegion and relative offset, plus additional ioeventfd setup
>  * parameters for configuring and later tearing down KVM ioeventfd.
>  */
> ioeventfd->mr = mr;
> ioeventfd->addr = addr;
> ioeventfd->size = size;
> ioeventfd->match_data = true;
> ioeventfd->data = data;
> /*
>  * VFIORegion and relative offset for implementing the userspace
>  * handler.  data 

Re: [Qemu-devel] [RFC PATCH 3/5] vfio/quirks: Automatic ioeventfd enabling for NVIDIA BAR0 quirks

2018-02-08 Thread Alex Williamson
On Thu, 8 Feb 2018 12:10:02 +0100
Auger Eric  wrote:

> Hi Alex,
> 
> On 07/02/18 01:26, Alex Williamson wrote:
> > Record data writes that come through the NVIDIA BAR0 quirk, if we get
> > enough in a row that we're only passing through, automatically enable
> > an ioeventfd for it.  The primary target for this is the MSI-ACK
> > that NVIDIA uses to allow the MSI interrupt to re-trigger, which is a
> > 4-byte write, data value 0x0 to offset 0x704 into the quirk, 0x88704
> > into BAR0 MMIO space.  For an interrupt latency sensitive micro-
> > benchmark, this takes us from 83% of performance versus disabling the
> > quirk entirely (which GeForce cannot do), to to almost 90%.
> > 
> > Signed-off-by: Alex Williamson 
> > ---
> >  hw/vfio/pci-quirks.c |   89 
> > +-
> >  hw/vfio/pci.h|2 +
> >  2 files changed, 89 insertions(+), 2 deletions(-)
> > 
> > diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
> > index e4cf4ea2dd9c..e739efe601b1 100644lg  
> 
> > --- a/hw/vfio/pci-quirks.c
> > +++ b/hw/vfio/pci-quirks.c
> > @@ -203,6 +203,7 @@ typedef struct VFIOConfigMirrorQuirk {
> >  uint32_t offset;
> >  uint8_t bar;
> >  MemoryRegion *mem;
> > +uint8_t data[];  
> Do you foresee other usages of data besides the LastDataSet?

Sure, LastDataSet is just a very crude tracking mechanism, I could
imagine some kind of device specific LRU array.  Any quirk wanting to
add additional analytics on top of this generic quirk could make use of
it.  I didn't want to pollute the generic quirk with LastDataSet since
there are other users, but I also didn't want to complicate the shared
free'ing path we have by simply adding a pointer.  Thus embedding quirk
specific data is what I went with here.

> >  } VFIOConfigMirrorQuirk;
> >  
> >  static uint64_t vfio_generic_quirk_mirror_read(void *opaque,
> > @@ -297,6 +298,50 @@ static void vfio_ioeventfd_exit(VFIOIOEventFD 
> > *ioeventfd)
> >  g_free(ioeventfd);
> >  }
> >
> add a comment? user handler in case kvm ioeventfd setup failed?

As you correctly updated later, we're only setting up the kvm-user
ioeventfd handler in this patch.  This is the handler when that
succeeds.  Once we add vfio ioeventfd support, this handler will
hopefully never get used, but we still need to support kernels that
won't have vfio ioeventfd support and this alone does still provide a
performance improvement.

> > +static void vfio_ioeventfd_handler(void *opaque)
> > +{
> > +VFIOIOEventFD *ioeventfd = opaque;
> > +
> > +if (event_notifier_test_and_clear(>e)) {
> > +vfio_region_write(ioeventfd->region, ioeventfd->region_addr,
> > +  ioeventfd->data, ioeventfd->size);
> > +}
> > +}
> > +
> > +static VFIOIOEventFD *vfio_ioeventfd_init(VFIOPCIDevice *vdev,
> > +  MemoryRegion *mr, hwaddr addr,
> > +  unsigned size, uint64_t data,
> > +  VFIORegion *region,
> > +  hwaddr region_addr)
> > +{
> > +VFIOIOEventFD *ioeventfd = g_malloc0(sizeof(*ioeventfd));
> > +
> > +if (event_notifier_init(>e, 0)) {
> > +g_free(ioeventfd);
> > +return NULL;
> > +}
> > +
> > +ioeventfd->mr = mr;
> > +ioeventfd->addr = addr;
> > +ioeventfd->size = size;
> > +ioeventfd->match_data = true;
> > +ioeventfd->data = data;
> > +ioeventfd->region = region;
> > +ioeventfd->region_addr = region_addr;  
> I found difficult to follow the different addr semantic.
> I understand region_add is the offset % bar and addr is the offset %
> mirror region. Maybe more explicit names would help (region = bar_region
> and region_addr = bar_offset)

I was trying to avoid PCI specific fields for VFIOIOEventFD, but
basically we're dealing with two different sets of base and offset.
The first is the MemoryRegion of the quirk and the offset relative to
that MemoryRegion.  Those are used by memory_region_add_eventfd() for
establishing the kvm ioeventfd.  The second is the region and
region_addr, which identify the vfio region and offset relative to the
region so that we can actually handle it with vfio_region_write().

I agree though that these are confusing and maybe comments are a
solution as I can't think of better names:

/*
 * MemoryRegion and relative offset, plus additional ioeventfd setup
 * parameters for configuring and later tearing down KVM ioeventfd.
 */
ioeventfd->mr = mr;
ioeventfd->addr = addr;
ioeventfd->size = size;
ioeventfd->match_data = true;
ioeventfd->data = data;
/*
 * VFIORegion and relative offset for implementing the userspace
 * handler.  data & size fields shared for both uses.
 */
ioeventfd->region = region;
ioeventfd->region_addr = region_addr;


> > +
> > +

Re: [Qemu-devel] [RFC PATCH 3/5] vfio/quirks: Automatic ioeventfd enabling for NVIDIA BAR0 quirks

2018-02-08 Thread Auger Eric
Hi Alex,

On 08/02/18 12:10, Auger Eric wrote:
> Hi Alex,
> 
> On 07/02/18 01:26, Alex Williamson wrote:
>> Record data writes that come through the NVIDIA BAR0 quirk, if we get
>> enough in a row that we're only passing through, automatically enable
>> an ioeventfd for it.  The primary target for this is the MSI-ACK
>> that NVIDIA uses to allow the MSI interrupt to re-trigger, which is a
>> 4-byte write, data value 0x0 to offset 0x704 into the quirk, 0x88704
>> into BAR0 MMIO space.  For an interrupt latency sensitive micro-
>> benchmark, this takes us from 83% of performance versus disabling the
>> quirk entirely (which GeForce cannot do), to to almost 90%.
>>
>> Signed-off-by: Alex Williamson 
>> ---
>>  hw/vfio/pci-quirks.c |   89 
>> +-
>>  hw/vfio/pci.h|2 +
>>  2 files changed, 89 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
>> index e4cf4ea2dd9c..e739efe601b1 100644lg
> 
>> --- a/hw/vfio/pci-quirks.c
>> +++ b/hw/vfio/pci-quirks.c
>> @@ -203,6 +203,7 @@ typedef struct VFIOConfigMirrorQuirk {
>>  uint32_t offset;
>>  uint8_t bar;
>>  MemoryRegion *mem;
>> +uint8_t data[];
> Do you foresee other usages of data besides the LastDataSet?
>>  } VFIOConfigMirrorQuirk;
>>  
>>  static uint64_t vfio_generic_quirk_mirror_read(void *opaque,
>> @@ -297,6 +298,50 @@ static void vfio_ioeventfd_exit(VFIOIOEventFD 
>> *ioeventfd)
>>  g_free(ioeventfd);
>>  }
>>  
> add a comment? user handler in case kvm ioeventfd setup failed?
Forget that. I got confused. At this point you set an ioeventfd which
must be handled on user space. In last patch you plug the kernel vfio
handler through the new iotcl and only in case this fails you use the
userspace handler. Hope I got it right.

Eric


>> +static void vfio_ioeventfd_handler(void *opaque)
>> +{
>> +VFIOIOEventFD *ioeventfd = opaque;
>> +
>> +if (event_notifier_test_and_clear(>e)) {
>> +vfio_region_write(ioeventfd->region, ioeventfd->region_addr,
>> +  ioeventfd->data, ioeventfd->size);
>> +}
>> +}
>> +
>> +static VFIOIOEventFD *vfio_ioeventfd_init(VFIOPCIDevice *vdev,
>> +  MemoryRegion *mr, hwaddr addr,
>> +  unsigned size, uint64_t data,
>> +  VFIORegion *region,
>> +  hwaddr region_addr)
>> +{
>> +VFIOIOEventFD *ioeventfd = g_malloc0(sizeof(*ioeventfd));
>> +
>> +if (event_notifier_init(>e, 0)) {
>> +g_free(ioeventfd);
>> +return NULL;
>> +}
>> +
>> +ioeventfd->mr = mr;
>> +ioeventfd->addr = addr;
>> +ioeventfd->size = size;
>> +ioeventfd->match_data = true;
>> +ioeventfd->data = data;
>> +ioeventfd->region = region;
>> +ioeventfd->region_addr = region_addr;
> I found difficult to follow the different addr semantic.
> I understand region_add is the offset % bar and addr is the offset %
> mirror region. Maybe more explicit names would help (region = bar_region
> and region_addr = bar_offset)
>> +
>> +qemu_set_fd_handler(event_notifier_get_fd(>e),
>> +vfio_ioeventfd_handler, NULL, ioeventfd);
>> +memory_region_add_eventfd(ioeventfd->mr, ioeventfd->addr,
>> +  ioeventfd->size, ioeventfd->match_data,
>> +  ioeventfd->data, >e);
>> +
>> +info_report("Enabled automatic ioeventfd acceleration for %s region %d, 
>> "
>> +"offset 0x%"HWADDR_PRIx", data 0x%"PRIx64", size %u",
>> +vdev->vbasedev.name, region->nr, region_addr, data, size);
>> +
>> +return ioeventfd;
>> +}
>> +
>>  static void vfio_vga_probe_ati_3c3_quirk(VFIOPCIDevice *vdev)
>>  {
>>  VFIOQuirk *quirk;
>> @@ -732,6 +777,13 @@ static void vfio_probe_nvidia_bar5_quirk(VFIOPCIDevice 
>> *vdev, int nr)
>>  trace_vfio_quirk_nvidia_bar5_probe(vdev->vbasedev.name);
>>  }
>>  
>> +typedef struct LastDataSet {
>> +hwaddr addr;
>> +uint64_t data;
>> +unsigned size;
>> +int count;
>> +} LastDataSet;
>> +
>>  /*
>>   * Finally, BAR0 itself.  We want to redirect any accesses to either
>>   * 0x1800 or 0x88000 through the PCI config space access functions.
>> @@ -742,6 +794,7 @@ static void vfio_nvidia_quirk_mirror_write(void *opaque, 
>> hwaddr addr,
>>  VFIOConfigMirrorQuirk *mirror = opaque;
>>  VFIOPCIDevice *vdev = mirror->vdev;
>>  PCIDevice *pdev = >pdev;
>> +LastDataSet *last = (LastDataSet *)>data;
>>  
>>  vfio_generic_quirk_mirror_write(opaque, addr, data, size);
>>  
>> @@ -756,6 +809,38 @@ static void vfio_nvidia_quirk_mirror_write(void 
>> *opaque, hwaddr addr,
>>addr + mirror->offset, data, size);
>>  trace_vfio_quirk_nvidia_bar0_msi_ack(vdev->vbasedev.name);
>>  }
>> +
>> +/*
>> + * 

Re: [Qemu-devel] [RFC PATCH 3/5] vfio/quirks: Automatic ioeventfd enabling for NVIDIA BAR0 quirks

2018-02-08 Thread Auger Eric
Hi Alex,

On 07/02/18 01:26, Alex Williamson wrote:
> Record data writes that come through the NVIDIA BAR0 quirk, if we get
> enough in a row that we're only passing through, automatically enable
> an ioeventfd for it.  The primary target for this is the MSI-ACK
> that NVIDIA uses to allow the MSI interrupt to re-trigger, which is a
> 4-byte write, data value 0x0 to offset 0x704 into the quirk, 0x88704
> into BAR0 MMIO space.  For an interrupt latency sensitive micro-
> benchmark, this takes us from 83% of performance versus disabling the
> quirk entirely (which GeForce cannot do), to to almost 90%.
> 
> Signed-off-by: Alex Williamson 
> ---
>  hw/vfio/pci-quirks.c |   89 
> +-
>  hw/vfio/pci.h|2 +
>  2 files changed, 89 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
> index e4cf4ea2dd9c..e739efe601b1 100644lg

> --- a/hw/vfio/pci-quirks.c
> +++ b/hw/vfio/pci-quirks.c
> @@ -203,6 +203,7 @@ typedef struct VFIOConfigMirrorQuirk {
>  uint32_t offset;
>  uint8_t bar;
>  MemoryRegion *mem;
> +uint8_t data[];
Do you foresee other usages of data besides the LastDataSet?
>  } VFIOConfigMirrorQuirk;
>  
>  static uint64_t vfio_generic_quirk_mirror_read(void *opaque,
> @@ -297,6 +298,50 @@ static void vfio_ioeventfd_exit(VFIOIOEventFD *ioeventfd)
>  g_free(ioeventfd);
>  }
>  
add a comment? user handler in case kvm ioeventfd setup failed?
> +static void vfio_ioeventfd_handler(void *opaque)
> +{
> +VFIOIOEventFD *ioeventfd = opaque;
> +
> +if (event_notifier_test_and_clear(>e)) {
> +vfio_region_write(ioeventfd->region, ioeventfd->region_addr,
> +  ioeventfd->data, ioeventfd->size);
> +}
> +}
> +
> +static VFIOIOEventFD *vfio_ioeventfd_init(VFIOPCIDevice *vdev,
> +  MemoryRegion *mr, hwaddr addr,
> +  unsigned size, uint64_t data,
> +  VFIORegion *region,
> +  hwaddr region_addr)
> +{
> +VFIOIOEventFD *ioeventfd = g_malloc0(sizeof(*ioeventfd));
> +
> +if (event_notifier_init(>e, 0)) {
> +g_free(ioeventfd);
> +return NULL;
> +}
> +
> +ioeventfd->mr = mr;
> +ioeventfd->addr = addr;
> +ioeventfd->size = size;
> +ioeventfd->match_data = true;
> +ioeventfd->data = data;
> +ioeventfd->region = region;
> +ioeventfd->region_addr = region_addr;
I found difficult to follow the different addr semantic.
I understand region_add is the offset % bar and addr is the offset %
mirror region. Maybe more explicit names would help (region = bar_region
and region_addr = bar_offset)
> +
> +qemu_set_fd_handler(event_notifier_get_fd(>e),
> +vfio_ioeventfd_handler, NULL, ioeventfd);
> +memory_region_add_eventfd(ioeventfd->mr, ioeventfd->addr,
> +  ioeventfd->size, ioeventfd->match_data,
> +  ioeventfd->data, >e);
> +
> +info_report("Enabled automatic ioeventfd acceleration for %s region %d, "
> +"offset 0x%"HWADDR_PRIx", data 0x%"PRIx64", size %u",
> +vdev->vbasedev.name, region->nr, region_addr, data, size);
> +
> +return ioeventfd;
> +}
> +
>  static void vfio_vga_probe_ati_3c3_quirk(VFIOPCIDevice *vdev)
>  {
>  VFIOQuirk *quirk;
> @@ -732,6 +777,13 @@ static void vfio_probe_nvidia_bar5_quirk(VFIOPCIDevice 
> *vdev, int nr)
>  trace_vfio_quirk_nvidia_bar5_probe(vdev->vbasedev.name);
>  }
>  
> +typedef struct LastDataSet {
> +hwaddr addr;
> +uint64_t data;
> +unsigned size;
> +int count;
> +} LastDataSet;
> +
>  /*
>   * Finally, BAR0 itself.  We want to redirect any accesses to either
>   * 0x1800 or 0x88000 through the PCI config space access functions.
> @@ -742,6 +794,7 @@ static void vfio_nvidia_quirk_mirror_write(void *opaque, 
> hwaddr addr,
>  VFIOConfigMirrorQuirk *mirror = opaque;
>  VFIOPCIDevice *vdev = mirror->vdev;
>  PCIDevice *pdev = >pdev;
> +LastDataSet *last = (LastDataSet *)>data;
>  
>  vfio_generic_quirk_mirror_write(opaque, addr, data, size);
>  
> @@ -756,6 +809,38 @@ static void vfio_nvidia_quirk_mirror_write(void *opaque, 
> hwaddr addr,
>addr + mirror->offset, data, size);
>  trace_vfio_quirk_nvidia_bar0_msi_ack(vdev->vbasedev.name);
>  }
> +
> +/*
> + * Automatically add an ioeventfd to handle any repeated write with the
> + * same data and size above the standard PCI config space header.  This 
> is
> + * primarily expected to accelerate the MSI-ACK behavior, such as noted
> + * above.  Current hardware/drivers should trigger an ioeventfd at config
> + * offset 0x704 (region offset 0x88704), with data 0x0, size 4.
> + */
> +if (addr > PCI_STD_HEADER_SIZEOF) {
> +