Commit 1221a474 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Paolo Bonzini
Browse files

memory/iommu: introduce IOMMUMemoryRegionClass 



This finishes QOM'fication of IOMMUMemoryRegion by introducing
a IOMMUMemoryRegionClass. This also provides a fastpath analog for
IOMMU_MEMORY_REGION_GET_CLASS().

This makes IOMMUMemoryRegion an abstract class.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Message-Id: <20170711035620.4232-3-aik@ozlabs.ru>
Acked-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3df9d748

exec.c

+4 −2
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ static MemoryRegionSection address_space_do_translate(AddressSpace *as, 
    IOMMUTLBEntry iotlb;

    MemoryRegionSection *section;

    IOMMUMemoryRegion *iommu_mr;

    IOMMUMemoryRegionClass *imrc;



    for (;;) {

        AddressSpaceDispatch *d = atomic_rcu_read(&as->dispatch);
@@ -490,8 +491,9 @@ static MemoryRegionSection address_space_do_translate(AddressSpace *as, 
        if (!iommu_mr) {

            break;

        }

        imrc = memory_region_get_iommu_class_nocheck(iommu_mr);



        iotlb = iommu_mr->iommu_ops->translate(iommu_mr, addr, is_write ?

        iotlb = imrc->translate(iommu_mr, addr, is_write ?

                                IOMMU_WO : IOMMU_RO);

        addr = ((iotlb.translated_addr & ~iotlb.addr_mask)

                | (addr & iotlb.addr_mask));

hw/alpha/typhoon.c

+18 −5
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 




#define TYPE_TYPHOON_PCI_HOST_BRIDGE "typhoon-pcihost"

#define TYPE_TYPHOON_IOMMU_MEMORY_REGION "typhoon-iommu-memory-region"



typedef struct TyphoonCchip {

    MemoryRegion region;
@@ -725,10 +726,6 @@ static IOMMUTLBEntry typhoon_translate_iommu(IOMMUMemoryRegion *iommu, 
    return ret;

}



static const MemoryRegionIOMMUOps typhoon_iommu_ops = {

    .translate = typhoon_translate_iommu,

};



static AddressSpace *typhoon_pci_dma_iommu(PCIBus *bus, void *opaque, int devfn)

{

    TyphoonState *s = opaque;
@@ -892,7 +889,8 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, 
    qdev_init_nofail(dev);



    /* Host memory as seen from the PCI side, via the IOMMU.  */

    memory_region_init_iommu(&s->pchip.iommu, OBJECT(s), &typhoon_iommu_ops,

    memory_region_init_iommu(&s->pchip.iommu, sizeof(s->pchip.iommu),

                             TYPE_TYPHOON_IOMMU_MEMORY_REGION, OBJECT(s),

                             "iommu-typhoon", UINT64_MAX);

    address_space_init(&s->pchip.iommu_as, MEMORY_REGION(&s->pchip.iommu),

                       "pchip0-pci");
@@ -953,9 +951,24 @@ static const TypeInfo typhoon_pcihost_info = { 
    .class_init    = typhoon_pcihost_class_init,

};



static void typhoon_iommu_memory_region_class_init(ObjectClass *klass,

                                                   void *data)

{

    IOMMUMemoryRegionClass *imrc = IOMMU_MEMORY_REGION_CLASS(klass);



    imrc->translate = typhoon_translate_iommu;

}



static const TypeInfo typhoon_iommu_memory_region_info = {

    .parent = TYPE_IOMMU_MEMORY_REGION,

    .name = TYPE_TYPHOON_IOMMU_MEMORY_REGION,

    .class_init = typhoon_iommu_memory_region_class_init,

};



static void typhoon_register_types(void)

{

    type_register_static(&typhoon_pcihost_info);

    type_register_static(&typhoon_iommu_memory_region_info);

}



type_init(typhoon_register_types)

hw/dma/rc4030.c

+20 −6
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ typedef struct dma_pagetable_entry { 
#define RC4030(obj) \

    OBJECT_CHECK(rc4030State, (obj), TYPE_RC4030)



#define TYPE_RC4030_IOMMU_MEMORY_REGION "rc4030-iommu-memory-region"



typedef struct rc4030State

{

    SysBusDevice parent;
@@ -516,10 +518,6 @@ static IOMMUTLBEntry rc4030_dma_translate(IOMMUMemoryRegion *iommu, hwaddr addr, 
    return ret;

}



static const MemoryRegionIOMMUOps rc4030_dma_ops = {

    .translate = rc4030_dma_translate,

};



static void rc4030_reset(DeviceState *dev)

{

    rc4030State *s = RC4030(dev);
@@ -677,8 +675,9 @@ static void rc4030_realize(DeviceState *dev, Error **errp) 
    memory_region_init_io(&s->iomem_jazzio, NULL, &jazzio_ops, s,

                          "rc4030.jazzio", 0x00001000);



    memory_region_init_iommu(&s->dma_mr, o, &rc4030_dma_ops,

                             "rc4030.dma", UINT32_MAX);

    memory_region_init_iommu(&s->dma_mr, sizeof(s->dma_mr),

                             TYPE_RC4030_IOMMU_MEMORY_REGION,

                             o, "rc4030.dma", UINT32_MAX);

    address_space_init(&s->dma_as, MEMORY_REGION(&s->dma_mr), "rc4030-dma");

}
@@ -710,9 +709,24 @@ static const TypeInfo rc4030_info = { 
    .class_init = rc4030_class_init,

};



static void rc4030_iommu_memory_region_class_init(ObjectClass *klass,

                                                  void *data)

{

    IOMMUMemoryRegionClass *imrc = IOMMU_MEMORY_REGION_CLASS(klass);



    imrc->translate = rc4030_dma_translate;

}



static const TypeInfo rc4030_iommu_memory_region_info = {

    .parent = TYPE_IOMMU_MEMORY_REGION,

    .name = TYPE_RC4030_IOMMU_MEMORY_REGION,

    .class_init = rc4030_iommu_memory_region_class_init,

};



static void rc4030_register_types(void)

{

    type_register_static(&rc4030_info);

    type_register_static(&rc4030_iommu_memory_region_info);

}



type_init(rc4030_register_types)

hw/i386/amd_iommu.c

+20 −4
Original line number Diff line number Diff line
@@ -1044,8 +1044,11 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus *bus, void *opaque, int devfn) 
        iommu_as[devfn]->devfn = (uint8_t)devfn;

        iommu_as[devfn]->iommu_state = s;



        memory_region_init_iommu(&iommu_as[devfn]->iommu, OBJECT(s),

                                 &s->iommu_ops, "amd-iommu", UINT64_MAX);

        memory_region_init_iommu(&iommu_as[devfn]->iommu,

                                 sizeof(iommu_as[devfn]->iommu),

                                 TYPE_AMD_IOMMU_MEMORY_REGION,

                                 OBJECT(s),

                                 "amd-iommu", UINT64_MAX);

        address_space_init(&iommu_as[devfn]->as,

                           MEMORY_REGION(&iommu_as[devfn]->iommu),

                           "amd-iommu");
@@ -1086,8 +1089,6 @@ static void amdvi_init(AMDVIState *s) 
{

    amdvi_iotlb_reset(s);



    s->iommu_ops.translate = amdvi_translate;

    s->iommu_ops.notify_flag_changed = amdvi_iommu_notify_flag_changed;

    s->devtab_len = 0;

    s->cmdbuf_len = 0;

    s->cmdbuf_head = 0;
@@ -1228,10 +1229,25 @@ static const TypeInfo amdviPCI = { 
    .instance_size = sizeof(AMDVIPCIState),

};



static void amdvi_iommu_memory_region_class_init(ObjectClass *klass, void *data)

{

    IOMMUMemoryRegionClass *imrc = IOMMU_MEMORY_REGION_CLASS(klass);



    imrc->translate = amdvi_translate;

    imrc->notify_flag_changed = amdvi_iommu_notify_flag_changed;

}



static const TypeInfo amdvi_iommu_memory_region_info = {

    .parent = TYPE_IOMMU_MEMORY_REGION,

    .name = TYPE_AMD_IOMMU_MEMORY_REGION,

    .class_init = amdvi_iommu_memory_region_class_init,

};



static void amdviPCI_register_types(void)

{

    type_register_static(&amdviPCI);

    type_register_static(&amdvi);

    type_register_static(&amdvi_iommu_memory_region_info);

}



type_init(amdviPCI_register_types);

hw/i386/amd_iommu.h

+2 −3
Original line number Diff line number Diff line
@@ -220,6 +220,8 @@ 


#define TYPE_AMD_IOMMU_PCI "AMDVI-PCI"



#define TYPE_AMD_IOMMU_MEMORY_REGION "amd-iommu-iommu-memory-region"



typedef struct AMDVIAddressSpace AMDVIAddressSpace;



/* functions to steal PCI config space */
@@ -276,9 +278,6 @@ typedef struct AMDVIState { 
    uint8_t romask[AMDVI_MMIO_SIZE];   /* MMIO read/only mask          */

    bool mmio_enabled;



    /* IOMMU function */

    MemoryRegionIOMMUOps iommu_ops;



    /* for each served device */

    AMDVIAddressSpace **address_spaces[PCI_BUS_MAX];