swiotlb: create __alloc_bootmem_low_nopanic and add support in SWIOTLB
Subsystems (2)
PATCH 2/3 swiotlb: create __alloc_bootmem_low_nopanic and add support in SWIOTLB
Per Andi Kleen's suggestion in the review of our Calgary IOMMU code, I tried to use the alloc_bootmem_nopanic that Andi recently added. Unfortunately, it needs low mem for our translation tables, so we needed a new function to do this.
I have updated swiotlb to take advantage of this new function (and added an error path to lib/swiotlb.c and resulting fallout from calling functions).
This patch has been tested individually and cumulatively on x86_64 and cross-compile tested on IA64. Since I have no IA64 hardware, any testing on that platform would be appreciated.
Thanks,
Jon
arch/x86_64/kernel/pci-swiotlb.c +9 -3
@@ -30,13 +30,19 @@void pci_swiotlb_init (void ) { +int rc; +/* don't initialize swiotlb if iommu=off (no_iommu=1) */ if (!iommu_aperture && !no_iommu && (end_pfn >MAX_DMA32_PFN || force_iommu)) swiotlb =1 ;if (swiotlb) { -printk (KERN_INFO "PCI-DMA: Using software bounce buffering for IO (SWIOTLB)\n" ); -swiotlb_init (); - dma_ops = &swiotlb_dma_ops; +printk (KERN_INFO "PCI-DMA: Using software bounce buffering for " +"IO (SWIOTLB)\n" ); + rc =swiotlb_init (); +if (!rc) + dma_ops = &swiotlb_dma_ops; +else + swiotlb =0 ; } }
include/asm-ia64/machvec.h +1 -1
@@ -38,7 +38,7 @@typedef void ia64_mv_migrate_t (struct task_struct * task);/* DMA-mapping interface: */ -typedef void ia64_mv_dma_init (void ); +typedef int ia64_mv_dma_init (void );typedef void *ia64_mv_dma_alloc_coherent (struct device *,size_t ,dma_addr_t *,gfp_t );typedef void ia64_mv_dma_free_coherent (struct device *,size_t ,void *,dma_addr_t );typedef dma_addr_t ia64_mv_dma_map_single (struct device *,void *,size_t ,int );
include/asm-x86_64/swiotlb.h +1 -1
@@ -41,7 +41,7 @@extern void swiotlb_free_coherent (struct device *hwdev,size_t size,void *vaddr,dma_addr_t dma_handle);extern int swiotlb_dma_supported (struct device *hwdev,u64 mask); -extern void swiotlb_init (void ); +extern int swiotlb_init (void );#ifdef CONFIG_SWIOTLB extern int swiotlb;
include/linux/bootmem.h +1 -0
@@ -46,6 +46,7 @@extern void __init free_bootmem (unsigned long addr,unsigned long size);extern void *__init __alloc_bootmem (unsigned long size,unsigned long align,unsigned long goal);extern void *__init __alloc_bootmem_nopanic (unsigned long size,unsigned long align,unsigned long goal); +extern void *__init __alloc_bootmem_low_nopanic (unsigned long size,unsigned long align,unsigned long goal);extern void *__init __alloc_bootmem_low (unsigned long size,unsigned long align,unsigned long goal);
lib/swiotlb.c +26 -4
@@ -126,7 +126,7 @@* Statically reserve bounce buffer space and initialize bounce buffer data * structures for the software IO TLB used to implement the DMA API. */ -void +int swiotlb_init (void ) {unsigned long i;
@@ -140,10 +140,11 @@/* * Get IO TLB memory from the low pages */ - io_tlb_start =alloc_bootmem_low_pages (io_tlb_nslabs * - (1 <<IO_TLB_SHIFT )); + io_tlb_start =__alloc_bootmem_low_nopanic (io_tlb_nslabs * + (1 <<IO_TLB_SHIFT ),PAGE_SIZE ,0 );if (!io_tlb_start) -panic ("Cannot allocate SWIOTLB buffer" ); + goto nomem_error; + io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 <<IO_TLB_SHIFT );/*
@@ -152,18 +153,39 @@* between io_tlb_start and io_tlb_end. */ io_tlb_list =alloc_bootmem (io_tlb_nslabs *sizeof (int )); +if (!io_tlb_list) + goto free_io_tlb_start; +for (i =0 ; i < io_tlb_nslabs; i++) io_tlb_list[i] =IO_TLB_SEGSIZE -OFFSET (i,IO_TLB_SEGSIZE ); io_tlb_index =0 ; io_tlb_orig_addr =alloc_bootmem (io_tlb_nslabs *sizeof (char *)); +if (!io_tlb_orig_addr) + goto free_io_tlb_list;/* * Get the overflow emergency buffer */ io_tlb_overflow_buffer =alloc_bootmem_low (io_tlb_overflow); +if (!io_tlb_overflow_buffer) + goto free_io_tlb_orig_addr; +printk (KERN_INFO "Placing %dMB software IO TLB between 0x%lx - 0x%lx\n" , (int ) (io_tlb_nslabs * (1 <<IO_TLB_SHIFT )) >>20 ,virt_to_phys (io_tlb_start),virt_to_phys (io_tlb_end)); + +return 0 ; + +free_io_tlb_orig_addr: +free_bootmem (__pa (io_tlb_orig_addr), io_tlb_nslabs *sizeof (char *)); +free_io_tlb_list: +free_bootmem (__pa (io_tlb_list), io_tlb_nslabs *sizeof (int )); +free_io_tlb_start: +free_bootmem (__pa (io_tlb_start), io_tlb_nslabs * (1 <<IO_TLB_SHIFT )); +nomem_error: +printk (KERN_ERR "SWIOTLB: Unable to allocate memory, disabling " +"IOMMU\n" ); +return -ENOMEM ; }/*
mm/bootmem.c +13 -0
@@ -463,3 +463,16 @@ {return __alloc_bootmem_core (pgdat->bdata, size, align, goal,LOW32LIMIT ); } + +void *__init __alloc_bootmem_low_nopanic (unsigned long size, +unsigned long align,unsigned long goal) +{ +bootmem_data_t *bdata; +void *ptr; + +list_for_each_entry (bdata, &bdata_list, list) +if ((ptr =__alloc_bootmem_core (bdata, size, align, goal, +LOW32LIMIT ))) +return (ptr); +return NULL ; +}
Quoted 5 lines · Jon Mason
Per Andi Kleen's suggestion in the review of our Calgary IOMMU code, I tried to use the
alloc_bootmem_nopanicthat Andi recently added. Unfortunately, it needs low mem for our translation tables, so we needed a new function to do this.
Quoted 7 lines
I have updated swiotlb to take advantage of this new function (and added an error path to
lib/swiotlb.cand resulting fallout from calling functions).This patch has been tested individually and cumulatively on
x86_64and cross-compile tested on IA64. Since I have no IA64 hardware, any testing on that platform would be appreciated.
A couple of minor nits below, otherwise looks good.
Quoted 1 line
Signed-off-by Jon Mason <[email protected]>
include/linux/bootmem.h line 49
Quoted 8 lines
diff -r
b5bb5fea7490-r62dc1eb0c5e2include/linux/bootmem.hinclude/linux/bootmem.h +1
-0@@ -46,6 +46,7 @@extern void __init free_bootmem (unsigned long addr,unsigned long size);extern void *__init __alloc_bootmem (unsigned long size,unsigned long align,unsigned long goal);extern void *__init __alloc_bootmem_nopanic (unsigned long size,unsigned long align,unsigned long goal); +extern void *__init __alloc_bootmem_low_nopanic (unsigned long size,unsigned long align,unsigned long goal);
Would be nice to convert this and the preceding declarations to 80 chars per line, please.
Quoted 8 lines
diff -r
b5bb5fea7490-r62dc1eb0c5e2mm/bootmem.cmm/bootmem.c +1
-0@@ -463,3 +463,16 @@ {return __alloc_bootmem_core (pgdat->bdata, size, align, goal,LOW32LIMIT ); } +
mm/bootmem.c line 476
Quoted 10 lines
mm/bootmem.c +10
-0+void *__init __alloc_bootmem_low_nopanic (unsigned long size, +unsigned long align,unsigned long goal) +{ +bootmem_data_t *bdata; +void *ptr; + +list_for_each_entry (bdata, &bdata_list, list) +if ((ptr =__alloc_bootmem_core (bdata, size, align, goal, +LOW32LIMIT ))) +return (ptr);
This should be 'return ptr';
Cheers,
Muli
Quoted 45 lines · Muli Ben-Yehuda
Quoted 5 lines · Jon Mason
Per Andi Kleen's suggestion in the review of our Calgary IOMMU code, I tried to use the
alloc_bootmem_nopanicthat Andi recently added. Unfortunately, it needs low mem for our translation tables, so we needed a new function to do this.Quoted 7 lines
I have updated swiotlb to take advantage of this new function (and added an error path to
lib/swiotlb.cand resulting fallout from calling functions).This patch has been tested individually and cumulatively on
x86_64and cross-compile tested on IA64. Since I have no IA64 hardware, any testing on that platform would be appreciated.A couple of minor nits below, otherwise looks good.
Quoted 1 line
Signed-off-by Jon Mason <[email protected]>Acked-by Muli Ben-Yehuda <[email protected]>include/linux/bootmem.h line 49
Quoted 8 lines
diff -r
b5bb5fea7490-r62dc1eb0c5e2include/linux/bootmem.hinclude/linux/bootmem.h +1
-0@@ -46,6 +46,7 @@extern void __init free_bootmem (unsigned long addr,unsigned long size);extern void *__init __alloc_bootmem (unsigned long size,unsigned long align,unsigned long goal);extern void *__init __alloc_bootmem_nopanic (unsigned long size,unsigned long align,unsigned long goal); +extern void *__init __alloc_bootmem_low_nopanic (unsigned long size,unsigned long align,unsigned long goal);Would be nice to convert this and the preceding declarations to 80 chars per line, please.
Quoted 12 lines
diff -r
b5bb5fea7490-r62dc1eb0c5e2mm/bootmem.cmm/bootmem.c +5
-0@@ -463,3 +463,16 @@ {return __alloc_bootmem_core (pgdat->bdata, size, align, goal,LOW32LIMIT ); } + +void *__init __alloc_bootmem_low_nopanic (unsigned long size, +unsigned long align,unsigned long goal) +{ +bootmem_data_t *bdata;
Quoted 8 lines
mm/bootmem.c line 476
Quoted 6 lines
mm/bootmem.c +6
-0+void *ptr; + +list_for_each_entry (bdata, &bdata_list, list) +if ((ptr =__alloc_bootmem_core (bdata, size, align, goal, +LOW32LIMIT ))) +return (ptr);This should be 'return ptr';
I completely agree with both nits, but the changes follow the style currently in the files. I'll do a clean-up patch to both of the files in question. :)
Thanks,
Jon
Quoted 3 lines
Cheers,
Muli