core/iommu changes for v2.6.35
Subsystems (6)
Linus,
Please pull the latest core-iommu-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-iommu-for-linus
Thanks,
Ingo
------------------>
Joerg Roedel (11):
iommu-api: Rename ->{un}map function pointers to ->{un}map_range
iommu-api: Add iommu_map and iommu_unmap functions
iommu-api: Add ->{un}map callbacks to iommu_ops
VT-d: Change {un}map_range functions to implement {un}map interface
kvm: Change kvm_iommu_map_pages to map large pages x86/amd-iommu: Make iommu_map_page and alloc_pte aware of page sizes x86/amd-iommu: Make iommu_unmap_page and fetch_pte aware of page sizes x86/amd-iommu: Make amd_iommu_iova_to_phys aware of multiple page sizes x86/amd-iommu: Implement ->{un}map callbacks for iommu-api
iommu-api: Remove iommu_{un}map_range functions x86/amd-iommu: Add amd_iommu=off command line option
Documentation/kernel-parameters.txt | 2 + arch/x86/include/asm/amd_iommu_types.h | 34 ++++++ arch/x86/kernel/amd_iommu.c | 197 ++++++++++++++++++++------------ arch/x86/kernel/amd_iommu_init.c | 6 + drivers/base/iommu.c | 43 +++++--- drivers/pci/intel-iommu.c | 22 ++-- include/linux/iommu.h | 24 ++-- virt/kvm/iommu.c | 113 +++++++++++++++---- 8 files changed, 312 insertions(+), 129 deletions(-)
Documentation/kernel-parameters.txt +2 -0
@@ -324,6 +324,8 @@ and is between 256 and 4096 characters. It is defined in the file they are unmapped. Otherwise they are flushed before they will be reused, which is a lot of faster + off - do not initialize any AMD IOMMU found in + the system amijoy.map= [HW,JOY] Amiga joystick support Map of devices attached to JOY0DAT and JOY1DAT
arch/x86/include/asm/amd_iommu_types.h +34 -0
@@ -174,6 +174,40 @@ (~((1ULL << (12 + ((lvl) * 9))) - 1)))#define PM_ALIGNED (lvl, addr) ((PM_MAP_MASK(lvl) & (addr)) == (addr)) +/* +* Returns the page table level to use for a given page size +* Pagesize is expected to be a power-of-two +*/ +#define PAGE_SIZE_LEVEL (pagesize) \ + ((__ffs(pagesize) - 12) / 9) +/* +* Returns the number of ptes to use for a given page size +* Pagesize is expected to be a power-of-two +*/ +#define PAGE_SIZE_PTE_COUNT (pagesize) \ + (1ULL << ((__ffs(pagesize) - 12) % 9)) + +/* +* Aligns a given io-virtual address to a given page size +* Pagesize is expected to be a power-of-two +*/ +#define PAGE_SIZE_ALIGN (address, pagesize) \ + ((address) & ~((pagesize) - 1)) +/* +* Creates an IOMMU PTE for an address an a given pagesize +* The PTE has no permission bits set +* Pagesize is expected to be a power-of-two larger than 4096 +*/ +#define PAGE_SIZE_PTE (address, pagesize) \ + (((address) | ((pagesize) - 1)) & \ + (~(pagesize >> 1)) & PM_ADDR_MASK) + +/* +* Takes a PTE value with mode=0x07 and returns the page size it maps +*/ +#define PTE_PAGE_SIZE (pte) \ + (1ULL << (1 + ffz(((pte) | 0xfffULL)))) +#define IOMMU_PTE_P (1ULL << 0)#define IOMMU_PTE_TV (1ULL << 1)#define IOMMU_PTE_U (1ULL << 59)
arch/x86/kernel/amd_iommu.c +126 -71
331 lines not on this page · raw message
arch/x86/kernel/amd_iommu_init.c +6 -0
@@ -120,6 +120,7 @@ struct ivmd_header {bool amd_iommu_dump;static int __initdata amd_iommu_detected; +static bool __initdata amd_iommu_disabled;u16 amd_iommu_last_bdf;/* largest PCI device id we have to handle */
@@ -1372,6 +1373,9 @@ void __init amd_iommu_detect(void)if (no_iommu || (iommu_detected && !gart_iommu_aperture))return ; +if (amd_iommu_disabled) +return ; +if (acpi_table_parse ("IVRS" , early_amd_iommu_detect) ==0 ) { iommu_detected =1 ; amd_iommu_detected =1 ;
@@ -1401,6 +1405,8 @@ static int __init parse_amd_iommu_options(char *str)for (; *str; ++str) {if (strncmp (str,"fullflush" ,9 ) ==0 ) amd_iommu_unmap_flush = true; +if (strncmp (str,"off" ,3 ) ==0 ) + amd_iommu_disabled = true; }return 1 ;
drivers/base/iommu.c +29 -14
52 lines not on this page · raw message
drivers/pci/intel-iommu.c +12 -10
@@ -3626,14 +3626,15 @@ static void intel_iommu_detach_device(struct iommu_domain *domain,domain_remove_one_dev_info (dmar_domain, pdev); } -static int intel_iommu_map_range (struct iommu_domain *domain, -unsigned long iova,phys_addr_t hpa, -size_t size,int iommu_prot) +static int intel_iommu_map (struct iommu_domain *domain, +unsigned long iova,phys_addr_t hpa, +int gfp_order,int iommu_prot) {struct dmar_domain *dmar_domain = domain->priv;u64 max_addr;int addr_width;int prot =0 ; +size_t size;int ret;if (iommu_prot &IOMMU_READ )
@@ -3643,6 +3644,7 @@ static int intel_iommu_map_range(struct iommu_domain *domain,if ((iommu_prot &IOMMU_CACHE ) && dmar_domain->iommu_snooping) prot |=DMA_PTE_SNP ; + size =PAGE_SIZE << gfp_order; max_addr = iova + size;if (dmar_domain->max_addr < max_addr) {int min_agaw;
@@ -3669,19 +3671,19 @@ static int intel_iommu_map_range(struct iommu_domain *domain,return ret; } -static void intel_iommu_unmap_range (struct iommu_domain *domain, -unsigned long iova,size_t size) +static int intel_iommu_unmap (struct iommu_domain *domain, +unsigned long iova,int gfp_order) {struct dmar_domain *dmar_domain = domain->priv; - -if (!size) -return ; +size_t size =PAGE_SIZE << gfp_order;dma_pte_clear_range (dmar_domain, iova >>VTD_PAGE_SHIFT , (iova + size -1 ) >>VTD_PAGE_SHIFT );if (dmar_domain->max_addr == iova + size) dmar_domain->max_addr = iova; + +return gfp_order; } static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain,
@@ -3714,8 +3716,8 @@ static struct iommu_ops intel_iommu_ops = { .domain_destroy = intel_iommu_domain_destroy, .attach_dev = intel_iommu_attach_device, .detach_dev = intel_iommu_detach_device, - .map = intel_iommu_map_range, - .unmap = intel_iommu_unmap_range, + .map = intel_iommu_map, + .unmap = intel_iommu_unmap, .iova_to_phys = intel_iommu_iova_to_phys, .domain_has_cap = intel_iommu_domain_has_cap, };
include/linux/iommu.h +12 -12
@@ -37,9 +37,9 @@ struct iommu_ops {int (*attach_dev)(struct iommu_domain *domain,struct device *dev);void (*detach_dev)(struct iommu_domain *domain,struct device *dev);int (*map)(struct iommu_domain *domain,unsigned long iova, -phys_addr_t paddr,size_t size,int prot); -void (*unmap)(struct iommu_domain *domain,unsigned long iova, -size_t size); +phys_addr_t paddr,int gfp_order,int prot); +int (*unmap)(struct iommu_domain *domain,unsigned long iova, +int gfp_order);phys_addr_t (*iova_to_phys)(struct iommu_domain *domain,unsigned long iova); int (*domain_has_cap)(struct iommu_domain *domain,
@@ -56,10 +56,10 @@ extern int iommu_attach_device(struct iommu_domain *domain, struct device *dev);extern void iommu_detach_device (struct iommu_domain *domain,struct device *dev); -extern int iommu_map_range (struct iommu_domain *domain,unsigned long iova, -phys_addr_t paddr,size_t size,int prot); -extern void iommu_unmap_range (struct iommu_domain *domain,unsigned long iova, -size_t size); +extern int iommu_map (struct iommu_domain *domain,unsigned long iova, +phys_addr_t paddr,int gfp_order,int prot); +extern int iommu_unmap (struct iommu_domain *domain,unsigned long iova, +int gfp_order);extern phys_addr_t iommu_iova_to_phys (struct iommu_domain *domain,unsigned long iova); extern int iommu_domain_has_cap(struct iommu_domain *domain,
@@ -96,16 +96,16 @@ static inline void iommu_detach_device(struct iommu_domain *domain, { } -static inline int iommu_map_range (struct iommu_domain *domain, -unsigned long iova,phys_addr_t paddr, -size_t size,int prot) +static inline int iommu_map (struct iommu_domain *domain,unsigned long iova, +phys_addr_t paddr,int gfp_order,int prot) {return -ENODEV ; } -static inline void iommu_unmap_range (struct iommu_domain *domain, -unsigned long iova,size_t size) +static inline int iommu_unmap (struct iommu_domain *domain,unsigned long iova, +int gfp_order) { +return -ENODEV ; } static inline phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain,
virt/kvm/iommu.c +91 -22
161 lines not on this page · raw message