| Message ID | 1473674889-2727-3-git-send-email-davidkiarie4@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Sep 12, 2016 at 01:08:05PM +0300, David Kiarie wrote: [...] > @@ -2252,14 +2250,17 @@ static MemTxResult vtd_mem_ir_write(void *opaque, hwaddr addr, > { > int ret = 0; > MSIMessage from = {}, to = {}; > - uint16_t sid = X86_IOMMU_SID_INVALID; > + VTDAddressSpace *as = opaque; > + uint16_t sid = PCI_BUILD_BDF(pci_bus_num(as->bus), as->devfn); I remembered to have commented on this... PCI_BUILD_BDF() should be problematic. SID may not be built that way when with PCI bridges (or say, I think current code won't work with PCI bridges). Please see commit: commit 4a94b3aa6d97dfa67a20c7a0315c9773352f0e8e Author: Peter Xu <peterx@redhat.com> Date: Tue May 17 19:26:10 2016 +0800 pci: fix pci_requester_id() That's why we explicitly differenciate BDF and SID. I would suggest to make it simpler: we just do not do this extra check, and pass attrs.requester_id to vtd_interrupt_remap_msi() directly. Thanks, -- peterx
On Mon, Sep 12, 2016 at 2:09 PM, Peter Xu <peterx@redhat.com> wrote: > On Mon, Sep 12, 2016 at 01:08:05PM +0300, David Kiarie wrote: > > [...] > > > @@ -2252,14 +2250,17 @@ static MemTxResult vtd_mem_ir_write(void > *opaque, hwaddr addr, > > { > > int ret = 0; > > MSIMessage from = {}, to = {}; > > - uint16_t sid = X86_IOMMU_SID_INVALID; > > + VTDAddressSpace *as = opaque; > > + uint16_t sid = PCI_BUILD_BDF(pci_bus_num(as->bus), as->devfn); > > I remembered to have commented on this... PCI_BUILD_BDF() should be > problematic. SID may not be built that way when with PCI bridges (or > say, I think current code won't work with PCI bridges). Please see > commit: > > commit 4a94b3aa6d97dfa67a20c7a0315c9773352f0e8e > Author: Peter Xu <peterx@redhat.com> > Date: Tue May 17 19:26:10 2016 +0800 > > pci: fix pci_requester_id() > > That's why we explicitly differenciate BDF and SID. > > I would suggest to make it simpler: we just do not do this extra > check, and pass attrs.requester_id to vtd_interrupt_remap_msi() directly. > Yes, we did discuss this but didn't come up with a conclusion so I stuck with the check. I will remove the check in the next version. > Thanks, > > -- peterx >
On Mon, Sep 12, 2016 at 01:08:05PM +0300, David Kiarie wrote: > Platform devices are now able to make interrupt request with > explicit SIDs hence we can safely expect triggered AddressSpace ID > to match the requesting ID > > Signed-off-by: David Kiarie <davidkiarie4@gmail.com> > --- > hw/i386/intel_iommu.c | 77 ++++++++++++++++++++++++++------------------------- > 1 file changed, 39 insertions(+), 38 deletions(-) > > diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c > index 496d836..e4bad6a 100644 > --- a/hw/i386/intel_iommu.c > +++ b/hw/i386/intel_iommu.c > @@ -2043,43 +2043,41 @@ static int vtd_irte_get(IntelIOMMUState *iommu, uint16_t index, > return -VTD_FR_IR_IRTE_RSVD; > } > > - if (sid != X86_IOMMU_SID_INVALID) { Btw, if we removed all references of X86_IOMMU_SID_INVALID, we can just remove the defination as well in this patch. Thanks, -- peterx
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 496d836..e4bad6a 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -2043,43 +2043,41 @@ static int vtd_irte_get(IntelIOMMUState *iommu, uint16_t index, return -VTD_FR_IR_IRTE_RSVD; } - if (sid != X86_IOMMU_SID_INVALID) { - /* Validate IRTE SID */ - source_id = le32_to_cpu(entry->irte.source_id); - switch (entry->irte.sid_vtype) { - case VTD_SVT_NONE: - VTD_DPRINTF(IR, "No SID validation for IRTE index %d", index); - break; - - case VTD_SVT_ALL: - mask = vtd_svt_mask[entry->irte.sid_q]; - if ((source_id & mask) != (sid & mask)) { - VTD_DPRINTF(GENERAL, "SID validation for IRTE index " - "%d failed (reqid 0x%04x sid 0x%04x)", index, - sid, source_id); - return -VTD_FR_IR_SID_ERR; - } - break; + /* Validate IRTE SID */ + source_id = le32_to_cpu(entry->irte.source_id); + switch (entry->irte.sid_vtype) { + case VTD_SVT_NONE: + VTD_DPRINTF(IR, "No SID validation for IRTE index %d", index); + break; - case VTD_SVT_BUS: - bus_max = source_id >> 8; - bus_min = source_id & 0xff; - bus = sid >> 8; - if (bus > bus_max || bus < bus_min) { - VTD_DPRINTF(GENERAL, "SID validation for IRTE index %d " - "failed (bus %d outside %d-%d)", index, bus, - bus_min, bus_max); - return -VTD_FR_IR_SID_ERR; - } - break; + case VTD_SVT_ALL: + mask = vtd_svt_mask[entry->irte.sid_q]; + if ((source_id & mask) != (sid & mask)) { + VTD_DPRINTF(GENERAL, "SID validation for IRTE index " + "%d failed (reqid 0x%04x sid 0x%04x)", index, + sid, source_id); + return -VTD_FR_IR_SID_ERR; + } + break; - default: - VTD_DPRINTF(GENERAL, "Invalid SVT bits (0x%x) in IRTE index " - "%d", entry->irte.sid_vtype, index); - /* Take this as verification failure. */ + case VTD_SVT_BUS: + bus_max = source_id >> 8; + bus_min = source_id & 0xff; + bus = sid >> 8; + if (bus > bus_max || bus < bus_min) { + VTD_DPRINTF(GENERAL, "SID validation for IRTE index %d " + "failed (bus %d outside %d-%d)", index, bus, + bus_min, bus_max); return -VTD_FR_IR_SID_ERR; - break; } + break; + + default: + VTD_DPRINTF(GENERAL, "Invalid SVT bits (0x%x) in IRTE index " + "%d", entry->irte.sid_vtype, index); + /* Take this as verification failure. */ + return -VTD_FR_IR_SID_ERR; + break; } return 0; @@ -2252,14 +2250,17 @@ static MemTxResult vtd_mem_ir_write(void *opaque, hwaddr addr, { int ret = 0; MSIMessage from = {}, to = {}; - uint16_t sid = X86_IOMMU_SID_INVALID; + VTDAddressSpace *as = opaque; + uint16_t sid = PCI_BUILD_BDF(pci_bus_num(as->bus), as->devfn); from.address = (uint64_t) addr + VTD_INTERRUPT_ADDR_FIRST; from.data = (uint32_t) value; - if (!attrs.unspecified) { - /* We have explicit Source ID */ - sid = attrs.requester_id; + if (attrs.requester_id != sid) { + VTD_DPRINTF(GENERAL, "int remap request for sid 0x%04x" + " requester_id 0x%04x couldn't be verified", + sid, attrs.requester_id); + return MEMTX_ERROR; } ret = vtd_interrupt_remap_msi(opaque, &from, &to, sid); @@ -2325,7 +2326,7 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn) memory_region_init_iommu(&vtd_dev_as->iommu, OBJECT(s), &s->iommu_ops, "intel_iommu", UINT64_MAX); memory_region_init_io(&vtd_dev_as->iommu_ir, OBJECT(s), - &vtd_mem_ir_ops, s, "intel_iommu_ir", + &vtd_mem_ir_ops, vtd_dev_as, "intel_iommu_ir", VTD_INTERRUPT_ADDR_SIZE); memory_region_add_subregion(&vtd_dev_as->iommu, VTD_INTERRUPT_ADDR_FIRST, &vtd_dev_as->iommu_ir);
Platform devices are now able to make interrupt request with explicit SIDs hence we can safely expect triggered AddressSpace ID to match the requesting ID Signed-off-by: David Kiarie <davidkiarie4@gmail.com> --- hw/i386/intel_iommu.c | 77 ++++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 38 deletions(-)