[Qemu-devel] [PATCH 0/2] ARM adaptations for vhost irqfd setup

[Qemu-devel] [PATCH 0/2] ARM adaptations for vhost irqfd setup

[Eric Auger]

After the introduction of gicv2m, This series adds missing pieces to
run VIRTIO-PCI with vhost back-end on ARM.

It is proposed to use the kvm_gsi_direct_mapping modality that sets
the irqfd gsi to the MSI data value. With that trick there is no need
to create a KVM MSI routing entry featuring a different gsi.

The only adaptation needed for ARM consists in adding an architecture
specific function that converts the MSI data field into the actual
gsi index: there is an offset of 32 between the MSI data content
(SPI ID) and the SPI index that is passed to KVM_IRQFD ioctl. Once
this is done we can set the requested flags to enable vhost:
kvm_gsi_direct_mapping, kvm_msi_via_irqfd_allowed.

This was tested on XGene, on top of Christoffer's series,
[PATCH 0/3] Add support for for GICv2m and MSIs to arm-virt
(https://lists.gnu.org/archive/html/qemu-devel/2015-04/msg00881.html)

Best Regards

Eric

Eric Auger (2):
  kvm: introduce kvm_arch_msi_data_to_gsi
  arm_gicv2m: set kvm_gsi_direct_mapping and kvm_msi_via_irqfd_allowed

 hw/intc/arm_gicv2m.c | 2 ++
 include/sysemu/kvm.h | 2 ++
 kvm-all.c            | 2 +-
 target-arm/kvm.c     | 5 +++++
 target-i386/kvm.c    | 5 +++++
 target-mips/kvm.c    | 5 +++++
 target-ppc/kvm.c     | 5 +++++
 target-s390x/kvm.c   | 5 +++++
 8 files changed, 30 insertions(+), 1 deletion(-)

-- 
1.8.3.2

[Qemu-devel] [PATCH 1/2] kvm: introduce kvm_arch_msi_data_to_gsi

[Eric Auger]

On ARM the MSI data corresponds to the shared peripheral interrupt (SPI)
ID. This latter equals to the SPI index + 32. to retrieve the SPI index,
matching the gsi, an architecture specific function is introduced.

Signed-off-by: Eric Auger <eric.auger@linaro.org>
---
 include/sysemu/kvm.h | 2 ++
 kvm-all.c            | 2 +-
 target-arm/kvm.c     | 5 +++++
 target-i386/kvm.c    | 5 +++++
 target-mips/kvm.c    | 5 +++++
 target-ppc/kvm.c     | 5 +++++
 target-s390x/kvm.c   | 5 +++++
 7 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 197e6c0..ebd8b17 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -286,6 +286,8 @@ void kvm_arch_init_irq_routing(KVMState *s);
 int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
                              uint64_t address, uint32_t data);
 
+int kvm_arch_msi_data_to_gsi(uint32_t data);
+
 int kvm_set_irq(KVMState *s, int irq, int level);
 int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg);
 
diff --git a/kvm-all.c b/kvm-all.c
index dd44f8c..3e9675e 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1228,7 +1228,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)
     int virq;
 
     if (kvm_gsi_direct_mapping()) {
-        return msg.data & 0xffff;
+        return kvm_arch_msi_data_to_gsi(msg.data);
     }
 
     if (!kvm_gsi_routing_enabled()) {
diff --git a/target-arm/kvm.c b/target-arm/kvm.c
index fdd9ba3..05d5634 100644
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@@ -598,3 +598,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
 {
     return 0;
 }
+
+int kvm_arch_msi_data_to_gsi(uint32_t data)
+{
+    return (data - 32) & 0xffff;
+}
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 41d09e5..7c648e7 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -2764,3 +2764,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
 {
     return 0;
 }
+
+int kvm_arch_msi_data_to_gsi(uint32_t data)
+{
+    return data & 0xffff;
+}
diff --git a/target-mips/kvm.c b/target-mips/kvm.c
index 4d1f7ea..e53e059 100644
--- a/target-mips/kvm.c
+++ b/target-mips/kvm.c
@@ -694,3 +694,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
 {
     return 0;
 }
+
+int kvm_arch_msi_data_to_gsi(uint32_t data)
+{
+    return data & 0xffff;
+}
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 12328a4..53569f6 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -2408,3 +2408,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
 {
     return 0;
 }
+
+int kvm_arch_msi_data_to_gsi(uint32_t data)
+{
+    return data & 0xffff;
+}
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index b48c643..6509aff 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -1940,3 +1940,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
     route->u.adapter.adapter_id = pbdev->routes.adapter.adapter_id;
     return 0;
 }
+
+int kvm_arch_msi_data_to_gsi(uint32_t data)
+{
+    return data & 0xffff;
+}
-- 
1.8.3.2

