* [PATCH v4 1/4] kvm: Update kernel headers against kvm.git
2012-03-08 10:10 [PATCH v4 0/4] qemu-kvm: pci-assign: Host IRQ sharing suppport Jan Kiszka
@ 2012-03-08 10:10 ` Jan Kiszka
2012-04-05 9:44 ` Michael S. Tsirkin
2012-03-08 10:10 ` [PATCH v4 2/4] kvm: Introduce kvm_has_intx_set_mask Jan Kiszka
` (4 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Jan Kiszka @ 2012-03-08 10:10 UTC (permalink / raw)
To: Avi Kivity, Marcelo Tosatti; +Cc: kvm, Alex Williamson, Michael S. Tsirkin
Required for INTx masking / host IRQ sharing support of assigned
devices.
Corresponding kvm.git hash: 186195928e
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
| 2 ++
| 6 ++++++
2 files changed, 8 insertions(+), 0 deletions(-)
--git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
index 9acbde4..9607667 100644
--- a/linux-headers/asm-s390/kvm.h
+++ b/linux-headers/asm-s390/kvm.h
@@ -44,10 +44,12 @@ struct kvm_guest_debug_arch {
#define KVM_SYNC_PREFIX (1UL << 0)
#define KVM_SYNC_GPRS (1UL << 1)
#define KVM_SYNC_ACRS (1UL << 2)
+#define KVM_SYNC_CRS (1UL << 3)
/* definition of registers in kvm_run */
struct kvm_sync_regs {
__u64 prefix; /* prefix register */
__u64 gprs[16]; /* general purpose registers */
__u32 acrs[16]; /* access registers */
+ __u64 crs[16]; /* control registers */
};
#endif
--git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
index f6b5343..cf7b098 100644
--- a/linux-headers/linux/kvm.h
+++ b/linux-headers/linux/kvm.h
@@ -588,6 +588,7 @@ struct kvm_ppc_pvinfo {
#define KVM_CAP_TSC_DEADLINE_TIMER 72
#define KVM_CAP_S390_UCONTROL 73
#define KVM_CAP_SYNC_REGS 74
+#define KVM_CAP_PCI_2_3 75
#ifdef KVM_CAP_IRQ_ROUTING
@@ -784,6 +785,9 @@ struct kvm_s390_ucas_mapping {
/* Available with KVM_CAP_TSC_CONTROL */
#define KVM_SET_TSC_KHZ _IO(KVMIO, 0xa2)
#define KVM_GET_TSC_KHZ _IO(KVMIO, 0xa3)
+/* Available with KVM_CAP_PCI_2_3 */
+#define KVM_ASSIGN_SET_INTX_MASK _IOW(KVMIO, 0xa4, \
+ struct kvm_assigned_pci_dev)
/*
* ioctls for vcpu fds
@@ -857,6 +861,8 @@ struct kvm_s390_ucas_mapping {
#define KVM_SET_ONE_REG _IOW(KVMIO, 0xac, struct kvm_one_reg)
#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)
+#define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1)
+#define KVM_DEV_ASSIGN_MASK_INTX (1 << 2)
struct kvm_assigned_pci_dev {
__u32 assigned_dev_id;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v4 1/4] kvm: Update kernel headers against kvm.git
2012-03-08 10:10 ` [PATCH v4 1/4] kvm: Update kernel headers against kvm.git Jan Kiszka
@ 2012-04-05 9:44 ` Michael S. Tsirkin
0 siblings, 0 replies; 14+ messages in thread
From: Michael S. Tsirkin @ 2012-04-05 9:44 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, Marcelo Tosatti, kvm, Alex Williamson
On Thu, Mar 08, 2012 at 11:10:24AM +0100, Jan Kiszka wrote:
> Required for INTx masking / host IRQ sharing support of assigned
> devices.
>
> Corresponding kvm.git hash: 186195928e
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> linux-headers/asm-s390/kvm.h | 2 ++
> linux-headers/linux/kvm.h | 6 ++++++
> 2 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
> index 9acbde4..9607667 100644
> --- a/linux-headers/asm-s390/kvm.h
> +++ b/linux-headers/asm-s390/kvm.h
> @@ -44,10 +44,12 @@ struct kvm_guest_debug_arch {
> #define KVM_SYNC_PREFIX (1UL << 0)
> #define KVM_SYNC_GPRS (1UL << 1)
> #define KVM_SYNC_ACRS (1UL << 2)
> +#define KVM_SYNC_CRS (1UL << 3)
> /* definition of registers in kvm_run */
> struct kvm_sync_regs {
> __u64 prefix; /* prefix register */
> __u64 gprs[16]; /* general purpose registers */
> __u32 acrs[16]; /* access registers */
> + __u64 crs[16]; /* control registers */
> };
> #endif
> diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
> index f6b5343..cf7b098 100644
> --- a/linux-headers/linux/kvm.h
> +++ b/linux-headers/linux/kvm.h
> @@ -588,6 +588,7 @@ struct kvm_ppc_pvinfo {
> #define KVM_CAP_TSC_DEADLINE_TIMER 72
> #define KVM_CAP_S390_UCONTROL 73
> #define KVM_CAP_SYNC_REGS 74
> +#define KVM_CAP_PCI_2_3 75
>
> #ifdef KVM_CAP_IRQ_ROUTING
>
> @@ -784,6 +785,9 @@ struct kvm_s390_ucas_mapping {
> /* Available with KVM_CAP_TSC_CONTROL */
> #define KVM_SET_TSC_KHZ _IO(KVMIO, 0xa2)
> #define KVM_GET_TSC_KHZ _IO(KVMIO, 0xa3)
> +/* Available with KVM_CAP_PCI_2_3 */
> +#define KVM_ASSIGN_SET_INTX_MASK _IOW(KVMIO, 0xa4, \
> + struct kvm_assigned_pci_dev)
>
> /*
> * ioctls for vcpu fds
> @@ -857,6 +861,8 @@ struct kvm_s390_ucas_mapping {
> #define KVM_SET_ONE_REG _IOW(KVMIO, 0xac, struct kvm_one_reg)
>
> #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)
> +#define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1)
> +#define KVM_DEV_ASSIGN_MASK_INTX (1 << 2)
>
> struct kvm_assigned_pci_dev {
> __u32 assigned_dev_id;
> --
> 1.7.3.4
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v4 2/4] kvm: Introduce kvm_has_intx_set_mask
2012-03-08 10:10 [PATCH v4 0/4] qemu-kvm: pci-assign: Host IRQ sharing suppport Jan Kiszka
2012-03-08 10:10 ` [PATCH v4 1/4] kvm: Update kernel headers against kvm.git Jan Kiszka
@ 2012-03-08 10:10 ` Jan Kiszka
2012-04-05 9:44 ` Michael S. Tsirkin
2012-03-08 10:10 ` [PATCH v4 3/4] pci-assign: Use PCI-2.3-based shared legacy interrupts Jan Kiszka
` (3 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Jan Kiszka @ 2012-03-08 10:10 UTC (permalink / raw)
To: Avi Kivity, Marcelo Tosatti; +Cc: kvm, Alex Williamson, Michael S. Tsirkin
Will be used by PCI device assignment code.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
kvm-all.c | 8 ++++++++
kvm.h | 1 +
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/kvm-all.c b/kvm-all.c
index 7fed5c9..471293d 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -78,6 +78,7 @@ struct KVMState
int xsave, xcrs;
int many_ioeventfds;
int pit_state2;
+ int intx_set_mask;
int irqchip_inject_ioctl;
#ifdef KVM_CAP_IRQ_ROUTING
struct kvm_irq_routing *irq_routes;
@@ -960,6 +961,8 @@ int kvm_init(void)
s->pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2);
#endif
+ s->intx_set_mask = kvm_check_extension(s, KVM_CAP_PCI_2_3);
+
ret = kvm_arch_init(s);
if (ret < 0) {
goto err;
@@ -1319,6 +1322,11 @@ int kvm_has_gsi_routing(void)
#endif
}
+int kvm_has_intx_set_mask(void)
+{
+ return kvm_state->intx_set_mask;
+}
+
int kvm_allows_irq0_override(void)
{
return !kvm_irqchip_in_kernel() || kvm_has_gsi_routing();
diff --git a/kvm.h b/kvm.h
index 43d4c68..1885be1 100644
--- a/kvm.h
+++ b/kvm.h
@@ -57,6 +57,7 @@ int kvm_has_xcrs(void);
int kvm_has_many_ioeventfds(void);
int kvm_has_pit_state2(void);
int kvm_has_gsi_routing(void);
+int kvm_has_intx_set_mask(void);
int kvm_allows_irq0_override(void);
--
1.7.3.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v4 2/4] kvm: Introduce kvm_has_intx_set_mask
2012-03-08 10:10 ` [PATCH v4 2/4] kvm: Introduce kvm_has_intx_set_mask Jan Kiszka
@ 2012-04-05 9:44 ` Michael S. Tsirkin
0 siblings, 0 replies; 14+ messages in thread
From: Michael S. Tsirkin @ 2012-04-05 9:44 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, Marcelo Tosatti, kvm, Alex Williamson
On Thu, Mar 08, 2012 at 11:10:25AM +0100, Jan Kiszka wrote:
> Will be used by PCI device assignment code.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> kvm-all.c | 8 ++++++++
> kvm.h | 1 +
> 2 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/kvm-all.c b/kvm-all.c
> index 7fed5c9..471293d 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -78,6 +78,7 @@ struct KVMState
> int xsave, xcrs;
> int many_ioeventfds;
> int pit_state2;
> + int intx_set_mask;
> int irqchip_inject_ioctl;
> #ifdef KVM_CAP_IRQ_ROUTING
> struct kvm_irq_routing *irq_routes;
> @@ -960,6 +961,8 @@ int kvm_init(void)
> s->pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2);
> #endif
>
> + s->intx_set_mask = kvm_check_extension(s, KVM_CAP_PCI_2_3);
> +
> ret = kvm_arch_init(s);
> if (ret < 0) {
> goto err;
> @@ -1319,6 +1322,11 @@ int kvm_has_gsi_routing(void)
> #endif
> }
>
> +int kvm_has_intx_set_mask(void)
> +{
> + return kvm_state->intx_set_mask;
> +}
> +
> int kvm_allows_irq0_override(void)
> {
> return !kvm_irqchip_in_kernel() || kvm_has_gsi_routing();
> diff --git a/kvm.h b/kvm.h
> index 43d4c68..1885be1 100644
> --- a/kvm.h
> +++ b/kvm.h
> @@ -57,6 +57,7 @@ int kvm_has_xcrs(void);
> int kvm_has_many_ioeventfds(void);
> int kvm_has_pit_state2(void);
> int kvm_has_gsi_routing(void);
> +int kvm_has_intx_set_mask(void);
>
> int kvm_allows_irq0_override(void);
>
> --
> 1.7.3.4
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v4 3/4] pci-assign: Use PCI-2.3-based shared legacy interrupts
2012-03-08 10:10 [PATCH v4 0/4] qemu-kvm: pci-assign: Host IRQ sharing suppport Jan Kiszka
2012-03-08 10:10 ` [PATCH v4 1/4] kvm: Update kernel headers against kvm.git Jan Kiszka
2012-03-08 10:10 ` [PATCH v4 2/4] kvm: Introduce kvm_has_intx_set_mask Jan Kiszka
@ 2012-03-08 10:10 ` Jan Kiszka
2012-03-08 17:00 ` Alex Williamson
2012-04-05 9:44 ` [PATCH v4 " Michael S. Tsirkin
2012-03-08 10:10 ` [PATCH v4 4/4] pci_assign: Flip defaults of prefer_msi and share_intx Jan Kiszka
` (2 subsequent siblings)
5 siblings, 2 replies; 14+ messages in thread
From: Jan Kiszka @ 2012-03-08 10:10 UTC (permalink / raw)
To: Avi Kivity, Marcelo Tosatti; +Cc: kvm, Alex Williamson, Michael S. Tsirkin
Enable the new KVM feature that allows legacy interrupt sharing for
PCI-2.3-compliant devices. This requires to synchronize any guest
change of the INTx mask bit to the kernel.
The feature is controlled by the property 'share_intx' and is off by
default for now.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
hw/device-assignment.c | 25 +++++++++++++++++++++++++
hw/device-assignment.h | 10 ++++++----
qemu-kvm.c | 9 +++++++++
qemu-kvm.h | 2 ++
4 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index a5f1abb..b7cabd4 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -782,6 +782,13 @@ static int assign_device(AssignedDevice *dev)
"cause host memory corruption if the device issues DMA write "
"requests!\n");
}
+ if (dev->features & ASSIGNED_DEVICE_SHARE_INTX_MASK) {
+ assigned_dev_data.flags |= KVM_DEV_ASSIGN_PCI_2_3;
+
+ /* hide host-side INTx masking from the guest */
+ dev->emulate_config_read[PCI_COMMAND + 1] |=
+ PCI_COMMAND_INTX_DISABLE >> 8;
+ }
r = kvm_assign_pci_device(kvm_state, &assigned_dev_data);
if (r < 0) {
@@ -1121,10 +1128,26 @@ static void assigned_dev_pci_write_config(PCIDevice *pci_dev, uint32_t address,
uint32_t val, int len)
{
AssignedDevice *assigned_dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
+ uint16_t old_cmd = pci_get_word(pci_dev->config + PCI_COMMAND);
uint32_t emulate_mask, full_emulation_mask;
+ int ret;
pci_default_write_config(pci_dev, address, val, len);
+ if (kvm_has_intx_set_mask() &&
+ range_covers_byte(address, len, PCI_COMMAND + 1)) {
+ bool intx_masked = (pci_get_word(pci_dev->config + PCI_COMMAND) &
+ PCI_COMMAND_INTX_DISABLE);
+
+ if (intx_masked != !!(old_cmd & PCI_COMMAND_INTX_DISABLE)) {
+ ret = kvm_device_intx_set_mask(kvm_state,
+ calc_assigned_dev_id(assigned_dev),
+ intx_masked);
+ if (ret) {
+ perror("assigned_dev_pci_write_config: set intx mask");
+ }
+ }
+ }
if (assigned_dev->cap.available & ASSIGNED_DEVICE_CAP_MSI) {
if (range_covers_byte(address, len,
pci_dev->msi_cap + PCI_MSI_FLAGS)) {
@@ -1748,6 +1771,8 @@ static Property da_properties[] =
ASSIGNED_DEVICE_USE_IOMMU_BIT, true),
DEFINE_PROP_BIT("prefer_msi", AssignedDevice, features,
ASSIGNED_DEVICE_PREFER_MSI_BIT, true),
+ DEFINE_PROP_BIT("share_intx", AssignedDevice, features,
+ ASSIGNED_DEVICE_SHARE_INTX_BIT, false),
DEFINE_PROP_INT32("bootindex", AssignedDevice, bootindex, -1),
DEFINE_PROP_STRING("configfd", AssignedDevice, configfd_name),
DEFINE_PROP_END_OF_LIST(),
diff --git a/hw/device-assignment.h b/hw/device-assignment.h
index b4bcfa6..5d271d5 100644
--- a/hw/device-assignment.h
+++ b/hw/device-assignment.h
@@ -74,11 +74,13 @@ typedef struct {
PCIRegion *region;
} AssignedDevRegion;
-#define ASSIGNED_DEVICE_USE_IOMMU_BIT 0
-#define ASSIGNED_DEVICE_PREFER_MSI_BIT 1
+#define ASSIGNED_DEVICE_USE_IOMMU_BIT 0
+#define ASSIGNED_DEVICE_PREFER_MSI_BIT 1
+#define ASSIGNED_DEVICE_SHARE_INTX_BIT 2
-#define ASSIGNED_DEVICE_USE_IOMMU_MASK (1 << ASSIGNED_DEVICE_USE_IOMMU_BIT)
-#define ASSIGNED_DEVICE_PREFER_MSI_MASK (1 << ASSIGNED_DEVICE_PREFER_MSI_BIT)
+#define ASSIGNED_DEVICE_USE_IOMMU_MASK (1 << ASSIGNED_DEVICE_USE_IOMMU_BIT)
+#define ASSIGNED_DEVICE_PREFER_MSI_MASK (1 << ASSIGNED_DEVICE_PREFER_MSI_BIT)
+#define ASSIGNED_DEVICE_SHARE_INTX_MASK (1 << ASSIGNED_DEVICE_SHARE_INTX_BIT)
typedef struct {
uint32_t addr_lo;
diff --git a/qemu-kvm.c b/qemu-kvm.c
index 09a35f0..2047ebb 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -54,6 +54,15 @@ static int kvm_old_assign_irq(KVMState *s,
return kvm_vm_ioctl(s, KVM_ASSIGN_IRQ, assigned_irq);
}
+int kvm_device_intx_set_mask(KVMState *s, uint32_t dev_id, bool masked)
+{
+ struct kvm_assigned_pci_dev assigned_dev;
+
+ assigned_dev.assigned_dev_id = dev_id;
+ assigned_dev.flags = masked ? KVM_DEV_ASSIGN_MASK_INTX : 0;
+ return kvm_vm_ioctl(s, KVM_ASSIGN_SET_INTX_MASK, &assigned_dev);
+}
+
#ifdef KVM_CAP_ASSIGN_DEV_IRQ
int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq)
{
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 3c4f023..2b23daf 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -114,6 +114,8 @@ int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq);
*/
int kvm_deassign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq);
+int kvm_device_intx_set_mask(KVMState *s, uint32_t dev_id, bool masked);
+
/*!
* \brief Notifies host kernel about a PCI device to be deassigned from a guest
*
--
1.7.3.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v4 3/4] pci-assign: Use PCI-2.3-based shared legacy interrupts
2012-03-08 10:10 ` [PATCH v4 3/4] pci-assign: Use PCI-2.3-based shared legacy interrupts Jan Kiszka
@ 2012-03-08 17:00 ` Alex Williamson
2012-03-08 17:08 ` Jan Kiszka
2012-04-05 9:44 ` [PATCH v4 " Michael S. Tsirkin
1 sibling, 1 reply; 14+ messages in thread
From: Alex Williamson @ 2012-03-08 17:00 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, Marcelo Tosatti, kvm, Michael S. Tsirkin
On Thu, 2012-03-08 at 11:10 +0100, Jan Kiszka wrote:
> Enable the new KVM feature that allows legacy interrupt sharing for
> PCI-2.3-compliant devices. This requires to synchronize any guest
> change of the INTx mask bit to the kernel.
>
> The feature is controlled by the property 'share_intx' and is off by
> default for now.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> hw/device-assignment.c | 25 +++++++++++++++++++++++++
> hw/device-assignment.h | 10 ++++++----
> qemu-kvm.c | 9 +++++++++
> qemu-kvm.h | 2 ++
> 4 files changed, 42 insertions(+), 4 deletions(-)
>
> diff --git a/hw/device-assignment.c b/hw/device-assignment.c
> index a5f1abb..b7cabd4 100644
> --- a/hw/device-assignment.c
> +++ b/hw/device-assignment.c
> @@ -782,6 +782,13 @@ static int assign_device(AssignedDevice *dev)
> "cause host memory corruption if the device issues DMA write "
> "requests!\n");
> }
> + if (dev->features & ASSIGNED_DEVICE_SHARE_INTX_MASK) {
> + assigned_dev_data.flags |= KVM_DEV_ASSIGN_PCI_2_3;
> +
> + /* hide host-side INTx masking from the guest */
> + dev->emulate_config_read[PCI_COMMAND + 1] |=
> + PCI_COMMAND_INTX_DISABLE >> 8;
> + }
I think this also needs a kvm_has_intx_set_mask() check or else we're
emulating pci2.3 intx disable support without actually backing it.
Thanks,
Alex
>
> r = kvm_assign_pci_device(kvm_state, &assigned_dev_data);
> if (r < 0) {
> @@ -1121,10 +1128,26 @@ static void assigned_dev_pci_write_config(PCIDevice *pci_dev, uint32_t address,
> uint32_t val, int len)
> {
> AssignedDevice *assigned_dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
> + uint16_t old_cmd = pci_get_word(pci_dev->config + PCI_COMMAND);
> uint32_t emulate_mask, full_emulation_mask;
> + int ret;
>
> pci_default_write_config(pci_dev, address, val, len);
>
> + if (kvm_has_intx_set_mask() &&
> + range_covers_byte(address, len, PCI_COMMAND + 1)) {
> + bool intx_masked = (pci_get_word(pci_dev->config + PCI_COMMAND) &
> + PCI_COMMAND_INTX_DISABLE);
> +
> + if (intx_masked != !!(old_cmd & PCI_COMMAND_INTX_DISABLE)) {
> + ret = kvm_device_intx_set_mask(kvm_state,
> + calc_assigned_dev_id(assigned_dev),
> + intx_masked);
> + if (ret) {
> + perror("assigned_dev_pci_write_config: set intx mask");
> + }
> + }
> + }
> if (assigned_dev->cap.available & ASSIGNED_DEVICE_CAP_MSI) {
> if (range_covers_byte(address, len,
> pci_dev->msi_cap + PCI_MSI_FLAGS)) {
> @@ -1748,6 +1771,8 @@ static Property da_properties[] =
> ASSIGNED_DEVICE_USE_IOMMU_BIT, true),
> DEFINE_PROP_BIT("prefer_msi", AssignedDevice, features,
> ASSIGNED_DEVICE_PREFER_MSI_BIT, true),
> + DEFINE_PROP_BIT("share_intx", AssignedDevice, features,
> + ASSIGNED_DEVICE_SHARE_INTX_BIT, false),
> DEFINE_PROP_INT32("bootindex", AssignedDevice, bootindex, -1),
> DEFINE_PROP_STRING("configfd", AssignedDevice, configfd_name),
> DEFINE_PROP_END_OF_LIST(),
> diff --git a/hw/device-assignment.h b/hw/device-assignment.h
> index b4bcfa6..5d271d5 100644
> --- a/hw/device-assignment.h
> +++ b/hw/device-assignment.h
> @@ -74,11 +74,13 @@ typedef struct {
> PCIRegion *region;
> } AssignedDevRegion;
>
> -#define ASSIGNED_DEVICE_USE_IOMMU_BIT 0
> -#define ASSIGNED_DEVICE_PREFER_MSI_BIT 1
> +#define ASSIGNED_DEVICE_USE_IOMMU_BIT 0
> +#define ASSIGNED_DEVICE_PREFER_MSI_BIT 1
> +#define ASSIGNED_DEVICE_SHARE_INTX_BIT 2
>
> -#define ASSIGNED_DEVICE_USE_IOMMU_MASK (1 << ASSIGNED_DEVICE_USE_IOMMU_BIT)
> -#define ASSIGNED_DEVICE_PREFER_MSI_MASK (1 << ASSIGNED_DEVICE_PREFER_MSI_BIT)
> +#define ASSIGNED_DEVICE_USE_IOMMU_MASK (1 << ASSIGNED_DEVICE_USE_IOMMU_BIT)
> +#define ASSIGNED_DEVICE_PREFER_MSI_MASK (1 << ASSIGNED_DEVICE_PREFER_MSI_BIT)
> +#define ASSIGNED_DEVICE_SHARE_INTX_MASK (1 << ASSIGNED_DEVICE_SHARE_INTX_BIT)
>
> typedef struct {
> uint32_t addr_lo;
> diff --git a/qemu-kvm.c b/qemu-kvm.c
> index 09a35f0..2047ebb 100644
> --- a/qemu-kvm.c
> +++ b/qemu-kvm.c
> @@ -54,6 +54,15 @@ static int kvm_old_assign_irq(KVMState *s,
> return kvm_vm_ioctl(s, KVM_ASSIGN_IRQ, assigned_irq);
> }
>
> +int kvm_device_intx_set_mask(KVMState *s, uint32_t dev_id, bool masked)
> +{
> + struct kvm_assigned_pci_dev assigned_dev;
> +
> + assigned_dev.assigned_dev_id = dev_id;
> + assigned_dev.flags = masked ? KVM_DEV_ASSIGN_MASK_INTX : 0;
> + return kvm_vm_ioctl(s, KVM_ASSIGN_SET_INTX_MASK, &assigned_dev);
> +}
> +
> #ifdef KVM_CAP_ASSIGN_DEV_IRQ
> int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq)
> {
> diff --git a/qemu-kvm.h b/qemu-kvm.h
> index 3c4f023..2b23daf 100644
> --- a/qemu-kvm.h
> +++ b/qemu-kvm.h
> @@ -114,6 +114,8 @@ int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq);
> */
> int kvm_deassign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq);
>
> +int kvm_device_intx_set_mask(KVMState *s, uint32_t dev_id, bool masked);
> +
> /*!
> * \brief Notifies host kernel about a PCI device to be deassigned from a guest
> *
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v4 3/4] pci-assign: Use PCI-2.3-based shared legacy interrupts
2012-03-08 17:00 ` Alex Williamson
@ 2012-03-08 17:08 ` Jan Kiszka
2012-03-08 18:04 ` [PATCH v5 " Jan Kiszka
0 siblings, 1 reply; 14+ messages in thread
From: Jan Kiszka @ 2012-03-08 17:08 UTC (permalink / raw)
To: Alex Williamson
Cc: Avi Kivity, Marcelo Tosatti, kvm@vger.kernel.org,
Michael S. Tsirkin
On 2012-03-08 18:00, Alex Williamson wrote:
> On Thu, 2012-03-08 at 11:10 +0100, Jan Kiszka wrote:
>> Enable the new KVM feature that allows legacy interrupt sharing for
>> PCI-2.3-compliant devices. This requires to synchronize any guest
>> change of the INTx mask bit to the kernel.
>>
>> The feature is controlled by the property 'share_intx' and is off by
>> default for now.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>> hw/device-assignment.c | 25 +++++++++++++++++++++++++
>> hw/device-assignment.h | 10 ++++++----
>> qemu-kvm.c | 9 +++++++++
>> qemu-kvm.h | 2 ++
>> 4 files changed, 42 insertions(+), 4 deletions(-)
>>
>> diff --git a/hw/device-assignment.c b/hw/device-assignment.c
>> index a5f1abb..b7cabd4 100644
>> --- a/hw/device-assignment.c
>> +++ b/hw/device-assignment.c
>> @@ -782,6 +782,13 @@ static int assign_device(AssignedDevice *dev)
>> "cause host memory corruption if the device issues DMA write "
>> "requests!\n");
>> }
>> + if (dev->features & ASSIGNED_DEVICE_SHARE_INTX_MASK) {
>> + assigned_dev_data.flags |= KVM_DEV_ASSIGN_PCI_2_3;
>> +
>> + /* hide host-side INTx masking from the guest */
>> + dev->emulate_config_read[PCI_COMMAND + 1] |=
>> + PCI_COMMAND_INTX_DISABLE >> 8;
>> + }
>
> I think this also needs a kvm_has_intx_set_mask() check or else we're
> emulating pci2.3 intx disable support without actually backing it.
Hmm... true.
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH v5 3/4] pci-assign: Use PCI-2.3-based shared legacy interrupts
2012-03-08 17:08 ` Jan Kiszka
@ 2012-03-08 18:04 ` Jan Kiszka
0 siblings, 0 replies; 14+ messages in thread
From: Jan Kiszka @ 2012-03-08 18:04 UTC (permalink / raw)
To: Avi Kivity, Marcelo Tosatti
Cc: Alex Williamson, kvm@vger.kernel.org, Michael S. Tsirkin
Enable the new KVM feature that allows legacy interrupt sharing for
PCI-2.3-compliant devices. This requires to synchronize any guest
change of the INTx mask bit to the kernel.
The feature is controlled by the property 'share_intx' and is off by
default for now.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Changes in v5:
- Only emulate INTx disable bit if there is kernel support
hw/device-assignment.c | 26 ++++++++++++++++++++++++++
hw/device-assignment.h | 10 ++++++----
qemu-kvm.c | 9 +++++++++
qemu-kvm.h | 2 ++
4 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index a5f1abb..ad3406c 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -782,6 +782,14 @@ static int assign_device(AssignedDevice *dev)
"cause host memory corruption if the device issues DMA write "
"requests!\n");
}
+ if (dev->features & ASSIGNED_DEVICE_SHARE_INTX_MASK &&
+ kvm_has_intx_set_mask()) {
+ assigned_dev_data.flags |= KVM_DEV_ASSIGN_PCI_2_3;
+
+ /* hide host-side INTx masking from the guest */
+ dev->emulate_config_read[PCI_COMMAND + 1] |=
+ PCI_COMMAND_INTX_DISABLE >> 8;
+ }
r = kvm_assign_pci_device(kvm_state, &assigned_dev_data);
if (r < 0) {
@@ -1121,10 +1129,26 @@ static void assigned_dev_pci_write_config(PCIDevice *pci_dev, uint32_t address,
uint32_t val, int len)
{
AssignedDevice *assigned_dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
+ uint16_t old_cmd = pci_get_word(pci_dev->config + PCI_COMMAND);
uint32_t emulate_mask, full_emulation_mask;
+ int ret;
pci_default_write_config(pci_dev, address, val, len);
+ if (kvm_has_intx_set_mask() &&
+ range_covers_byte(address, len, PCI_COMMAND + 1)) {
+ bool intx_masked = (pci_get_word(pci_dev->config + PCI_COMMAND) &
+ PCI_COMMAND_INTX_DISABLE);
+
+ if (intx_masked != !!(old_cmd & PCI_COMMAND_INTX_DISABLE)) {
+ ret = kvm_device_intx_set_mask(kvm_state,
+ calc_assigned_dev_id(assigned_dev),
+ intx_masked);
+ if (ret) {
+ perror("assigned_dev_pci_write_config: set intx mask");
+ }
+ }
+ }
if (assigned_dev->cap.available & ASSIGNED_DEVICE_CAP_MSI) {
if (range_covers_byte(address, len,
pci_dev->msi_cap + PCI_MSI_FLAGS)) {
@@ -1748,6 +1772,8 @@ static Property da_properties[] =
ASSIGNED_DEVICE_USE_IOMMU_BIT, true),
DEFINE_PROP_BIT("prefer_msi", AssignedDevice, features,
ASSIGNED_DEVICE_PREFER_MSI_BIT, true),
+ DEFINE_PROP_BIT("share_intx", AssignedDevice, features,
+ ASSIGNED_DEVICE_SHARE_INTX_BIT, false),
DEFINE_PROP_INT32("bootindex", AssignedDevice, bootindex, -1),
DEFINE_PROP_STRING("configfd", AssignedDevice, configfd_name),
DEFINE_PROP_END_OF_LIST(),
diff --git a/hw/device-assignment.h b/hw/device-assignment.h
index b4bcfa6..5d271d5 100644
--- a/hw/device-assignment.h
+++ b/hw/device-assignment.h
@@ -74,11 +74,13 @@ typedef struct {
PCIRegion *region;
} AssignedDevRegion;
-#define ASSIGNED_DEVICE_USE_IOMMU_BIT 0
-#define ASSIGNED_DEVICE_PREFER_MSI_BIT 1
+#define ASSIGNED_DEVICE_USE_IOMMU_BIT 0
+#define ASSIGNED_DEVICE_PREFER_MSI_BIT 1
+#define ASSIGNED_DEVICE_SHARE_INTX_BIT 2
-#define ASSIGNED_DEVICE_USE_IOMMU_MASK (1 << ASSIGNED_DEVICE_USE_IOMMU_BIT)
-#define ASSIGNED_DEVICE_PREFER_MSI_MASK (1 << ASSIGNED_DEVICE_PREFER_MSI_BIT)
+#define ASSIGNED_DEVICE_USE_IOMMU_MASK (1 << ASSIGNED_DEVICE_USE_IOMMU_BIT)
+#define ASSIGNED_DEVICE_PREFER_MSI_MASK (1 << ASSIGNED_DEVICE_PREFER_MSI_BIT)
+#define ASSIGNED_DEVICE_SHARE_INTX_MASK (1 << ASSIGNED_DEVICE_SHARE_INTX_BIT)
typedef struct {
uint32_t addr_lo;
diff --git a/qemu-kvm.c b/qemu-kvm.c
index 09a35f0..2047ebb 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -54,6 +54,15 @@ static int kvm_old_assign_irq(KVMState *s,
return kvm_vm_ioctl(s, KVM_ASSIGN_IRQ, assigned_irq);
}
+int kvm_device_intx_set_mask(KVMState *s, uint32_t dev_id, bool masked)
+{
+ struct kvm_assigned_pci_dev assigned_dev;
+
+ assigned_dev.assigned_dev_id = dev_id;
+ assigned_dev.flags = masked ? KVM_DEV_ASSIGN_MASK_INTX : 0;
+ return kvm_vm_ioctl(s, KVM_ASSIGN_SET_INTX_MASK, &assigned_dev);
+}
+
#ifdef KVM_CAP_ASSIGN_DEV_IRQ
int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq)
{
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 3c4f023..2b23daf 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -114,6 +114,8 @@ int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq);
*/
int kvm_deassign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq);
+int kvm_device_intx_set_mask(KVMState *s, uint32_t dev_id, bool masked);
+
/*!
* \brief Notifies host kernel about a PCI device to be deassigned from a guest
*
--
1.7.3.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH v4 3/4] pci-assign: Use PCI-2.3-based shared legacy interrupts
2012-03-08 10:10 ` [PATCH v4 3/4] pci-assign: Use PCI-2.3-based shared legacy interrupts Jan Kiszka
2012-03-08 17:00 ` Alex Williamson
@ 2012-04-05 9:44 ` Michael S. Tsirkin
1 sibling, 0 replies; 14+ messages in thread
From: Michael S. Tsirkin @ 2012-04-05 9:44 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, Marcelo Tosatti, kvm, Alex Williamson
On Thu, Mar 08, 2012 at 11:10:26AM +0100, Jan Kiszka wrote:
> Enable the new KVM feature that allows legacy interrupt sharing for
> PCI-2.3-compliant devices. This requires to synchronize any guest
> change of the INTx mask bit to the kernel.
>
> The feature is controlled by the property 'share_intx' and is off by
> default for now.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/device-assignment.c | 25 +++++++++++++++++++++++++
> hw/device-assignment.h | 10 ++++++----
> qemu-kvm.c | 9 +++++++++
> qemu-kvm.h | 2 ++
> 4 files changed, 42 insertions(+), 4 deletions(-)
>
> diff --git a/hw/device-assignment.c b/hw/device-assignment.c
> index a5f1abb..b7cabd4 100644
> --- a/hw/device-assignment.c
> +++ b/hw/device-assignment.c
> @@ -782,6 +782,13 @@ static int assign_device(AssignedDevice *dev)
> "cause host memory corruption if the device issues DMA write "
> "requests!\n");
> }
> + if (dev->features & ASSIGNED_DEVICE_SHARE_INTX_MASK) {
> + assigned_dev_data.flags |= KVM_DEV_ASSIGN_PCI_2_3;
> +
> + /* hide host-side INTx masking from the guest */
> + dev->emulate_config_read[PCI_COMMAND + 1] |=
> + PCI_COMMAND_INTX_DISABLE >> 8;
> + }
>
> r = kvm_assign_pci_device(kvm_state, &assigned_dev_data);
> if (r < 0) {
> @@ -1121,10 +1128,26 @@ static void assigned_dev_pci_write_config(PCIDevice *pci_dev, uint32_t address,
> uint32_t val, int len)
> {
> AssignedDevice *assigned_dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
> + uint16_t old_cmd = pci_get_word(pci_dev->config + PCI_COMMAND);
> uint32_t emulate_mask, full_emulation_mask;
> + int ret;
>
> pci_default_write_config(pci_dev, address, val, len);
>
> + if (kvm_has_intx_set_mask() &&
> + range_covers_byte(address, len, PCI_COMMAND + 1)) {
> + bool intx_masked = (pci_get_word(pci_dev->config + PCI_COMMAND) &
> + PCI_COMMAND_INTX_DISABLE);
> +
> + if (intx_masked != !!(old_cmd & PCI_COMMAND_INTX_DISABLE)) {
> + ret = kvm_device_intx_set_mask(kvm_state,
> + calc_assigned_dev_id(assigned_dev),
> + intx_masked);
> + if (ret) {
> + perror("assigned_dev_pci_write_config: set intx mask");
> + }
> + }
> + }
> if (assigned_dev->cap.available & ASSIGNED_DEVICE_CAP_MSI) {
> if (range_covers_byte(address, len,
> pci_dev->msi_cap + PCI_MSI_FLAGS)) {
> @@ -1748,6 +1771,8 @@ static Property da_properties[] =
> ASSIGNED_DEVICE_USE_IOMMU_BIT, true),
> DEFINE_PROP_BIT("prefer_msi", AssignedDevice, features,
> ASSIGNED_DEVICE_PREFER_MSI_BIT, true),
> + DEFINE_PROP_BIT("share_intx", AssignedDevice, features,
> + ASSIGNED_DEVICE_SHARE_INTX_BIT, false),
> DEFINE_PROP_INT32("bootindex", AssignedDevice, bootindex, -1),
> DEFINE_PROP_STRING("configfd", AssignedDevice, configfd_name),
> DEFINE_PROP_END_OF_LIST(),
> diff --git a/hw/device-assignment.h b/hw/device-assignment.h
> index b4bcfa6..5d271d5 100644
> --- a/hw/device-assignment.h
> +++ b/hw/device-assignment.h
> @@ -74,11 +74,13 @@ typedef struct {
> PCIRegion *region;
> } AssignedDevRegion;
>
> -#define ASSIGNED_DEVICE_USE_IOMMU_BIT 0
> -#define ASSIGNED_DEVICE_PREFER_MSI_BIT 1
> +#define ASSIGNED_DEVICE_USE_IOMMU_BIT 0
> +#define ASSIGNED_DEVICE_PREFER_MSI_BIT 1
> +#define ASSIGNED_DEVICE_SHARE_INTX_BIT 2
>
> -#define ASSIGNED_DEVICE_USE_IOMMU_MASK (1 << ASSIGNED_DEVICE_USE_IOMMU_BIT)
> -#define ASSIGNED_DEVICE_PREFER_MSI_MASK (1 << ASSIGNED_DEVICE_PREFER_MSI_BIT)
> +#define ASSIGNED_DEVICE_USE_IOMMU_MASK (1 << ASSIGNED_DEVICE_USE_IOMMU_BIT)
> +#define ASSIGNED_DEVICE_PREFER_MSI_MASK (1 << ASSIGNED_DEVICE_PREFER_MSI_BIT)
> +#define ASSIGNED_DEVICE_SHARE_INTX_MASK (1 << ASSIGNED_DEVICE_SHARE_INTX_BIT)
>
> typedef struct {
> uint32_t addr_lo;
> diff --git a/qemu-kvm.c b/qemu-kvm.c
> index 09a35f0..2047ebb 100644
> --- a/qemu-kvm.c
> +++ b/qemu-kvm.c
> @@ -54,6 +54,15 @@ static int kvm_old_assign_irq(KVMState *s,
> return kvm_vm_ioctl(s, KVM_ASSIGN_IRQ, assigned_irq);
> }
>
> +int kvm_device_intx_set_mask(KVMState *s, uint32_t dev_id, bool masked)
> +{
> + struct kvm_assigned_pci_dev assigned_dev;
> +
> + assigned_dev.assigned_dev_id = dev_id;
> + assigned_dev.flags = masked ? KVM_DEV_ASSIGN_MASK_INTX : 0;
> + return kvm_vm_ioctl(s, KVM_ASSIGN_SET_INTX_MASK, &assigned_dev);
> +}
> +
> #ifdef KVM_CAP_ASSIGN_DEV_IRQ
> int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq)
> {
> diff --git a/qemu-kvm.h b/qemu-kvm.h
> index 3c4f023..2b23daf 100644
> --- a/qemu-kvm.h
> +++ b/qemu-kvm.h
> @@ -114,6 +114,8 @@ int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq);
> */
> int kvm_deassign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq);
>
> +int kvm_device_intx_set_mask(KVMState *s, uint32_t dev_id, bool masked);
> +
> /*!
> * \brief Notifies host kernel about a PCI device to be deassigned from a guest
> *
> --
> 1.7.3.4
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v4 4/4] pci_assign: Flip defaults of prefer_msi and share_intx
2012-03-08 10:10 [PATCH v4 0/4] qemu-kvm: pci-assign: Host IRQ sharing suppport Jan Kiszka
` (2 preceding siblings ...)
2012-03-08 10:10 ` [PATCH v4 3/4] pci-assign: Use PCI-2.3-based shared legacy interrupts Jan Kiszka
@ 2012-03-08 10:10 ` Jan Kiszka
2012-04-05 9:46 ` Michael S. Tsirkin
2012-03-09 22:38 ` [PATCH v4 0/4] qemu-kvm: pci-assign: Host IRQ sharing suppport Alex Williamson
2012-03-09 22:49 ` Marcelo Tosatti
5 siblings, 1 reply; 14+ messages in thread
From: Jan Kiszka @ 2012-03-08 10:10 UTC (permalink / raw)
To: Avi Kivity, Marcelo Tosatti; +Cc: kvm, Alex Williamson, Michael S. Tsirkin
INTx sharing is a bit more expensive than exclusive host interrupts, but
this channel is not supposed to be used for high-performance scenarios
anyway. Modern devices support MSI/MSI-X and do not depend on using INTx
under critical workload, real old devices do not support INTx sharing
anyway.
For those in the middle, the user experience is much better if they just
work even when IRQ sharing is required. If there is nothing to share,
share_intx=off can still be applied as tuning parameter.
With INTx sharing as default, the primary reason for prefer_msi=on is
gone. Make it default off, specifically as it is known to cause troubles
with devices that have incomplete/broken MSI support or otherwise
stumble if host IRQ configuration does not match guest driver
expectation.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
hw/device-assignment.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index b7cabd4..caa3602 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1770,9 +1770,9 @@ static Property da_properties[] =
DEFINE_PROP_BIT("iommu", AssignedDevice, features,
ASSIGNED_DEVICE_USE_IOMMU_BIT, true),
DEFINE_PROP_BIT("prefer_msi", AssignedDevice, features,
- ASSIGNED_DEVICE_PREFER_MSI_BIT, true),
+ ASSIGNED_DEVICE_PREFER_MSI_BIT, false),
DEFINE_PROP_BIT("share_intx", AssignedDevice, features,
- ASSIGNED_DEVICE_SHARE_INTX_BIT, false),
+ ASSIGNED_DEVICE_SHARE_INTX_BIT, true),
DEFINE_PROP_INT32("bootindex", AssignedDevice, bootindex, -1),
DEFINE_PROP_STRING("configfd", AssignedDevice, configfd_name),
DEFINE_PROP_END_OF_LIST(),
--
1.7.3.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v4 4/4] pci_assign: Flip defaults of prefer_msi and share_intx
2012-03-08 10:10 ` [PATCH v4 4/4] pci_assign: Flip defaults of prefer_msi and share_intx Jan Kiszka
@ 2012-04-05 9:46 ` Michael S. Tsirkin
0 siblings, 0 replies; 14+ messages in thread
From: Michael S. Tsirkin @ 2012-04-05 9:46 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, Marcelo Tosatti, kvm, Alex Williamson
On Thu, Mar 08, 2012 at 11:10:27AM +0100, Jan Kiszka wrote:
> INTx sharing is a bit more expensive than exclusive host interrupts, but
> this channel is not supposed to be used for high-performance scenarios
> anyway. Modern devices support MSI/MSI-X and do not depend on using INTx
> under critical workload, real old devices do not support INTx sharing
> anyway.
>
> For those in the middle, the user experience is much better if they just
> work even when IRQ sharing is required. If there is nothing to share,
> share_intx=off can still be applied as tuning parameter.
>
> With INTx sharing as default, the primary reason for prefer_msi=on is
> gone. Make it default off, specifically as it is known to cause troubles
> with devices that have incomplete/broken MSI support or otherwise
> stumble if host IRQ configuration does not match guest driver
> expectation.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
I'm not familiar enough with what prefer_msi does
so no comment here. Maybe Alex can ack.
If not I'll try to find the time to understand it
a bit better but will take some time.
> hw/device-assignment.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/device-assignment.c b/hw/device-assignment.c
> index b7cabd4..caa3602 100644
> --- a/hw/device-assignment.c
> +++ b/hw/device-assignment.c
> @@ -1770,9 +1770,9 @@ static Property da_properties[] =
> DEFINE_PROP_BIT("iommu", AssignedDevice, features,
> ASSIGNED_DEVICE_USE_IOMMU_BIT, true),
> DEFINE_PROP_BIT("prefer_msi", AssignedDevice, features,
> - ASSIGNED_DEVICE_PREFER_MSI_BIT, true),
> + ASSIGNED_DEVICE_PREFER_MSI_BIT, false),
> DEFINE_PROP_BIT("share_intx", AssignedDevice, features,
> - ASSIGNED_DEVICE_SHARE_INTX_BIT, false),
> + ASSIGNED_DEVICE_SHARE_INTX_BIT, true),
> DEFINE_PROP_INT32("bootindex", AssignedDevice, bootindex, -1),
> DEFINE_PROP_STRING("configfd", AssignedDevice, configfd_name),
> DEFINE_PROP_END_OF_LIST(),
> --
> 1.7.3.4
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v4 0/4] qemu-kvm: pci-assign: Host IRQ sharing suppport
2012-03-08 10:10 [PATCH v4 0/4] qemu-kvm: pci-assign: Host IRQ sharing suppport Jan Kiszka
` (3 preceding siblings ...)
2012-03-08 10:10 ` [PATCH v4 4/4] pci_assign: Flip defaults of prefer_msi and share_intx Jan Kiszka
@ 2012-03-09 22:38 ` Alex Williamson
2012-03-09 22:49 ` Marcelo Tosatti
5 siblings, 0 replies; 14+ messages in thread
From: Alex Williamson @ 2012-03-09 22:38 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, Marcelo Tosatti, kvm, Michael S. Tsirkin
On Thu, 2012-03-08 at 11:10 +0100, Jan Kiszka wrote:
> This enables support for the host IRQ sharing support via PCI-2.3
> interrupt masking. See the patches for details.
>
> Patch 1 & 3 could be considered for uq/master although we have no use
> case for the changes in upstream yet.
>
> Changes in v4:
> - add patch for kvm_has_intx_set_mask
> - do not issue unsupported IOCTLs when the host kernel does not support
> INTx mask control
>
> Jan Kiszka (4):
> kvm: Update kernel headers against kvm.git
> kvm: Introduce kvm_has_intx_set_mask
> pci-assign: Use PCI-2.3-based shared legacy interrupts
> pci_assign: Flip defaults of prefer_msi and share_intx
>
> hw/device-assignment.c | 27 ++++++++++++++++++++++++++-
> hw/device-assignment.h | 10 ++++++----
> kvm-all.c | 8 ++++++++
> kvm.h | 1 +
> linux-headers/asm-s390/kvm.h | 2 ++
> linux-headers/linux/kvm.h | 6 ++++++
> qemu-kvm.c | 9 +++++++++
> qemu-kvm.h | 2 ++
> 8 files changed, 60 insertions(+), 5 deletions(-)
>
Looks right to me w/ the updated (v5) 3rd patch.
Acked-by: Alex Williamson <alex.williamson@redhat.com>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v4 0/4] qemu-kvm: pci-assign: Host IRQ sharing suppport
2012-03-08 10:10 [PATCH v4 0/4] qemu-kvm: pci-assign: Host IRQ sharing suppport Jan Kiszka
` (4 preceding siblings ...)
2012-03-09 22:38 ` [PATCH v4 0/4] qemu-kvm: pci-assign: Host IRQ sharing suppport Alex Williamson
@ 2012-03-09 22:49 ` Marcelo Tosatti
5 siblings, 0 replies; 14+ messages in thread
From: Marcelo Tosatti @ 2012-03-09 22:49 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, kvm, Alex Williamson, Michael S. Tsirkin
On Thu, Mar 08, 2012 at 11:10:23AM +0100, Jan Kiszka wrote:
> This enables support for the host IRQ sharing support via PCI-2.3
> interrupt masking. See the patches for details.
>
> Patch 1 & 3 could be considered for uq/master although we have no use
> case for the changes in upstream yet.
>
> Changes in v4:
> - add patch for kvm_has_intx_set_mask
> - do not issue unsupported IOCTLs when the host kernel does not support
> INTx mask control
>
> Jan Kiszka (4):
> kvm: Update kernel headers against kvm.git
> kvm: Introduce kvm_has_intx_set_mask
> pci-assign: Use PCI-2.3-based shared legacy interrupts
> pci_assign: Flip defaults of prefer_msi and share_intx
>
> hw/device-assignment.c | 27 ++++++++++++++++++++++++++-
> hw/device-assignment.h | 10 ++++++----
> kvm-all.c | 8 ++++++++
> kvm.h | 1 +
> linux-headers/asm-s390/kvm.h | 2 ++
> linux-headers/linux/kvm.h | 6 ++++++
> qemu-kvm.c | 9 +++++++++
> qemu-kvm.h | 2 ++
> 8 files changed, 60 insertions(+), 5 deletions(-)
Applied, thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread