Re: [Xen-devel] [PATCH 2/3] xen: merge common hvm/irq.h into x86 hvm/irq.h

2017-08-22 Thread Jan Beulich 
>>> On 21.08.17 at 16:14,  wrote:
> On Mon, Aug 21, 2017 at 03:09:12PM +0100, Wei Liu wrote:
>> That header file is only used by x86. Merge is into the x86 header.
>> 
>> Signed-off-by: Wei Liu 
> [...]
>> +#define HVM_IRQ_DPCI_MACH_PCI(1 << _HVM_IRQ_DPCI_MACH_PCI_SHIFT)
>> +#define HVM_IRQ_DPCI_MACH_MSI(1 << _HVM_IRQ_DPCI_MACH_MSI_SHIFT)
>> +#define HVM_IRQ_DPCI_MAPPED  (1 << _HVM_IRQ_DPCI_MAPPED_SHIFT)
>> +#define HVM_IRQ_DPCI_EOI_LATCH   (1 << _HVM_IRQ_DPCI_EOI_LATCH_SHIFT)
>> +#define HVM_IRQ_DPCI_GUEST_PCI   (1 << _HVM_IRQ_DPCI_GUEST_PCI_SHIFT)
>> +#define HVM_IRQ_DPCI_GUEST_MSI   (1 << _HVM_IRQ_DPCI_GUEST_MSI_SHIFT)
>> +#define HVM_IRQ_DPCI_IDENTITY_GSI(1 << _HVM_IRQ_DPCI_IDENTITY_GSI_SHIFT)
>> +#define HVM_IRQ_DPCI_TRANSLATE   (1 << _HVM_IRQ_DPCI_TRANSLATE_SHIFT)
> 
> Hmm... I think I'd better change these to 1u
> 
>> +
>> +#define VMSI_DEST_ID_MASK 0xff
>> +#define VMSI_RH_MASK  0x100
>> +#define VMSI_DM_MASK  0x200
>> +#define VMSI_DELIV_MASK   0x7000
>> +#define VMSI_TRIG_MODE0x8000
>> +
>> +#define GFLAGS_SHIFT_RH 8
>> +#define GFLAGS_SHIFT_DELIV_MODE 12
>> +#define GFLAGS_SHIFT_TRG_MODE   15
>> +
>> +struct hvm_gmsi_info {
>> +uint32_t gvec;
>> +uint32_t gflags;
>> +int dest_vcpu_id; /* -1 :multi-dest, non-negative: dest_vcpu_id */
>> +bool posted; /* directly deliver to guest via VT-d PI? */
>> +};
>> +
>> +struct hvm_girq_dpci_mapping {
>> +struct list_head list;
>> +uint8_t bus;
>> +uint8_t device;
>> +uint8_t intx;
>> +uint8_t machine_gsi;
>> +};
>> +
>> +#define NR_ISAIRQS  16
>> +#define NR_LINK 4
>> +#if defined(CONFIG_X86)
>> +# define NR_HVM_DOMU_IRQS ARRAY_SIZE(((struct hvm_hw_vioapic *)0)->redirtbl)
>> +#endif
> 
> And this if defined is not needed any more after moving.

Wit these adjustments
Acked-by: Jan Beulich 

Jan


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [Xen-devel] [PATCH 2/3] xen: merge common hvm/irq.h into x86 hvm/irq.h

2017-08-21 Thread Wei Liu 
On Mon, Aug 21, 2017 at 03:09:12PM +0100, Wei Liu wrote:
> That header file is only used by x86. Merge is into the x86 header.
> 
> Signed-off-by: Wei Liu 
[...]
> +#define HVM_IRQ_DPCI_MACH_PCI(1 << _HVM_IRQ_DPCI_MACH_PCI_SHIFT)
> +#define HVM_IRQ_DPCI_MACH_MSI(1 << _HVM_IRQ_DPCI_MACH_MSI_SHIFT)
> +#define HVM_IRQ_DPCI_MAPPED  (1 << _HVM_IRQ_DPCI_MAPPED_SHIFT)
> +#define HVM_IRQ_DPCI_EOI_LATCH   (1 << _HVM_IRQ_DPCI_EOI_LATCH_SHIFT)
> +#define HVM_IRQ_DPCI_GUEST_PCI   (1 << _HVM_IRQ_DPCI_GUEST_PCI_SHIFT)
> +#define HVM_IRQ_DPCI_GUEST_MSI   (1 << _HVM_IRQ_DPCI_GUEST_MSI_SHIFT)
> +#define HVM_IRQ_DPCI_IDENTITY_GSI(1 << _HVM_IRQ_DPCI_IDENTITY_GSI_SHIFT)
> +#define HVM_IRQ_DPCI_TRANSLATE   (1 << _HVM_IRQ_DPCI_TRANSLATE_SHIFT)

Hmm... I think I'd better change these to 1u

> +
> +#define VMSI_DEST_ID_MASK 0xff
> +#define VMSI_RH_MASK  0x100
> +#define VMSI_DM_MASK  0x200
> +#define VMSI_DELIV_MASK   0x7000
> +#define VMSI_TRIG_MODE0x8000
> +
> +#define GFLAGS_SHIFT_RH 8
> +#define GFLAGS_SHIFT_DELIV_MODE 12
> +#define GFLAGS_SHIFT_TRG_MODE   15
> +
> +struct hvm_gmsi_info {
> +uint32_t gvec;
> +uint32_t gflags;
> +int dest_vcpu_id; /* -1 :multi-dest, non-negative: dest_vcpu_id */
> +bool posted; /* directly deliver to guest via VT-d PI? */
> +};
> +
> +struct hvm_girq_dpci_mapping {
> +struct list_head list;
> +uint8_t bus;
> +uint8_t device;
> +uint8_t intx;
> +uint8_t machine_gsi;
> +};
> +
> +#define NR_ISAIRQS  16
> +#define NR_LINK 4
> +#if defined(CONFIG_X86)
> +# define NR_HVM_DOMU_IRQS ARRAY_SIZE(((struct hvm_hw_vioapic *)0)->redirtbl)
> +#endif

And this if defined is not needed any more after moving.

___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[Xen-devel] [PATCH 2/3] xen: merge common hvm/irq.h into x86 hvm/irq.h

2017-08-21 Thread Wei Liu 
That header file is only used by x86. Merge is into the x86 header.

Signed-off-by: Wei Liu 
---
Cc: Andrew Cooper    
   
Cc: George Dunlap  
   
Cc: Ian Jackson  
   
Cc: Jan Beulich  
   
Cc: Konrad Rzeszutek Wilk   
   
Cc: Stefano Stabellini  
   
Cc: Tim Deegan    

Cc: Wei Liu   
---
 xen/drivers/passthrough/io.c  |   1 -
 xen/include/asm-x86/hvm/irq.h | 111 -
 xen/include/asm-x86/irq.h |   2 +-
 xen/include/xen/hvm/irq.h | 140 --
 4 files changed, 111 insertions(+), 143 deletions(-)
 delete mode 100644 xen/include/xen/hvm/irq.h

diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c
index ffeaf70be6..e30fd568f3 100644
--- a/xen/drivers/passthrough/io.c
+++ b/xen/drivers/passthrough/io.c
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 static DEFINE_PER_CPU(struct list_head, dpci_list);
diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h
index 7d45293aed..84cb8f8765 100644
--- a/xen/include/asm-x86/hvm/irq.h
+++ b/xen/include/asm-x86/hvm/irq.h
@@ -21,7 +21,8 @@
 #ifndef __ASM_X86_HVM_IRQ_H__
 #define __ASM_X86_HVM_IRQ_H__
 
-#include 
+#include 
+
 #include 
 #include 
 #include 
@@ -106,4 +107,112 @@ struct hvm_intack hvm_vcpu_has_pending_irq(struct vcpu 
*v);
 struct hvm_intack hvm_vcpu_ack_pending_irq(struct vcpu *v,
struct hvm_intack intack);
 
+struct dev_intx_gsi_link {
+struct list_head list;
+uint8_t bus;
+uint8_t device;
+uint8_t intx;
+};
+
+#define _HVM_IRQ_DPCI_MACH_PCI_SHIFT0
+#define _HVM_IRQ_DPCI_MACH_MSI_SHIFT1
+#define _HVM_IRQ_DPCI_MAPPED_SHIFT  2
+#define _HVM_IRQ_DPCI_EOI_LATCH_SHIFT   3
+#define _HVM_IRQ_DPCI_GUEST_PCI_SHIFT   4
+#define _HVM_IRQ_DPCI_GUEST_MSI_SHIFT   5
+#define _HVM_IRQ_DPCI_IDENTITY_GSI_SHIFT6
+#define _HVM_IRQ_DPCI_TRANSLATE_SHIFT  15
+#define HVM_IRQ_DPCI_MACH_PCI(1 << _HVM_IRQ_DPCI_MACH_PCI_SHIFT)
+#define HVM_IRQ_DPCI_MACH_MSI(1 << _HVM_IRQ_DPCI_MACH_MSI_SHIFT)
+#define HVM_IRQ_DPCI_MAPPED  (1 << _HVM_IRQ_DPCI_MAPPED_SHIFT)
+#define HVM_IRQ_DPCI_EOI_LATCH   (1 << _HVM_IRQ_DPCI_EOI_LATCH_SHIFT)
+#define HVM_IRQ_DPCI_GUEST_PCI   (1 << _HVM_IRQ_DPCI_GUEST_PCI_SHIFT)
+#define HVM_IRQ_DPCI_GUEST_MSI   (1 << _HVM_IRQ_DPCI_GUEST_MSI_SHIFT)
+#define HVM_IRQ_DPCI_IDENTITY_GSI(1 << _HVM_IRQ_DPCI_IDENTITY_GSI_SHIFT)
+#define HVM_IRQ_DPCI_TRANSLATE   (1 << _HVM_IRQ_DPCI_TRANSLATE_SHIFT)
+
+#define VMSI_DEST_ID_MASK 0xff
+#define VMSI_RH_MASK  0x100
+#define VMSI_DM_MASK  0x200
+#define VMSI_DELIV_MASK   0x7000
+#define VMSI_TRIG_MODE0x8000
+
+#define GFLAGS_SHIFT_RH 8
+#define GFLAGS_SHIFT_DELIV_MODE 12
+#define GFLAGS_SHIFT_TRG_MODE   15
+
+struct hvm_gmsi_info {
+uint32_t gvec;
+uint32_t gflags;
+int dest_vcpu_id; /* -1 :multi-dest, non-negative: dest_vcpu_id */
+bool posted; /* directly deliver to guest via VT-d PI? */
+};
+
+struct hvm_girq_dpci_mapping {
+struct list_head list;
+uint8_t bus;
+uint8_t device;
+uint8_t intx;
+uint8_t machine_gsi;
+};
+
+#define NR_ISAIRQS  16
+#define NR_LINK 4
+#if defined(CONFIG_X86)
+# define NR_HVM_DOMU_IRQS ARRAY_SIZE(((struct hvm_hw_vioapic *)0)->redirtbl)
+#endif
+
+/* Protected by domain's event_lock */
+struct hvm_irq_dpci {
+/* Guest IRQ to guest device/intx mapping. */
+struct list_head girq[NR_HVM_DOMU_IRQS];
+/* Record of mapped ISA IRQs */
+DECLARE_BITMAP(isairq_map, NR_ISAIRQS);
+/* Record of mapped Links */
+uint8_t link_cnt[NR_LINK];
+};
+
+/* Machine IRQ to guest device/intx mapping. */
+struct hvm_pirq_dpci {
+uint32_t flags;
+unsigned int state;
+bool_t masked;
+uint16_t pending;
+struct list_head digl_list;
+struct domain *dom;
+struct hvm_gmsi_info gmsi;
+struct timer timer;
+struct list_head softirq_list;
+};
+
+void pt_pirq_init(struct domain *, struct hvm_pirq_dpci *);
+bool_t pt_pirq_cleanup_check(struct hvm_pirq_dpci *);
+int pt_pirq_iterate(struct domain *d,
+int (*cb)(struct domain *,
+  struct hvm_pirq_dpci *, void *arg),
+void *arg);
+
+bool_t pt_pirq_softirq_active(struct hvm_pirq_dpci *);
+/* Modify state of a PCI INTx wire. */
+void hvm_pci_intx_assert(struct domain *d, unsigned int device,
+