[Qemu-devel] [PATCH 2/2] arm_gicv2m: set kvm_gsi_direct_mapping and kvm_msi_via_irqfd_allowed

[Eric Auger]

After introduction of kvm_arch_msi_data_to_gsi, kvm_gsi_direct_mapping
now can be set on ARM. Also kvm_msi_via_irqfd_allowed can be set,
depending on kernel irqfd support, hence enabling VIRTIO-PCI with
vhost back-end.

Signed-off-by: Eric Auger <eric.auger@linaro.org>
---
 hw/intc/arm_gicv2m.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c
index a80a16d..7c6bea2 100644
--- a/hw/intc/arm_gicv2m.c
+++ b/hw/intc/arm_gicv2m.c
@@ -138,6 +138,8 @@ static void gicv2m_realize(DeviceState *dev, Error **errp)
     }
 
     msi_supported = true;
+    kvm_gsi_direct_mapping = true;
+    kvm_msi_via_irqfd_allowed = kvm_irqfds_enabled();
 }
 
 static void gicv2m_init(Object *obj)
-- 
1.8.3.2

Re: [Qemu-devel] [PATCH 1/2] kvm: introduce kvm_arch_msi_data_to_gsi

[Paolo Bonzini]

On 09/04/2015 17:20, Eric Auger wrote:
> On ARM the MSI data corresponds to the shared peripheral interrupt (SPI)
> ID. This latter equals to the SPI index + 32. to retrieve the SPI index,
> matching the gsi, an architecture specific function is introduced.
> 
> Signed-off-by: Eric Auger <eric.auger@linaro.org>
> ---
>  include/sysemu/kvm.h | 2 ++
>  kvm-all.c            | 2 +-
>  target-arm/kvm.c     | 5 +++++
>  target-i386/kvm.c    | 5 +++++
>  target-mips/kvm.c    | 5 +++++
>  target-ppc/kvm.c     | 5 +++++
>  target-s390x/kvm.c   | 5 +++++

Please abort on i386/mips/s390x, as they do not set
kvm_gsi_direct_mapping(); ok with this change.

Paolo

>  7 files changed, 28 insertions(+), 1 deletion(-)
> 
> diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
> index 197e6c0..ebd8b17 100644
> --- a/include/sysemu/kvm.h
> +++ b/include/sysemu/kvm.h
> @@ -286,6 +286,8 @@ void kvm_arch_init_irq_routing(KVMState *s);
>  int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
>                               uint64_t address, uint32_t data);
>  
> +int kvm_arch_msi_data_to_gsi(uint32_t data);
> +
>  int kvm_set_irq(KVMState *s, int irq, int level);
>  int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg);
>  
> diff --git a/kvm-all.c b/kvm-all.c
> index dd44f8c..3e9675e 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -1228,7 +1228,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)
>      int virq;
>  
>      if (kvm_gsi_direct_mapping()) {
> -        return msg.data & 0xffff;
> +        return kvm_arch_msi_data_to_gsi(msg.data);
>      }
>  
>      if (!kvm_gsi_routing_enabled()) {
> diff --git a/target-arm/kvm.c b/target-arm/kvm.c
> index fdd9ba3..05d5634 100644
> --- a/target-arm/kvm.c
> +++ b/target-arm/kvm.c
> @@ -598,3 +598,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
>  {
>      return 0;
>  }
> +
> +int kvm_arch_msi_data_to_gsi(uint32_t data)
> +{
> +    return (data - 32) & 0xffff;
> +}
> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index 41d09e5..7c648e7 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -2764,3 +2764,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
>  {
>      return 0;
>  }
> +
> +int kvm_arch_msi_data_to_gsi(uint32_t data)
> +{
> +    return data & 0xffff;
> +}
> diff --git a/target-mips/kvm.c b/target-mips/kvm.c
> index 4d1f7ea..e53e059 100644
> --- a/target-mips/kvm.c
> +++ b/target-mips/kvm.c
> @@ -694,3 +694,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
>  {
>      return 0;
>  }
> +
> +int kvm_arch_msi_data_to_gsi(uint32_t data)
> +{
> +    return data & 0xffff;
> +}
> diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
> index 12328a4..53569f6 100644
> --- a/target-ppc/kvm.c
> +++ b/target-ppc/kvm.c
> @@ -2408,3 +2408,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
>  {
>      return 0;
>  }
> +
> +int kvm_arch_msi_data_to_gsi(uint32_t data)
> +{
> +    return data & 0xffff;
> +}
> diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
> index b48c643..6509aff 100644
> --- a/target-s390x/kvm.c
> +++ b/target-s390x/kvm.c
> @@ -1940,3 +1940,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
>      route->u.adapter.adapter_id = pbdev->routes.adapter.adapter_id;
>      return 0;
>  }
> +
> +int kvm_arch_msi_data_to_gsi(uint32_t data)
> +{
> +    return data & 0xffff;
> +}
> 

