diff options
Diffstat (limited to 'arch/um/kernel/tlb.c')
-rw-r--r-- | arch/um/kernel/tlb.c | 267 |
1 files changed, 142 insertions, 125 deletions
diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c index 83ec8d4747fd..80ed6188e8a2 100644 --- a/arch/um/kernel/tlb.c +++ b/arch/um/kernel/tlb.c | |||
@@ -15,12 +15,118 @@ | |||
15 | #include "mem_user.h" | 15 | #include "mem_user.h" |
16 | #include "os.h" | 16 | #include "os.h" |
17 | 17 | ||
18 | static int add_mmap(unsigned long virt, unsigned long phys, unsigned long len, | ||
19 | int r, int w, int x, struct host_vm_op *ops, int *index, | ||
20 | int last_filled, union mm_context *mmu, void **flush, | ||
21 | int (*do_ops)(union mm_context *, struct host_vm_op *, | ||
22 | int, int, void **)) | ||
23 | { | ||
24 | __u64 offset; | ||
25 | struct host_vm_op *last; | ||
26 | int fd, ret = 0; | ||
27 | |||
28 | fd = phys_mapping(phys, &offset); | ||
29 | if(*index != -1){ | ||
30 | last = &ops[*index]; | ||
31 | if((last->type == MMAP) && | ||
32 | (last->u.mmap.addr + last->u.mmap.len == virt) && | ||
33 | (last->u.mmap.r == r) && (last->u.mmap.w == w) && | ||
34 | (last->u.mmap.x == x) && (last->u.mmap.fd == fd) && | ||
35 | (last->u.mmap.offset + last->u.mmap.len == offset)){ | ||
36 | last->u.mmap.len += len; | ||
37 | return 0; | ||
38 | } | ||
39 | } | ||
40 | |||
41 | if(*index == last_filled){ | ||
42 | ret = (*do_ops)(mmu, ops, last_filled, 0, flush); | ||
43 | *index = -1; | ||
44 | } | ||
45 | |||
46 | ops[++*index] = ((struct host_vm_op) { .type = MMAP, | ||
47 | .u = { .mmap = { | ||
48 | .addr = virt, | ||
49 | .len = len, | ||
50 | .r = r, | ||
51 | .w = w, | ||
52 | .x = x, | ||
53 | .fd = fd, | ||
54 | .offset = offset } | ||
55 | } }); | ||
56 | return ret; | ||
57 | } | ||
58 | |||
59 | static int add_munmap(unsigned long addr, unsigned long len, | ||
60 | struct host_vm_op *ops, int *index, int last_filled, | ||
61 | union mm_context *mmu, void **flush, | ||
62 | int (*do_ops)(union mm_context *, struct host_vm_op *, | ||
63 | int, int, void **)) | ||
64 | { | ||
65 | struct host_vm_op *last; | ||
66 | int ret = 0; | ||
67 | |||
68 | if(*index != -1){ | ||
69 | last = &ops[*index]; | ||
70 | if((last->type == MUNMAP) && | ||
71 | (last->u.munmap.addr + last->u.mmap.len == addr)){ | ||
72 | last->u.munmap.len += len; | ||
73 | return 0; | ||
74 | } | ||
75 | } | ||
76 | |||
77 | if(*index == last_filled){ | ||
78 | ret = (*do_ops)(mmu, ops, last_filled, 0, flush); | ||
79 | *index = -1; | ||
80 | } | ||
81 | |||
82 | ops[++*index] = ((struct host_vm_op) { .type = MUNMAP, | ||
83 | .u = { .munmap = { | ||
84 | .addr = addr, | ||
85 | .len = len } } }); | ||
86 | return ret; | ||
87 | } | ||
88 | |||
89 | static int add_mprotect(unsigned long addr, unsigned long len, int r, int w, | ||
90 | int x, struct host_vm_op *ops, int *index, | ||
91 | int last_filled, union mm_context *mmu, void **flush, | ||
92 | int (*do_ops)(union mm_context *, struct host_vm_op *, | ||
93 | int, int, void **)) | ||
94 | { | ||
95 | struct host_vm_op *last; | ||
96 | int ret = 0; | ||
97 | |||
98 | if(*index != -1){ | ||
99 | last = &ops[*index]; | ||
100 | if((last->type == MPROTECT) && | ||
101 | (last->u.mprotect.addr + last->u.mprotect.len == addr) && | ||
102 | (last->u.mprotect.r == r) && (last->u.mprotect.w == w) && | ||
103 | (last->u.mprotect.x == x)){ | ||
104 | last->u.mprotect.len += len; | ||
105 | return 0; | ||
106 | } | ||
107 | } | ||
108 | |||
109 | if(*index == last_filled){ | ||
110 | ret = (*do_ops)(mmu, ops, last_filled, 0, flush); | ||
111 | *index = -1; | ||
112 | } | ||
113 | |||
114 | ops[++*index] = ((struct host_vm_op) { .type = MPROTECT, | ||
115 | .u = { .mprotect = { | ||
116 | .addr = addr, | ||
117 | .len = len, | ||
118 | .r = r, | ||
119 | .w = w, | ||
120 | .x = x } } }); | ||
121 | return ret; | ||
122 | } | ||
123 | |||
18 | #define ADD_ROUND(n, inc) (((n) + (inc)) & ~((inc) - 1)) | 124 | #define ADD_ROUND(n, inc) (((n) + (inc)) & ~((inc) - 1)) |
19 | 125 | ||
20 | void fix_range_common(struct mm_struct *mm, unsigned long start_addr, | 126 | void fix_range_common(struct mm_struct *mm, unsigned long start_addr, |
21 | unsigned long end_addr, int force, | 127 | unsigned long end_addr, int force, |
22 | void (*do_ops)(union mm_context *, struct host_vm_op *, | 128 | int (*do_ops)(union mm_context *, struct host_vm_op *, |
23 | int)) | 129 | int, int, void **)) |
24 | { | 130 | { |
25 | pgd_t *npgd; | 131 | pgd_t *npgd; |
26 | pud_t *npud; | 132 | pud_t *npud; |
@@ -29,21 +135,24 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr, | |||
29 | union mm_context *mmu = &mm->context; | 135 | union mm_context *mmu = &mm->context; |
30 | unsigned long addr, end; | 136 | unsigned long addr, end; |
31 | int r, w, x; | 137 | int r, w, x; |
32 | struct host_vm_op ops[16]; | 138 | struct host_vm_op ops[1]; |
139 | void *flush = NULL; | ||
33 | int op_index = -1, last_op = sizeof(ops) / sizeof(ops[0]) - 1; | 140 | int op_index = -1, last_op = sizeof(ops) / sizeof(ops[0]) - 1; |
141 | int ret = 0; | ||
34 | 142 | ||
35 | if(mm == NULL) return; | 143 | if(mm == NULL) return; |
36 | 144 | ||
37 | for(addr = start_addr; addr < end_addr;){ | 145 | ops[0].type = NONE; |
146 | for(addr = start_addr; addr < end_addr && !ret;){ | ||
38 | npgd = pgd_offset(mm, addr); | 147 | npgd = pgd_offset(mm, addr); |
39 | if(!pgd_present(*npgd)){ | 148 | if(!pgd_present(*npgd)){ |
40 | end = ADD_ROUND(addr, PGDIR_SIZE); | 149 | end = ADD_ROUND(addr, PGDIR_SIZE); |
41 | if(end > end_addr) | 150 | if(end > end_addr) |
42 | end = end_addr; | 151 | end = end_addr; |
43 | if(force || pgd_newpage(*npgd)){ | 152 | if(force || pgd_newpage(*npgd)){ |
44 | op_index = add_munmap(addr, end - addr, ops, | 153 | ret = add_munmap(addr, end - addr, ops, |
45 | op_index, last_op, mmu, | 154 | &op_index, last_op, mmu, |
46 | do_ops); | 155 | &flush, do_ops); |
47 | pgd_mkuptodate(*npgd); | 156 | pgd_mkuptodate(*npgd); |
48 | } | 157 | } |
49 | addr = end; | 158 | addr = end; |
@@ -56,9 +165,9 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr, | |||
56 | if(end > end_addr) | 165 | if(end > end_addr) |
57 | end = end_addr; | 166 | end = end_addr; |
58 | if(force || pud_newpage(*npud)){ | 167 | if(force || pud_newpage(*npud)){ |
59 | op_index = add_munmap(addr, end - addr, ops, | 168 | ret = add_munmap(addr, end - addr, ops, |
60 | op_index, last_op, mmu, | 169 | &op_index, last_op, mmu, |
61 | do_ops); | 170 | &flush, do_ops); |
62 | pud_mkuptodate(*npud); | 171 | pud_mkuptodate(*npud); |
63 | } | 172 | } |
64 | addr = end; | 173 | addr = end; |
@@ -71,9 +180,9 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr, | |||
71 | if(end > end_addr) | 180 | if(end > end_addr) |
72 | end = end_addr; | 181 | end = end_addr; |
73 | if(force || pmd_newpage(*npmd)){ | 182 | if(force || pmd_newpage(*npmd)){ |
74 | op_index = add_munmap(addr, end - addr, ops, | 183 | ret = add_munmap(addr, end - addr, ops, |
75 | op_index, last_op, mmu, | 184 | &op_index, last_op, mmu, |
76 | do_ops); | 185 | &flush, do_ops); |
77 | pmd_mkuptodate(*npmd); | 186 | pmd_mkuptodate(*npmd); |
78 | } | 187 | } |
79 | addr = end; | 188 | addr = end; |
@@ -92,24 +201,32 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr, | |||
92 | } | 201 | } |
93 | if(force || pte_newpage(*npte)){ | 202 | if(force || pte_newpage(*npte)){ |
94 | if(pte_present(*npte)) | 203 | if(pte_present(*npte)) |
95 | op_index = add_mmap(addr, | 204 | ret = add_mmap(addr, |
96 | pte_val(*npte) & PAGE_MASK, | 205 | pte_val(*npte) & PAGE_MASK, |
97 | PAGE_SIZE, r, w, x, ops, | 206 | PAGE_SIZE, r, w, x, ops, |
98 | op_index, last_op, mmu, | 207 | &op_index, last_op, mmu, |
99 | do_ops); | 208 | &flush, do_ops); |
100 | else op_index = add_munmap(addr, PAGE_SIZE, ops, | 209 | else ret = add_munmap(addr, PAGE_SIZE, ops, |
101 | op_index, last_op, mmu, | 210 | &op_index, last_op, mmu, |
102 | do_ops); | 211 | &flush, do_ops); |
103 | } | 212 | } |
104 | else if(pte_newprot(*npte)) | 213 | else if(pte_newprot(*npte)) |
105 | op_index = add_mprotect(addr, PAGE_SIZE, r, w, x, ops, | 214 | ret = add_mprotect(addr, PAGE_SIZE, r, w, x, ops, |
106 | op_index, last_op, mmu, | 215 | &op_index, last_op, mmu, |
107 | do_ops); | 216 | &flush, do_ops); |
108 | 217 | ||
109 | *npte = pte_mkuptodate(*npte); | 218 | *npte = pte_mkuptodate(*npte); |
110 | addr += PAGE_SIZE; | 219 | addr += PAGE_SIZE; |
111 | } | 220 | } |
112 | (*do_ops)(mmu, ops, op_index); | 221 | |
222 | if(!ret) | ||
223 | ret = (*do_ops)(mmu, ops, op_index, 1, &flush); | ||
224 | |||
225 | /* This is not an else because ret is modified above */ | ||
226 | if(ret) { | ||
227 | printk("fix_range_common: failed, killing current process\n"); | ||
228 | force_sig(SIGKILL, current); | ||
229 | } | ||
113 | } | 230 | } |
114 | 231 | ||
115 | int flush_tlb_kernel_range_common(unsigned long start, unsigned long end) | 232 | int flush_tlb_kernel_range_common(unsigned long start, unsigned long end) |
@@ -226,106 +343,6 @@ pte_t *addr_pte(struct task_struct *task, unsigned long addr) | |||
226 | return(pte_offset_map(pmd, addr)); | 343 | return(pte_offset_map(pmd, addr)); |
227 | } | 344 | } |
228 | 345 | ||
229 | int add_mmap(unsigned long virt, unsigned long phys, unsigned long len, | ||
230 | int r, int w, int x, struct host_vm_op *ops, int index, | ||
231 | int last_filled, union mm_context *mmu, | ||
232 | void (*do_ops)(union mm_context *, struct host_vm_op *, int)) | ||
233 | { | ||
234 | __u64 offset; | ||
235 | struct host_vm_op *last; | ||
236 | int fd; | ||
237 | |||
238 | fd = phys_mapping(phys, &offset); | ||
239 | if(index != -1){ | ||
240 | last = &ops[index]; | ||
241 | if((last->type == MMAP) && | ||
242 | (last->u.mmap.addr + last->u.mmap.len == virt) && | ||
243 | (last->u.mmap.r == r) && (last->u.mmap.w == w) && | ||
244 | (last->u.mmap.x == x) && (last->u.mmap.fd == fd) && | ||
245 | (last->u.mmap.offset + last->u.mmap.len == offset)){ | ||
246 | last->u.mmap.len += len; | ||
247 | return(index); | ||
248 | } | ||
249 | } | ||
250 | |||
251 | if(index == last_filled){ | ||
252 | (*do_ops)(mmu, ops, last_filled); | ||
253 | index = -1; | ||
254 | } | ||
255 | |||
256 | ops[++index] = ((struct host_vm_op) { .type = MMAP, | ||
257 | .u = { .mmap = { | ||
258 | .addr = virt, | ||
259 | .len = len, | ||
260 | .r = r, | ||
261 | .w = w, | ||
262 | .x = x, | ||
263 | .fd = fd, | ||
264 | .offset = offset } | ||
265 | } }); | ||
266 | return(index); | ||
267 | } | ||
268 | |||
269 | int add_munmap(unsigned long addr, unsigned long len, struct host_vm_op *ops, | ||
270 | int index, int last_filled, union mm_context *mmu, | ||
271 | void (*do_ops)(union mm_context *, struct host_vm_op *, int)) | ||
272 | { | ||
273 | struct host_vm_op *last; | ||
274 | |||
275 | if(index != -1){ | ||
276 | last = &ops[index]; | ||
277 | if((last->type == MUNMAP) && | ||
278 | (last->u.munmap.addr + last->u.mmap.len == addr)){ | ||
279 | last->u.munmap.len += len; | ||
280 | return(index); | ||
281 | } | ||
282 | } | ||
283 | |||
284 | if(index == last_filled){ | ||
285 | (*do_ops)(mmu, ops, last_filled); | ||
286 | index = -1; | ||
287 | } | ||
288 | |||
289 | ops[++index] = ((struct host_vm_op) { .type = MUNMAP, | ||
290 | .u = { .munmap = { | ||
291 | .addr = addr, | ||
292 | .len = len } } }); | ||
293 | return(index); | ||
294 | } | ||
295 | |||
296 | int add_mprotect(unsigned long addr, unsigned long len, int r, int w, int x, | ||
297 | struct host_vm_op *ops, int index, int last_filled, | ||
298 | union mm_context *mmu, | ||
299 | void (*do_ops)(union mm_context *, struct host_vm_op *, int)) | ||
300 | { | ||
301 | struct host_vm_op *last; | ||
302 | |||
303 | if(index != -1){ | ||
304 | last = &ops[index]; | ||
305 | if((last->type == MPROTECT) && | ||
306 | (last->u.mprotect.addr + last->u.mprotect.len == addr) && | ||
307 | (last->u.mprotect.r == r) && (last->u.mprotect.w == w) && | ||
308 | (last->u.mprotect.x == x)){ | ||
309 | last->u.mprotect.len += len; | ||
310 | return(index); | ||
311 | } | ||
312 | } | ||
313 | |||
314 | if(index == last_filled){ | ||
315 | (*do_ops)(mmu, ops, last_filled); | ||
316 | index = -1; | ||
317 | } | ||
318 | |||
319 | ops[++index] = ((struct host_vm_op) { .type = MPROTECT, | ||
320 | .u = { .mprotect = { | ||
321 | .addr = addr, | ||
322 | .len = len, | ||
323 | .r = r, | ||
324 | .w = w, | ||
325 | .x = x } } }); | ||
326 | return(index); | ||
327 | } | ||
328 | |||
329 | void flush_tlb_page(struct vm_area_struct *vma, unsigned long address) | 346 | void flush_tlb_page(struct vm_area_struct *vma, unsigned long address) |
330 | { | 347 | { |
331 | address &= PAGE_MASK; | 348 | address &= PAGE_MASK; |