History

[PATCH] swiotlb: make sure initial DMA allocations really are in DMA memory

This introduces a limit parameter to the core bootmem allocator; The new parameter indicates that physical memory allocated by the bootmem allocator should be within the requested limit. We also introduce alloc_bootmem_low_pages_limit, alloc_bootmem_node_limit, alloc_bootmem_low_pages_node_limit apis, but alloc_bootmem_low_pages_limit is the only api used for swiotlb. The existing alloc_bootmem_low_pages() api could instead have been changed and made to pass right limit to the core allocator. But that would make the patch more intrusive for 2.6.14, as other arches use alloc_bootmem_low_pages(). We may be done that post 2.6.14 as a cleanup. With this, swiotlb gets memory within 4G for both x86_64 and ia64 arches.

Yasunori Goto committed 21 years ago

Commit 281dd251 parent 51b190b3 files · +53 −14Browse files

Unified · Split

3 files
  1. arch/ia64/lib/swiotlb.c +2 −2
  2. include/linux/bootmem.h +30 −2
  3. mm/bootmem.c +21 −10
arch/ia64/lib/swiotlb.c+2−2
@@ -123,8 +123,8 @@ swiotlb_init_with_default_size (size_t default_size) · 122 unmodified lines
123123 /*
124124 * Get IO TLB memory from the low pages
125125 */
126− io_tlb_start = alloc_bootmem_low_pages(io_tlb_nslabs *
127− (1 << IO_TLB_SHIFT));
126+ io_tlb_start = alloc_bootmem_low_pages_limit(io_tlb_nslabs *
127+ (1 << IO_TLB_SHIFT), 0x100000000);
128128 if (!io_tlb_start)
129129 panic("Cannot allocate SWIOTLB buffer");
130130 io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT);
include/linux/bootmem.h+30−2
@@ -43,7 +43,7 @@ typedef struct bootmem_data { · 42 unmodified lines
4343 extern unsigned long __init bootmem_bootmap_pages (unsigned long);
4444 extern unsigned long __init init_bootmem (unsigned long addr, unsigned long memend);
4545 extern void __init free_bootmem (unsigned long addr, unsigned long size);
46−extern void * __init __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal);
46+extern void * __init __alloc_bootmem_limit (unsigned long size, unsigned long align, unsigned long goal, unsigned long limit);
4747 #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
4848 extern void __init reserve_bootmem (unsigned long addr, unsigned long size);
4949 #define alloc_bootmem(x) \
@@ -54,6 +54,16 @@ extern void __init reserve_bootmem (unsigned long addr, unsigned long size); · 4 unmodified lines
5454 __alloc_bootmem((x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
5555 #define alloc_bootmem_low_pages(x) \
5656 __alloc_bootmem((x), PAGE_SIZE, 0)
57+
58+#define alloc_bootmem_limit(x, limit) \
59+ __alloc_bootmem_limit((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS), (limit))
60+#define alloc_bootmem_low_limit(x, limit) \
61+ __alloc_bootmem_limit((x), SMP_CACHE_BYTES, 0, (limit))
62+#define alloc_bootmem_pages_limit(x, limit) \
63+ __alloc_bootmem_limit((x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS), (limit))
64+#define alloc_bootmem_low_pages_limit(x, limit) \
65+ __alloc_bootmem_limit((x), PAGE_SIZE, 0, (limit))
66+
5767 #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
5868 extern unsigned long __init free_all_bootmem (void);
5969
@@ -61,7 +71,7 @@ extern unsigned long __init init_bootmem_node (pg_data_t *pgdat, unsigned long f · 1 unmodified line
6171 extern void __init reserve_bootmem_node (pg_data_t *pgdat, unsigned long physaddr, unsigned long size);
6272 extern void __init free_bootmem_node (pg_data_t *pgdat, unsigned long addr, unsigned long size);
6373 extern unsigned long __init free_all_bootmem_node (pg_data_t *pgdat);
64−extern void * __init __alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal);
74+extern void * __init __alloc_bootmem_node_limit (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal, unsigned long limit);
6575 #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
6676 #define alloc_bootmem_node(pgdat, x) \
6777 __alloc_bootmem_node((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
@@ -69,6 +79,14 @@ extern void * __init __alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, · 1 unmodified line
6979 __alloc_bootmem_node((pgdat), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
7080 #define alloc_bootmem_low_pages_node(pgdat, x) \
7181 __alloc_bootmem_node((pgdat), (x), PAGE_SIZE, 0)
82+
83+#define alloc_bootmem_node_limit(pgdat, x, limit) \
84+ __alloc_bootmem_node_limit((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS), (limit))
85+#define alloc_bootmem_pages_node_limit(pgdat, x, limit) \
86+ __alloc_bootmem_node_limit((pgdat), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS), (limit))
87+#define alloc_bootmem_low_pages_node_limit(pgdat, x, limit) \
88+ __alloc_bootmem_node_limit((pgdat), (x), PAGE_SIZE, 0, (limit))
89+
7290 #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
7391
7492 #ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP
@@ -105,5 +123,15 @@ extern void *__init alloc_large_system_hash(const char *tablename, · 30 unmodified lines
105123 #endif
106124 extern int __initdata hashdist; /* Distribute hashes across NUMA nodes? */
107125
126+static inline void *__alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal)
127+{
128+ return __alloc_bootmem_limit(size, align, goal, 0);
129+}
130+
131+static inline void *__alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align,
132+ unsigned long goal)
133+{
134+ return __alloc_bootmem_node_limit(pgdat, size, align, goal, 0);
135+}
108136
109137 #endif /* _LINUX_BOOTMEM_H */
mm/bootmem.c+21−10
@@ -154,10 +154,10 @@ static void __init free_bootmem_core(bootmem_data_t *bdata, unsigned long addr, · 153 unmodified lines
154154 */
155155 static void * __init
156156 __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
157− unsigned long align, unsigned long goal)
157+ unsigned long align, unsigned long goal, unsigned long limit)
158158 {
159159 unsigned long offset, remaining_size, areasize, preferred;
160− unsigned long i, start = 0, incr, eidx;
160+ unsigned long i, start = 0, incr, eidx, end_pfn = bdata->node_low_pfn;
161161 void *ret;
162162
163163 if(!size) {
@@ -166,7 +166,14 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size, · 2 unmodified lines
166166 }
167167 BUG_ON(align & (align-1));
168168
169− eidx = bdata->node_low_pfn - (bdata->node_boot_start >> PAGE_SHIFT);
169+ if (limit && bdata->node_boot_start >= limit)
170+ return NULL;
171+
172+ limit >>=PAGE_SHIFT;
173+ if (limit && end_pfn > limit)
174+ end_pfn = limit;
175+
176+ eidx = end_pfn - (bdata->node_boot_start >> PAGE_SHIFT);
170177 offset = 0;
171178 if (align &&
172179 (bdata->node_boot_start & (align - 1UL)) != 0)
@@ -178,11 +185,12 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size, · 5 unmodified lines
178185 * first, then we try to allocate lower pages.
179186 */
180187 if (goal && (goal >= bdata->node_boot_start) &&
181− ((goal >> PAGE_SHIFT) < bdata->node_low_pfn)) {
188+ ((goal >> PAGE_SHIFT) < end_pfn)) {
182189 preferred = goal - bdata->node_boot_start;
183190
184191 if (bdata->last_success >= preferred)
185− preferred = bdata->last_success;
192+ if (!limit || (limit && limit > bdata->last_success))
193+ preferred = bdata->last_success;
186194 } else
187195 preferred = 0;
188196
@@ -382,14 +390,15 @@ unsigned long __init free_all_bootmem (void) · 193 unmodified lines
382390 return(free_all_bootmem_core(NODE_DATA(0)));
383391 }
384392
385−void * __init __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal)
393+void * __init __alloc_bootmem_limit (unsigned long size, unsigned long align, unsigned long goal,
394+ unsigned long limit)
386395 {
387396 pg_data_t *pgdat = pgdat_list;
388397 void *ptr;
389398
390399 for_each_pgdat(pgdat)
391400 if ((ptr = __alloc_bootmem_core(pgdat->bdata, size,
392− align, goal)))
401+ align, goal, limit)))
393402 return(ptr);
394403
395404 /*
@@ -400,14 +409,16 @@ void * __init __alloc_bootmem (unsigned long size, unsigned long align, unsigned · 4 unmodified lines
400409 return NULL;
401410 }
402411
403−void * __init __alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal)
412+
413+void * __init __alloc_bootmem_node_limit (pg_data_t *pgdat, unsigned long size, unsigned long align,
414+ unsigned long goal, unsigned long limit)
404415 {
405416 void *ptr;
406417
407− ptr = __alloc_bootmem_core(pgdat->bdata, size, align, goal);
418+ ptr = __alloc_bootmem_core(pgdat->bdata, size, align, goal, limit);
408419 if (ptr)
409420 return (ptr);
410421
411− return __alloc_bootmem(size, align, goal);
422+ return __alloc_bootmem_limit(size, align, goal, limit);
412423 }
413424

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t