Re: [Qemu-devel] [PATCH 1/2] kvm: introduce kvm_arch_msi_data_to_gsi

[Eric Auger]

Hi Paolo,
On 04/09/2015 06:49 PM, Paolo Bonzini wrote:
> 
> 
> On 09/04/2015 17:20, Eric Auger wrote:
>> On ARM the MSI data corresponds to the shared peripheral interrupt (SPI)
>> ID. This latter equals to the SPI index + 32. to retrieve the SPI index,
>> matching the gsi, an architecture specific function is introduced.
>>
>> Signed-off-by: Eric Auger <eric.auger@linaro.org>
>> ---
>>  include/sysemu/kvm.h | 2 ++
>>  kvm-all.c            | 2 +-
>>  target-arm/kvm.c     | 5 +++++
>>  target-i386/kvm.c    | 5 +++++
>>  target-mips/kvm.c    | 5 +++++
>>  target-ppc/kvm.c     | 5 +++++
>>  target-s390x/kvm.c   | 5 +++++
> 
> Please abort on i386/mips/s390x, as they do not set
> kvm_gsi_direct_mapping();
Sure

 ok with this change.

OK Thanks

Eric
> 
> Paolo
> 
>>  7 files changed, 28 insertions(+), 1 deletion(-)
>>
>> diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
>> index 197e6c0..ebd8b17 100644
>> --- a/include/sysemu/kvm.h
>> +++ b/include/sysemu/kvm.h
>> @@ -286,6 +286,8 @@ void kvm_arch_init_irq_routing(KVMState *s);
>>  int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
>>                               uint64_t address, uint32_t data);
>>  
>> +int kvm_arch_msi_data_to_gsi(uint32_t data);
>> +
>>  int kvm_set_irq(KVMState *s, int irq, int level);
>>  int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg);
>>  
>> diff --git a/kvm-all.c b/kvm-all.c
>> index dd44f8c..3e9675e 100644
>> --- a/kvm-all.c
>> +++ b/kvm-all.c
>> @@ -1228,7 +1228,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)
>>      int virq;
>>  
>>      if (kvm_gsi_direct_mapping()) {
>> -        return msg.data & 0xffff;
>> +        return kvm_arch_msi_data_to_gsi(msg.data);
>>      }
>>  
>>      if (!kvm_gsi_routing_enabled()) {
>> diff --git a/target-arm/kvm.c b/target-arm/kvm.c
>> index fdd9ba3..05d5634 100644
>> --- a/target-arm/kvm.c
>> +++ b/target-arm/kvm.c
>> @@ -598,3 +598,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
>>  {
>>      return 0;
>>  }
>> +
>> +int kvm_arch_msi_data_to_gsi(uint32_t data)
>> +{
>> +    return (data - 32) & 0xffff;
>> +}
>> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
>> index 41d09e5..7c648e7 100644
>> --- a/target-i386/kvm.c
>> +++ b/target-i386/kvm.c
>> @@ -2764,3 +2764,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
>>  {
>>      return 0;
>>  }
>> +
>> +int kvm_arch_msi_data_to_gsi(uint32_t data)
>> +{
>> +    return data & 0xffff;
>> +}
>> diff --git a/target-mips/kvm.c b/target-mips/kvm.c
>> index 4d1f7ea..e53e059 100644
>> --- a/target-mips/kvm.c
>> +++ b/target-mips/kvm.c
>> @@ -694,3 +694,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
>>  {
>>      return 0;
>>  }
>> +
>> +int kvm_arch_msi_data_to_gsi(uint32_t data)
>> +{
>> +    return data & 0xffff;
>> +}
>> diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
>> index 12328a4..53569f6 100644
>> --- a/target-ppc/kvm.c
>> +++ b/target-ppc/kvm.c
>> @@ -2408,3 +2408,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
>>  {
>>      return 0;
>>  }
>> +
>> +int kvm_arch_msi_data_to_gsi(uint32_t data)
>> +{
>> +    return data & 0xffff;
>> +}
>> diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
>> index b48c643..6509aff 100644
>> --- a/target-s390x/kvm.c
>> +++ b/target-s390x/kvm.c
>> @@ -1940,3 +1940,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
>>      route->u.adapter.adapter_id = pbdev->routes.adapter.adapter_id;
>>      return 0;
>>  }
>> +
>> +int kvm_arch_msi_data_to_gsi(uint32_t data)
>> +{
>> +    return data & 0xffff;
>> +}
>>