Diff markup
001 !! 001
002 002
003 003
004 004
005 005
006 006
007 007
008 008
009 009
010 010
011 011
012 012
013 013
014 014
015 015
016 016
017 017
018 018
019 #include <sos/assert.h> 019 #include <sos/assert.h>
020 #include <sos/list.h> 020 #include <sos/list.h>
021 #include <sos/physmem.h> 021 #include <sos/physmem.h>
022 #include <sos/kmem_slab.h> 022 #include <sos/kmem_slab.h>
023 #include <drivers/bochs.h> 023 #include <drivers/bochs.h>
024 #include <hwcore/mm_context.h> 024 #include <hwcore/mm_context.h>
025 #include <hwcore/paging.h> 025 #include <hwcore/paging.h>
026 #include <drivers/zero.h> 026 #include <drivers/zero.h>
027 027
028 #include "umem_vmm.h" 028 #include "umem_vmm.h"
029 029
030 030
031 struct sos_umem_vmm_as 031 struct sos_umem_vmm_as
032 { 032 {
033 033
034 struct sos_process * process; 034 struct sos_process * process;
035 035
036 036
037 struct sos_mm_context * mm_context; 037 struct sos_mm_context * mm_context;
038 038
039 039
040 struct sos_umem_vmm_vr * list_vr; 040 struct sos_umem_vmm_vr * list_vr;
041 041
042 042
043 sos_uaddr_t heap_start; 043 sos_uaddr_t heap_start;
044 sos_size_t heap_size; 044 sos_size_t heap_size;
045 045
046 046
047 sos_size_t phys_total; 047 sos_size_t phys_total;
048 struct vm_usage 048 struct vm_usage
049 { 049 {
050 sos_size_t overall; 050 sos_size_t overall;
051 sos_size_t ro, rw, code 051 sos_size_t ro, rw, code ;
052 } vm_total, vm_shrd; 052 } vm_total, vm_shrd;
053 053
054 054
055 sos_size_t pgflt_cow; 055 sos_size_t pgflt_cow;
056 sos_size_t pgflt_page_in; 056 sos_size_t pgflt_page_in;
057 sos_size_t pgflt_invalid; 057 sos_size_t pgflt_invalid;
058 }; 058 };
059 059
060 060
061 struct sos_umem_vmm_vr 061 struct sos_umem_vmm_vr
062 { 062 {
063 063
064 struct sos_umem_vmm_as *address_space; 064 struct sos_umem_vmm_as *address_space;
065 065
066 066
067 sos_uaddr_t start; 067 sos_uaddr_t start;
068 sos_size_t size; 068 sos_size_t size;
069 069
070 070
071 071
072 sos_ui32_t access_rights; 072 sos_ui32_t access_rights;
073 073
074 074
075 075
076 076
077 sos_ui32_t flags; 077 sos_ui32_t flags;
078 078
079 079
080 080
081 081
082 082
083 struct sos_umem_vmm_vr_ops *ops; 083 struct sos_umem_vmm_vr_ops *ops;
084 084
085 085
086 struct sos_umem_vmm_mapped_resource *mapped_ 086 struct sos_umem_vmm_mapped_resource *mapped_resource;
087 sos_luoffset_t offset_in_resource; 087 sos_luoffset_t offset_in_resource;
088 088
089 089
090 090
091 struct sos_umem_vmm_vr *prev_in_as, *next_in 091 struct sos_umem_vmm_vr *prev_in_as, *next_in_as;
092 092
093 093
094 094
095 struct sos_umem_vmm_vr *prev_in_mapped_resou 095 struct sos_umem_vmm_vr *prev_in_mapped_resource, *next_in_mapped_resource;
096 }; 096 };
097 097
098 098
099 099
100 100
101 101
102 static struct sos_kslab_cache * cache_of_as; 102 static struct sos_kslab_cache * cache_of_as;
103 static struct sos_kslab_cache * cache_of_vr; 103 static struct sos_kslab_cache * cache_of_vr;
104 104
105 105
106 106
107 void sos_dump_as(const struct sos_umem_vmm_as 107 void sos_dump_as(const struct sos_umem_vmm_as * as, const char *str)
108 { 108 {
109 struct sos_umem_vmm_vr *vr; 109 struct sos_umem_vmm_vr *vr;
110 int nb_vr; 110 int nb_vr;
111 111
112 sos_bochs_printf("AS %p - %s:\n", as, str); 112 sos_bochs_printf("AS %p - %s:\n", as, str);
113 sos_bochs_printf(" physical mem: %x\n", 113 sos_bochs_printf(" physical mem: %x\n",
114 as->phys_total); 114 as->phys_total);
115 sos_bochs_printf(" VM (all/ro+rw/exec) tot 115 sos_bochs_printf(" VM (all/ro+rw/exec) tot:%x/%x+%x/%x shrd:%x/%x+%x/%x\n",
116 as->vm_total.overall, 116 as->vm_total.overall,
117 as->vm_total.ro, as->vm_tot 117 as->vm_total.ro, as->vm_total.rw, as->vm_total.code,
118 as->vm_shrd.overall, 118 as->vm_shrd.overall,
119 as->vm_shrd.ro, as->vm_shrd 119 as->vm_shrd.ro, as->vm_shrd.rw, as->vm_shrd.code);
120 sos_bochs_printf(" pgflt cow=%d pgin=%d in 120 sos_bochs_printf(" pgflt cow=%d pgin=%d inv=%d\n",
121 as->pgflt_cow, as->pgflt_pa 121 as->pgflt_cow, as->pgflt_page_in, as->pgflt_invalid);
122 list_foreach_named(as->list_vr, vr, nb_vr, p 122 list_foreach_named(as->list_vr, vr, nb_vr, prev_in_as, next_in_as)
123 { 123 {
124 sos_bochs_printf(" VR[%d]=%x: [%x,%x[ ( 124 sos_bochs_printf(" VR[%d]=%x: [%x,%x[ (sz=%x) mr=(%x)+%llx %c%c%c fl=%x\n",
125 nb_vr, (unsigned)vr, 125 nb_vr, (unsigned)vr,
126 vr->start, vr->start + 126 vr->start, vr->start + vr->size, vr->size,
127 (unsigned)vr->mapped_re 127 (unsigned)vr->mapped_resource,
128 vr->offset_in_resource, 128 vr->offset_in_resource,
129 (vr->access_rights & SO 129 (vr->access_rights & SOS_VM_MAP_PROT_READ)?'r':'-',
130 (vr->access_rights & SO 130 (vr->access_rights & SOS_VM_MAP_PROT_WRITE)?'w':'-',
131 (vr->access_rights & SO 131 (vr->access_rights & SOS_VM_MAP_PROT_EXEC)?'x':'-',
132 (unsigned)vr->flags); 132 (unsigned)vr->flags);
133 } 133 }
134 sos_bochs_printf("FIN (%s)\n", str); 134 sos_bochs_printf("FIN (%s)\n", str);
135 } 135 }
136 136
137 137
138 138
139 139
140 140
141 141
142 sos_paddr_t sos_zero_physpage = 0 142 sos_paddr_t sos_zero_physpage = 0 ;
143 sos_vaddr_t sos_zero_kernelpage = 0 143 sos_vaddr_t sos_zero_kernelpage = 0 ;
144 144
145 145
146 146
147 147
148 148
149 149
150 150
151 151
152 152
153 static struct sos_umem_vmm_vr * 153 static struct sos_umem_vmm_vr *
154 find_enclosing_or_next_vr(struct sos_umem_vmm_ 154 find_enclosing_or_next_vr(struct sos_umem_vmm_as * as,
155 sos_uaddr_t uaddr); 155 sos_uaddr_t uaddr);
156 156
157 157
158 158
159 159
160 160
161 161
162 static struct sos_umem_vmm_vr * 162 static struct sos_umem_vmm_vr *
163 find_first_intersecting_vr(struct sos_umem_vmm 163 find_first_intersecting_vr(struct sos_umem_vmm_as * as,
164 sos_uaddr_t start_u 164 sos_uaddr_t start_uaddr, sos_size_t size);
165 165
166 166
167 167
168 168
169 169
170 170
171 171
172 172
173 173
174 static sos_uaddr_t 174 static sos_uaddr_t
175 find_first_free_interval(struct sos_umem_vmm_a 175 find_first_free_interval(struct sos_umem_vmm_as * as,
176 sos_uaddr_t hint_uadd 176 sos_uaddr_t hint_uaddr, sos_size_t size);
177 177
178 178
179 179
180 180
181 static void 181 static void
182 as_account_change_of_vr_protection(struct sos_ 182 as_account_change_of_vr_protection(struct sos_umem_vmm_as * as,
183 sos_bool_t 183 sos_bool_t is_shared,
184 sos_size_t 184 sos_size_t size,
185 sos_ui32_t 185 sos_ui32_t prev_access_rights,
186 sos_ui32_t 186 sos_ui32_t new_access_rights);
187 187
188 188
189 sos_ret_t sos_umem_vmm_subsystem_setup() 189 sos_ret_t sos_umem_vmm_subsystem_setup()
190 { 190 {
191 191
192 192
193 sos_zero_kernelpage = sos_kmem_vmm_alloc(1, 193 sos_zero_kernelpage = sos_kmem_vmm_alloc(1, SOS_KMEM_VMM_MAP);
194 if (sos_zero_kernelpage == (sos_vaddr_t)NULL 194 if (sos_zero_kernelpage == (sos_vaddr_t)NULL)
195 return -SOS_ENOMEM; 195 return -SOS_ENOMEM;
196 memset((void*)sos_zero_kernelpage, 0x0, SOS_ 196 memset((void*)sos_zero_kernelpage, 0x0, SOS_PAGE_SIZE);
197 197
198 198
199 sos_zero_physpage = sos_paging_get_paddr(sos 199 sos_zero_physpage = sos_paging_get_paddr(sos_zero_kernelpage);
200 SOS_ASSERT_FATAL(NULL != (void*)sos_zero_phy 200 SOS_ASSERT_FATAL(NULL != (void*)sos_zero_physpage);
201 sos_physmem_ref_physpage_at(sos_zero_physpag 201 sos_physmem_ref_physpage_at(sos_zero_physpage);
202 202
203 203
204 cache_of_as 204 cache_of_as
205 = sos_kmem_cache_create("Address space str 205 = sos_kmem_cache_create("Address space structures",
206 sizeof(struct sos_ 206 sizeof(struct sos_umem_vmm_as),
207 1, 0, 207 1, 0,
208 SOS_KSLAB_CREATE_M 208 SOS_KSLAB_CREATE_MAP
209 | SOS_KSLAB_CREATE 209 | SOS_KSLAB_CREATE_ZERO);
210 if (! cache_of_as) 210 if (! cache_of_as)
211 { 211 {
212 sos_physmem_unref_physpage(sos_zero_phys 212 sos_physmem_unref_physpage(sos_zero_physpage);
213 return -SOS_ENOMEM; 213 return -SOS_ENOMEM;
214 } 214 }
215 215
216 cache_of_vr 216 cache_of_vr
217 = sos_kmem_cache_create("Virtual Region st 217 = sos_kmem_cache_create("Virtual Region structures",
218 sizeof(struct sos_ 218 sizeof(struct sos_umem_vmm_vr),
219 1, 0, 219 1, 0,
220 SOS_KSLAB_CREATE_M 220 SOS_KSLAB_CREATE_MAP
221 | SOS_KSLAB_CREATE 221 | SOS_KSLAB_CREATE_ZERO);
222 if (! cache_of_vr) 222 if (! cache_of_vr)
223 { 223 {
224 sos_physmem_unref_physpage(sos_zero_phys 224 sos_physmem_unref_physpage(sos_zero_physpage);
225 sos_kmem_cache_destroy(cache_of_as); 225 sos_kmem_cache_destroy(cache_of_as);
226 return -SOS_ENOMEM; 226 return -SOS_ENOMEM;
227 } 227 }
228 228
229 return SOS_OK; 229 return SOS_OK;
230 } 230 }
231 231
232 232
233 struct sos_umem_vmm_as * 233 struct sos_umem_vmm_as *
234 sos_umem_vmm_create_empty_as(struct sos_proces 234 sos_umem_vmm_create_empty_as(struct sos_process *owner)
235 { 235 {
236 struct sos_umem_vmm_as * as 236 struct sos_umem_vmm_as * as
237 = (struct sos_umem_vmm_as *) sos_kmem_cach 237 = (struct sos_umem_vmm_as *) sos_kmem_cache_alloc(cache_of_as, 0);
238 if (! as) 238 if (! as)
239 return NULL; 239 return NULL;
240 240
241 as->mm_context = sos_mm_context_create(); 241 as->mm_context = sos_mm_context_create();
242 if (NULL == as->mm_context) 242 if (NULL == as->mm_context)
243 { 243 {
244 244
245 sos_kmem_cache_free((sos_vaddr_t)as); 245 sos_kmem_cache_free((sos_vaddr_t)as);
246 return NULL; 246 return NULL;
247 } 247 }
248 248
249 as->process = owner; 249 as->process = owner;
250 return as; 250 return as;
251 } 251 }
252 252
253 253
254 struct sos_umem_vmm_as * 254 struct sos_umem_vmm_as *
255 sos_umem_vmm_duplicate_current_thread_as(struc 255 sos_umem_vmm_duplicate_current_thread_as(struct sos_process *owner)
256 { 256 {
257 __label__ undo_creation; 257 __label__ undo_creation;
258 struct sos_umem_vmm_as * my_as; 258 struct sos_umem_vmm_as * my_as;
259 struct sos_umem_vmm_vr * model_vr; 259 struct sos_umem_vmm_vr * model_vr;
260 int nb_vr; 260 int nb_vr;
261 261
262 struct sos_umem_vmm_as * new_as 262 struct sos_umem_vmm_as * new_as
263 = (struct sos_umem_vmm_as *) sos_kmem_cach 263 = (struct sos_umem_vmm_as *) sos_kmem_cache_alloc(cache_of_as, 0);
264 if (! new_as) 264 if (! new_as)
265 return NULL; 265 return NULL;
266 266
267 my_as = sos_process_get_address_space(sos_th 267 my_as = sos_process_get_address_space(sos_thread_get_current()->process);
268 new_as->process = owner; 268 new_as->process = owner;
269 list_init_named(new_as->list_vr, prev_in_as, 269 list_init_named(new_as->list_vr, prev_in_as, next_in_as);
270 270
271 271
272 272
273 273
274 274
275 275
276 SOS_ASSERT_FATAL(SOS_OK 276 SOS_ASSERT_FATAL(SOS_OK
277 == sos_thread_prepare_user_ 277 == sos_thread_prepare_user_space_access(my_as,
278 278 (sos_vaddr_t)
279 279 NULL));
280 280
281 281
282 list_foreach_named(my_as->list_vr, model_vr, 282 list_foreach_named(my_as->list_vr, model_vr, nb_vr, prev_in_as, next_in_as)
283 { 283 {
284 struct sos_umem_vmm_vr * vr; 284 struct sos_umem_vmm_vr * vr;
285 285
286 286
287 if ( !(model_vr->flags & SOS_VR_MAP_SHAR 287 if ( !(model_vr->flags & SOS_VR_MAP_SHARED)
288 && (model_vr->access_rights & SOS_V 288 && (model_vr->access_rights & SOS_VM_MAP_PROT_WRITE) )
289 { 289 {
290 290
291 291
292 SOS_ASSERT_FATAL(SOS_OK 292 SOS_ASSERT_FATAL(SOS_OK
293 == sos_paging_prepa 293 == sos_paging_prepare_COW(model_vr->start,
294 294 model_vr->size));
295 } 295 }
296 296
297 297
298 vr = (struct sos_umem_vmm_vr *) sos_kmem 298 vr = (struct sos_umem_vmm_vr *) sos_kmem_cache_alloc(cache_of_vr, 0);
299 if (! vr) 299 if (! vr)
300 goto undo_creation; 300 goto undo_creation;
301 memcpy(vr, model_vr, sizeof(*vr)); 301 memcpy(vr, model_vr, sizeof(*vr));
302 vr->address_space = new_as; 302 vr->address_space = new_as;
303 303
304 304
305 if (vr->ops && vr->ops->ref) 305 if (vr->ops && vr->ops->ref)
306 vr->ops->ref(vr); 306 vr->ops->ref(vr);
307 307
308 308
309 list_add_tail_named(new_as->list_vr, vr, 309 list_add_tail_named(new_as->list_vr, vr, prev_in_as, next_in_as);
310 310
311 311
312 list_add_tail_named(model_vr->mapped_res 312 list_add_tail_named(model_vr->mapped_resource->list_vr, vr,
313 prev_in_mapped_resou 313 prev_in_mapped_resource,
314 next_in_mapped_resou 314 next_in_mapped_resource);
315 } 315 }
316 316
317 317
318 new_as->mm_context = sos_mm_context_duplicat 318 new_as->mm_context = sos_mm_context_duplicate(my_as->mm_context);
319 if (NULL == new_as->mm_context) 319 if (NULL == new_as->mm_context)
320 goto undo_creation; 320 goto undo_creation;
321 321
322 322
323 new_as->heap_start = my_as->heap_start; 323 new_as->heap_start = my_as->heap_start;
324 new_as->heap_size = my_as->heap_size; 324 new_as->heap_size = my_as->heap_size;
325 new_as->phys_total = my_as->phys_total; 325 new_as->phys_total = my_as->phys_total;
326 memcpy(& new_as->vm_total, & my_as->vm_total 326 memcpy(& new_as->vm_total, & my_as->vm_total, sizeof(struct vm_usage));
327 memcpy(& new_as->vm_shrd, & my_as->vm_shrd, 327 memcpy(& new_as->vm_shrd, & my_as->vm_shrd, sizeof(struct vm_usage));
328 SOS_ASSERT_FATAL(SOS_OK == sos_thread_end_us 328 SOS_ASSERT_FATAL(SOS_OK == sos_thread_end_user_space_access());
329 return new_as; 329 return new_as;
330 330
331 331
332 undo_creation: 332 undo_creation:
333 SOS_ASSERT_FATAL(SOS_OK == sos_thread_end_us 333 SOS_ASSERT_FATAL(SOS_OK == sos_thread_end_user_space_access());
334 sos_umem_vmm_delete_as(new_as); 334 sos_umem_vmm_delete_as(new_as);
335 return NULL; 335 return NULL;
336 } 336 }
337 337
338 338
339 sos_ret_t 339 sos_ret_t
340 sos_umem_vmm_delete_as(struct sos_umem_vmm_as 340 sos_umem_vmm_delete_as(struct sos_umem_vmm_as * as)
341 { 341 {
342 while(! list_is_empty_named(as->list_vr, pre 342 while(! list_is_empty_named(as->list_vr, prev_in_as, next_in_as))
343 { 343 {
344 struct sos_umem_vmm_vr * vr; 344 struct sos_umem_vmm_vr * vr;
345 vr = list_get_head_named(as->list_vr, pr 345 vr = list_get_head_named(as->list_vr, prev_in_as, next_in_as);
346 346
347 347
348 list_pop_head_named(as->list_vr, prev_in 348 list_pop_head_named(as->list_vr, prev_in_as, next_in_as);
349 list_delete_named(vr->mapped_resource->l 349 list_delete_named(vr->mapped_resource->list_vr, vr,
350 prev_in_mapped_resourc 350 prev_in_mapped_resource,
351 next_in_mapped_resourc 351 next_in_mapped_resource);
352 352
353 353
354 354
355 if (vr->ops) 355 if (vr->ops)
356 { 356 {
357 if (vr->ops->unmap) 357 if (vr->ops->unmap)
358 vr->ops->unmap(vr, vr->start, vr-> 358 vr->ops->unmap(vr, vr->start, vr->size);
359 if (vr->ops->unref) 359 if (vr->ops->unref)
360 vr->ops->unref(vr); 360 vr->ops->unref(vr);
361 } 361 }
362 362
363 sos_kmem_cache_free((sos_vaddr_t)vr); 363 sos_kmem_cache_free((sos_vaddr_t)vr);
364 } 364 }
365 365
366 366
367 if (as->mm_context) 367 if (as->mm_context)
368 sos_mm_context_unref(as->mm_context); 368 sos_mm_context_unref(as->mm_context);
369 369
370 370
371 sos_kmem_cache_free((sos_vaddr_t)as); 371 sos_kmem_cache_free((sos_vaddr_t)as);
372 372
373 return SOS_OK; 373 return SOS_OK;
374 } 374 }
375 375
376 376
377 struct sos_process * 377 struct sos_process *
378 sos_umem_vmm_get_process(struct sos_umem_vmm_a 378 sos_umem_vmm_get_process(struct sos_umem_vmm_as * as)
379 { 379 {
380 return as->process; 380 return as->process;
381 } 381 }
382 382
383 383
384 struct sos_mm_context * 384 struct sos_mm_context *
385 sos_umem_vmm_get_mm_context(struct sos_umem_vm 385 sos_umem_vmm_get_mm_context(struct sos_umem_vmm_as * as)
386 { 386 {
387 return as->mm_context; 387 return as->mm_context;
388 } 388 }
389 389
390 390
391 struct sos_umem_vmm_vr * 391 struct sos_umem_vmm_vr *
392 sos_umem_vmm_get_vr_at_address(struct sos_umem 392 sos_umem_vmm_get_vr_at_address(struct sos_umem_vmm_as * as,
393 sos_uaddr_t uad 393 sos_uaddr_t uaddr)
394 { 394 {
395 struct sos_umem_vmm_vr * vr; 395 struct sos_umem_vmm_vr * vr;
396 vr = find_enclosing_or_next_vr(as, uaddr); 396 vr = find_enclosing_or_next_vr(as, uaddr);
397 if (! vr) 397 if (! vr)
398 return NULL; 398 return NULL;
399 399
400 400
401 if (uaddr < vr->start) 401 if (uaddr < vr->start)
402 return NULL; 402 return NULL;
403 403
404 return vr; 404 return vr;
405 } 405 }
406 406
407 407
408 struct sos_umem_vmm_as * 408 struct sos_umem_vmm_as *
409 sos_umem_vmm_get_as_of_vr(struct sos_umem_vmm_ 409 sos_umem_vmm_get_as_of_vr(struct sos_umem_vmm_vr * vr)
410 { 410 {
411 return vr->address_space; 411 return vr->address_space;
412 } 412 }
413 413
414 414
415 struct sos_umem_vmm_vr_ops * 415 struct sos_umem_vmm_vr_ops *
416 sos_umem_vmm_get_ops_of_vr(struct sos_umem_vmm 416 sos_umem_vmm_get_ops_of_vr(struct sos_umem_vmm_vr * vr)
417 { 417 {
418 return vr->ops; 418 return vr->ops;
419 } 419 }
420 420
421 421
422 sos_ui32_t sos_umem_vmm_get_prot_of_vr(struct 422 sos_ui32_t sos_umem_vmm_get_prot_of_vr(struct sos_umem_vmm_vr * vr)
423 { 423 {
424 return vr->access_rights; 424 return vr->access_rights;
425 } 425 }
426 426
427 427
428 sos_ui32_t sos_umem_vmm_get_flags_of_vr(struct 428 sos_ui32_t sos_umem_vmm_get_flags_of_vr(struct sos_umem_vmm_vr * vr)
429 { 429 {
430 return vr->flags; 430 return vr->flags;
431 } 431 }
432 432
433 433
434 struct sos_umem_vmm_mapped_resource * 434 struct sos_umem_vmm_mapped_resource *
435 sos_umem_vmm_get_mapped_resource_of_vr(struct 435 sos_umem_vmm_get_mapped_resource_of_vr(struct sos_umem_vmm_vr * vr)
436 { 436 {
437 return vr->mapped_resource; 437 return vr->mapped_resource;
438 } 438 }
439 439
440 440
441 sos_uaddr_t sos_umem_vmm_get_start_of_vr(struc 441 sos_uaddr_t sos_umem_vmm_get_start_of_vr(struct sos_umem_vmm_vr * vr)
442 { 442 {
443 return vr->start; 443 return vr->start;
444 } 444 }
445 445
446 446
447 sos_size_t sos_umem_vmm_get_size_of_vr(struct 447 sos_size_t sos_umem_vmm_get_size_of_vr(struct sos_umem_vmm_vr * vr)
448 { 448 {
449 return vr->size; 449 return vr->size;
450 } 450 }
451 451
452 452
453 sos_luoffset_t sos_umem_vmm_get_offset_in_reso 453 sos_luoffset_t sos_umem_vmm_get_offset_in_resource(struct sos_umem_vmm_vr * vr)
454 { 454 {
455 return vr->offset_in_resource; 455 return vr->offset_in_resource;
456 } 456 }
457 457
458 458
459 sos_ret_t 459 sos_ret_t
460 sos_umem_vmm_set_ops_of_vr(struct sos_umem_vmm 460 sos_umem_vmm_set_ops_of_vr(struct sos_umem_vmm_vr * vr,
461 struct sos_umem_vmm 461 struct sos_umem_vmm_vr_ops * ops)
462 { 462 {
463 463
464 SOS_ASSERT_FATAL(NULL == vr->ops); 464 SOS_ASSERT_FATAL(NULL == vr->ops);
465 465
466 vr->ops = ops; 466 vr->ops = ops;
467 return SOS_OK; 467 return SOS_OK;
468 } 468 }
469 469
470 470
471 471
472 472
473 473
474 474
475 #define INTERNAL_MAP_CALLED_FROM_MREMAP (1 << 475 #define INTERNAL_MAP_CALLED_FROM_MREMAP (1 << 8)
476 476
477 sos_ret_t 477 sos_ret_t
478 sos_umem_vmm_map(struct sos_umem_vmm_as * as, 478 sos_umem_vmm_map(struct sos_umem_vmm_as * as,
479 sos_uaddr_t * uaddr 479 sos_uaddr_t * uaddr, sos_size_t size,
480 sos_ui32_t access_rights, 480 sos_ui32_t access_rights,
481 sos_ui32_t flags, 481 sos_ui32_t flags,
482 struct sos_umem_vmm_mapped_re 482 struct sos_umem_vmm_mapped_resource * resource,
483 sos_luoffset_t offset_in_reso 483 sos_luoffset_t offset_in_resource)
484 { 484 {
485 __label__ return_mmap; 485 __label__ return_mmap;
486 sos_uaddr_t hint_uaddr; 486 sos_uaddr_t hint_uaddr;
487 struct sos_umem_vmm_vr *prev_vr, *next_vr, * 487 struct sos_umem_vmm_vr *prev_vr, *next_vr, *vr, *preallocated_vr;
488 sos_bool_t merge_with_preceding, merge_with_ 488 sos_bool_t merge_with_preceding, merge_with_next, used_preallocated_vr;
489 sos_bool_t internal_map_called_from_mremap 489 sos_bool_t internal_map_called_from_mremap
490 = (flags & INTERNAL_MAP_CALLED_FROM_MREMAP 490 = (flags & INTERNAL_MAP_CALLED_FROM_MREMAP);
491 491
492 sos_ret_t retval = SOS_OK; 492 sos_ret_t retval = SOS_OK;
493 used_preallocated_vr = FALSE; 493 used_preallocated_vr = FALSE;
494 hint_uaddr = *uaddr; 494 hint_uaddr = *uaddr;
495 495
496 496
497 *uaddr = (sos_vaddr_t)NULL; 497 *uaddr = (sos_vaddr_t)NULL;
498 498
499 if (! resource) 499 if (! resource)
500 return -SOS_EINVAL; 500 return -SOS_EINVAL;
501 if (! resource->mmap) 501 if (! resource->mmap)
502 return -SOS_EPERM; 502 return -SOS_EPERM;
503 503
504 if (! SOS_IS_PAGE_ALIGNED(hint_uaddr)) 504 if (! SOS_IS_PAGE_ALIGNED(hint_uaddr))
505 return -SOS_EINVAL; 505 return -SOS_EINVAL;
506 506
507 if (size <= 0) 507 if (size <= 0)
508 return -SOS_EINVAL; 508 return -SOS_EINVAL;
509 size = SOS_PAGE_ALIGN_SUP(size); 509 size = SOS_PAGE_ALIGN_SUP(size);
510 510
511 if (flags & SOS_VR_MAP_SHARED) 511 if (flags & SOS_VR_MAP_SHARED)
512 { 512 {
513 513
514 if ( ( (access_rights & SOS_VM_MAP_PROT_ 514 if ( ( (access_rights & SOS_VM_MAP_PROT_READ)
515 && !(resource->allowed_access_rig 515 && !(resource->allowed_access_rights & SOS_VM_MAP_PROT_READ) )
516 || ( (access_rights & SOS_VM_MAP_PR 516 || ( (access_rights & SOS_VM_MAP_PROT_WRITE)
517 && !(resource->allowed_access_ 517 && !(resource->allowed_access_rights & SOS_VM_MAP_PROT_WRITE) )
518 || ( (access_rights & SOS_VM_MAP_PR 518 || ( (access_rights & SOS_VM_MAP_PROT_EXEC)
519 && !(resource->allowed_access_ 519 && !(resource->allowed_access_rights & SOS_VM_MAP_PROT_EXEC)) )
520 return -SOS_EPERM; 520 return -SOS_EPERM;
521 } 521 }
522 522
523 523
524 if ( !internal_map_called_from_mremap 524 if ( !internal_map_called_from_mremap
525 && ( resource->flags & SOS_MAPPED_RESOU 525 && ( resource->flags & SOS_MAPPED_RESOURCE_ANONYMOUS ) )
526 526
527 { 527 {
528 528
529 } 529 }
530 530
531 531
532 else if (offset_in_resource + size <= offset 532 else if (offset_in_resource + size <= offset_in_resource)
533 return -SOS_EINVAL; 533 return -SOS_EINVAL;
534 534
535 535
536 access_rights &= (SOS_VM_MAP_PROT_READ 536 access_rights &= (SOS_VM_MAP_PROT_READ
537 | SOS_VM_MAP_PROT_WRITE 537 | SOS_VM_MAP_PROT_WRITE
538 | SOS_VM_MAP_PROT_EXEC); 538 | SOS_VM_MAP_PROT_EXEC);
539 flags &= (SOS_VR_MAP_SHARED 539 flags &= (SOS_VR_MAP_SHARED
540 | SOS_VR_MAP_FIXED); 540 | SOS_VR_MAP_FIXED);
541 541
542 542
543 543
544 544
545 preallocated_vr 545 preallocated_vr
546 = (struct sos_umem_vmm_vr *)sos_kmem_cache 546 = (struct sos_umem_vmm_vr *)sos_kmem_cache_alloc(cache_of_vr, 0);
547 if (! preallocated_vr) 547 if (! preallocated_vr)
548 return -SOS_ENOMEM; 548 return -SOS_ENOMEM;
549 549
550 550
551 if (flags & SOS_VR_MAP_FIXED) 551 if (flags & SOS_VR_MAP_FIXED)
552 { 552 {
553 553
554 554
555 555
556 556
557 557
558 if (hint_uaddr < SOS_PAGING_BASE_USER_AD 558 if (hint_uaddr < SOS_PAGING_BASE_USER_ADDRESS)
559 { retval = -SOS_EINVAL; goto return_mm 559 { retval = -SOS_EINVAL; goto return_mmap; }
560 if (hint_uaddr > SOS_PAGING_TOP_USER_ADD 560 if (hint_uaddr > SOS_PAGING_TOP_USER_ADDRESS - size)
561 { retval = -SOS_EINVAL; goto return_mm 561 { retval = -SOS_EINVAL; goto return_mmap; }
562 562
563 563
564 retval = sos_umem_vmm_unmap(as, hint_uad 564 retval = sos_umem_vmm_unmap(as, hint_uaddr, size);
565 if (SOS_OK != retval) 565 if (SOS_OK != retval)
566 { goto return_mmap; } 566 { goto return_mmap; }
567 } 567 }
568 else 568 else
569 { 569 {
570 570
571 571
572 572
573 573
574 574
575 hint_uaddr = find_first_free_interval(as 575 hint_uaddr = find_first_free_interval(as, hint_uaddr, size);
576 if (! hint_uaddr) 576 if (! hint_uaddr)
577 { retval = -SOS_ENOMEM; goto return_mm 577 { retval = -SOS_ENOMEM; goto return_mmap; }
578 } 578 }
579 579
580 580
581 581
582 582
583 if ( !internal_map_called_from_mremap 583 if ( !internal_map_called_from_mremap
584 && (resource->flags & SOS_MAPPED_RESOUR 584 && (resource->flags & SOS_MAPPED_RESOURCE_ANONYMOUS ) )
585 offset_in_resource = hint_uaddr; 585 offset_in_resource = hint_uaddr;
586 586
587 587
588 588
589 next_vr = find_enclosing_or_next_vr(as, hint 589 next_vr = find_enclosing_or_next_vr(as, hint_uaddr);
590 if (next_vr) 590 if (next_vr)
591 { 591 {
592 592
593 prev_vr = next_vr->prev_in_as; 593 prev_vr = next_vr->prev_in_as;
594 594
595 595
596 if (prev_vr->start > hint_uaddr) 596 if (prev_vr->start > hint_uaddr)
597 prev_vr = NULL; 597 prev_vr = NULL;
598 } 598 }
599 else 599 else
600 { 600 {
601 601
602 prev_vr = list_get_tail_named(as->list_v 602 prev_vr = list_get_tail_named(as->list_vr, prev_in_as, next_in_as);
603 } 603 }
604 604
605 605
606 merge_with_preceding 606 merge_with_preceding
607 = ( (NULL != prev_vr) 607 = ( (NULL != prev_vr)
608 && (prev_vr->mapped_resource == resour 608 && (prev_vr->mapped_resource == resource)
609 && (prev_vr->offset_in_resource + prev 609 && (prev_vr->offset_in_resource + prev_vr->size == offset_in_resource)
610 && (prev_vr->start + prev_vr->size == 610 && (prev_vr->start + prev_vr->size == hint_uaddr)
611 && (prev_vr->flags == flags) 611 && (prev_vr->flags == flags)
612 && (prev_vr->access_rights == access_r 612 && (prev_vr->access_rights == access_rights) );
613 613
614 614
615 merge_with_next 615 merge_with_next
616 = ( (NULL != next_vr) 616 = ( (NULL != next_vr)
617 && (next_vr->mapped_resource == resour 617 && (next_vr->mapped_resource == resource)
618 && (offset_in_resource + size == next_ 618 && (offset_in_resource + size == next_vr->offset_in_resource)
619 && (hint_uaddr + size == next_vr->star 619 && (hint_uaddr + size == next_vr->start)
620 && (next_vr->flags == flags) 620 && (next_vr->flags == flags)
621 && (next_vr->access_rights == access_r 621 && (next_vr->access_rights == access_rights) );
622 622
623 if (merge_with_preceding && merge_with_next) 623 if (merge_with_preceding && merge_with_next)
624 { 624 {
625 625
626 vr = prev_vr; 626 vr = prev_vr;
627 vr->size += size + next_vr->size; 627 vr->size += size + next_vr->size;
628 628
629 629
630 list_delete_named(as->list_vr, next_vr, 630 list_delete_named(as->list_vr, next_vr, prev_in_as, next_in_as);
631 list_delete_named(next_vr->mapped_resour 631 list_delete_named(next_vr->mapped_resource->list_vr, next_vr,
632 prev_in_mapped_resourc 632 prev_in_mapped_resource, next_in_mapped_resource);
633 633
634 if (next_vr->ops && next_vr->ops->unref) 634 if (next_vr->ops && next_vr->ops->unref)
635 next_vr->ops->unref(next_vr); 635 next_vr->ops->unref(next_vr);
636 636
637 sos_kmem_vmm_free((sos_vaddr_t) next_vr) 637 sos_kmem_vmm_free((sos_vaddr_t) next_vr);
638 } 638 }
639 else if (merge_with_preceding) 639 else if (merge_with_preceding)
640 { 640 {
641 641
642 vr = prev_vr; 642 vr = prev_vr;
643 vr->size += size; 643 vr->size += size;
644 } 644 }
645 else if (merge_with_next) 645 else if (merge_with_next)
646 { 646 {
647 647
648 vr = next_vr; 648 vr = next_vr;
649 vr->start -= size; 649 vr->start -= size;
650 vr->size += size; 650 vr->size += size;
651 } 651 }
652 else 652 else
653 { 653 {
654 654
655 655
656 vr = preallocated_vr; 656 vr = preallocated_vr;
657 used_preallocated_vr = TRUE; 657 used_preallocated_vr = TRUE;
658 658
659 vr->start = hint_uaddr; 659 vr->start = hint_uaddr;
660 vr->size = size; 660 vr->size = size;
661 vr->access_rights = access_rights; 661 vr->access_rights = access_rights;
662 vr->flags = flags; 662 vr->flags = flags;
663 vr->mapped_resource = resource; 663 vr->mapped_resource = resource;
664 vr->offset_in_resource = offset_in_resou 664 vr->offset_in_resource = offset_in_resource;
665 665
666 666
667 vr->address_space = as; 667 vr->address_space = as;
668 if (prev_vr) 668 if (prev_vr)
669 list_insert_after_named(as->list_vr, p 669 list_insert_after_named(as->list_vr, prev_vr, vr,
670 prev_in_as, ne 670 prev_in_as, next_in_as);
671 else 671 else
672 list_add_head_named(as->list_vr, vr, p 672 list_add_head_named(as->list_vr, vr, prev_in_as, next_in_as);
>> 673
673 list_add_tail_named(vr->mapped_resource- 674 list_add_tail_named(vr->mapped_resource->list_vr, vr,
674 prev_in_mapped_resou 675 prev_in_mapped_resource,
675 next_in_mapped_resou 676 next_in_mapped_resource);
676 677
677 678
678 if (resource && resource->mmap) 679 if (resource && resource->mmap)
679 { 680 {
680 retval = resource->mmap(vr); 681 retval = resource->mmap(vr);
681 if (SOS_OK != retval) 682 if (SOS_OK != retval)
682 { 683 {
683 retval = sos_umem_vmm_unmap(as, 684 retval = sos_umem_vmm_unmap(as, vr->start, vr->size);
684 goto return_mmap; 685 goto return_mmap;
685 } 686 }
686 687
687 688
688 SOS_ASSERT_FATAL(vr->ops && vr->ops- 689 SOS_ASSERT_FATAL(vr->ops && vr->ops->page_in);
689 } 690 }
690 691
691 if (vr->ops && vr->ops->ref) 692 if (vr->ops && vr->ops->ref)
692 vr->ops->ref(vr); 693 vr->ops->ref(vr);
693 } 694 }
694 695
695 696
696 *uaddr = hint_uaddr; 697 *uaddr = hint_uaddr;
697 as_account_change_of_vr_protection(as, vr->f 698 as_account_change_of_vr_protection(as, vr->flags & SOS_VR_MAP_SHARED,
698 size, 0, 699 size, 0, vr->access_rights);
699 retval = SOS_OK; 700 retval = SOS_OK;
700 701
701 return_mmap: 702 return_mmap:
702 if (! used_preallocated_vr) 703 if (! used_preallocated_vr)
703 sos_kmem_vmm_free((sos_vaddr_t)preallocate 704 sos_kmem_vmm_free((sos_vaddr_t)preallocated_vr);
704 705
705 return retval; 706 return retval;
706 } 707 }
707 708
708 709
709 sos_ret_t 710 sos_ret_t
710 sos_umem_vmm_unmap(struct sos_umem_vmm_as * as 711 sos_umem_vmm_unmap(struct sos_umem_vmm_as * as,
711 sos_uaddr_t uaddr, sos_size 712 sos_uaddr_t uaddr, sos_size_t size)
712 { 713 {
713 struct sos_umem_vmm_vr *vr, *preallocated_vr 714 struct sos_umem_vmm_vr *vr, *preallocated_vr;
714 sos_bool_t need_to_setup_mmu; 715 sos_bool_t need_to_setup_mmu;
715 sos_bool_t used_preallocated_vr; 716 sos_bool_t used_preallocated_vr;
716 717
717 if (! SOS_IS_PAGE_ALIGNED(uaddr)) 718 if (! SOS_IS_PAGE_ALIGNED(uaddr))
718 return -SOS_EINVAL; 719 return -SOS_EINVAL;
719 if (size <= 0) 720 if (size <= 0)
720 return -SOS_EINVAL; 721 return -SOS_EINVAL;
721 size = SOS_PAGE_ALIGN_SUP(size); 722 size = SOS_PAGE_ALIGN_SUP(size);
722 723
723 724
724 if (uaddr < SOS_PAGING_BASE_USER_ADDRESS) 725 if (uaddr < SOS_PAGING_BASE_USER_ADDRESS)
725 return -SOS_EINVAL; 726 return -SOS_EINVAL;
726 if (uaddr > SOS_PAGING_TOP_USER_ADDRESS - si 727 if (uaddr > SOS_PAGING_TOP_USER_ADDRESS - size)
727 return -SOS_EINVAL; 728 return -SOS_EINVAL;
728 729
729 730
730 731
731 732
732 733
733 734
734 used_preallocated_vr = FALSE; 735 used_preallocated_vr = FALSE;
735 preallocated_vr 736 preallocated_vr
736 = (struct sos_umem_vmm_vr *)sos_kmem_cache 737 = (struct sos_umem_vmm_vr *)sos_kmem_cache_alloc(cache_of_vr, 0);
737 if (! preallocated_vr) 738 if (! preallocated_vr)
738 return -SOS_ENOMEM; 739 return -SOS_ENOMEM;
739 740
740 741
741 vr = find_first_intersecting_vr(as, uaddr, s 742 vr = find_first_intersecting_vr(as, uaddr, size);
742 743
743 744
744 while (NULL != vr) 745 while (NULL != vr)
745 { 746 {
746 747
747 748
748 if (vr->start + vr->size <= uaddr) 749 if (vr->start + vr->size <= uaddr)
749 750
750 break; 751 break;
751 752
752 753
753 if (uaddr + size <= vr->start) 754 if (uaddr + size <= vr->start)
754 755
755 break; 756 break;
756 757
757 758
758 if ((vr->start >= uaddr) 759 if ((vr->start >= uaddr)
759 && (vr->start + vr->size <= uaddr + 760 && (vr->start + vr->size <= uaddr + size))
760 { 761 {
761 struct sos_umem_vmm_vr *next_vr; 762 struct sos_umem_vmm_vr *next_vr;
762 763
763 764
764 if (vr->ops && vr->ops->unmap) 765 if (vr->ops && vr->ops->unmap)
765 vr->ops->unmap(vr, vr->start, vr-> 766 vr->ops->unmap(vr, vr->start, vr->size);
766 767
767 768
768 next_vr = vr->next_in_as; 769 next_vr = vr->next_in_as;
769 if (next_vr == vr) 770 if (next_vr == vr)
770 next_vr = NULL; 771 next_vr = NULL;
771 list_delete_named(as->list_vr, vr, p 772 list_delete_named(as->list_vr, vr, prev_in_as, next_in_as);
772 773
773 774
774 list_delete_named(vr->mapped_resourc 775 list_delete_named(vr->mapped_resource->list_vr, vr,
775 prev_in_mapped_res 776 prev_in_mapped_resource,
776 next_in_mapped_res 777 next_in_mapped_resource);
777 778
778 if (vr->ops && vr->ops->unref) 779 if (vr->ops && vr->ops->unref)
779 vr->ops->unref(vr); 780 vr->ops->unref(vr);
780 781
781 as_account_change_of_vr_protection(a 782 as_account_change_of_vr_protection(as, vr->flags & SOS_VR_MAP_SHARED,
782 v 783 vr->size, vr->access_rights, 0);
783 sos_kmem_vmm_free((sos_vaddr_t)vr); 784 sos_kmem_vmm_free((sos_vaddr_t)vr);
784 785
785 786
786 vr = next_vr; 787 vr = next_vr;
787 continue; 788 continue;
788 } 789 }
789 790
790 791
791 else if ( (vr->start < uaddr) 792 else if ( (vr->start < uaddr)
792 && (vr->start + vr->size > uad 793 && (vr->start + vr->size > uaddr + size) )
793 { 794 {
794 795
795 796
796 797
797 used_preallocated_vr = TRUE; 798 used_preallocated_vr = TRUE;
798 memcpy(preallocated_vr, vr, sizeof(* 799 memcpy(preallocated_vr, vr, sizeof(*vr));
799 800
800 801
801 preallocated_vr->start = uaddr + siz 802 preallocated_vr->start = uaddr + size;
802 preallocated_vr->size = vr->start + 803 preallocated_vr->size = vr->start + vr->size - (uaddr + size);
803 preallocated_vr->offset_in_resource 804 preallocated_vr->offset_in_resource += uaddr + size - vr->start;
804 vr->size 805 vr->size = uaddr - vr->start;
805 806
806 807
807 list_insert_after_named(as->list_vr, 808 list_insert_after_named(as->list_vr, vr, preallocated_vr,
808 prev_in_as, 809 prev_in_as, next_in_as);
809 list_add_tail_named(vr->mapped_resou 810 list_add_tail_named(vr->mapped_resource->list_vr, preallocated_vr,
810 prev_in_mapped_r 811 prev_in_mapped_resource,
811 next_in_mapped_r 812 next_in_mapped_resource);
812 813
813 814
814 if (vr->ops && vr->ops->unmap) 815 if (vr->ops && vr->ops->unmap)
815 vr->ops->unmap(vr, uaddr, size); 816 vr->ops->unmap(vr, uaddr, size);
816 if (preallocated_vr->ops && prealloc 817 if (preallocated_vr->ops && preallocated_vr->ops->ref)
817 preallocated_vr->ops->ref(prealloc 818 preallocated_vr->ops->ref(preallocated_vr);
818 819
819 820
820 as_account_change_of_vr_protection(a 821 as_account_change_of_vr_protection(as, vr->flags & SOS_VR_MAP_SHARED,
821 s 822 size, vr->access_rights, 0);
822 823
823 824
824 break; 825 break;
825 } 826 }
826 827
827 828
828 else if (uaddr <= vr->start) 829 else if (uaddr <= vr->start)
829 { 830 {
830 sos_size_t translation = uaddr + siz 831 sos_size_t translation = uaddr + size - vr->start;
831 832
832 833
833 vr->size -= translatio 834 vr->size -= translation;
834 vr->offset_in_resource += translatio 835 vr->offset_in_resource += translation;
835 vr->start += translatio 836 vr->start += translation;
836 837
837 838
838 if (vr->ops && vr->ops->unmap) 839 if (vr->ops && vr->ops->unmap)
839 vr->ops->unmap(vr, uaddr + size, 840 vr->ops->unmap(vr, uaddr + size,
840 translation); 841 translation);
841 842
842 843
843 as_account_change_of_vr_protection(a 844 as_account_change_of_vr_protection(as, vr->flags & SOS_VR_MAP_SHARED,
844 t 845 translation,
845 v 846 vr->access_rights, 0);
846 847
847 848
848 849
849 break; 850 break;
850 } 851 }
851 852
852 853
853 else if (uaddr + size >= vr->start + vr- 854 else if (uaddr + size >= vr->start + vr->size)
854 { 855 {
855 sos_size_t unmapped_size = vr->start 856 sos_size_t unmapped_size = vr->start + vr->size - uaddr;
856 857
857 858
858 vr->size = uaddr - vr->start; 859 vr->size = uaddr - vr->start;
859 860
860 861
861 if (vr->ops && vr->ops->unmap) 862 if (vr->ops && vr->ops->unmap)
862 vr->ops->unmap(vr, uaddr, unmapped 863 vr->ops->unmap(vr, uaddr, unmapped_size);
863 864
864 865
865 as_account_change_of_vr_protection(a 866 as_account_change_of_vr_protection(as, vr->flags & SOS_VR_MAP_SHARED,
866 u 867 unmapped_size,
867 v 868 vr->access_rights, 0);
868 869
869 vr = vr->next_in_as; 870 vr = vr->next_in_as;
870 continue; 871 continue;
871 } 872 }
872 873
873 sos_display_fatal_error("BUG uaddr=%x sz 874 sos_display_fatal_error("BUG uaddr=%x sz=%x vr_start=%x, vr_sz=%x",
874 uaddr, size, vr- 875 uaddr, size, vr->start, vr->size);
875 } 876 }
876 877
877 need_to_setup_mmu = (sos_thread_get_current( 878 need_to_setup_mmu = (sos_thread_get_current()->squatted_mm_context
878 != as->mm_context); 879 != as->mm_context);
879 if (need_to_setup_mmu) 880 if (need_to_setup_mmu)
880 SOS_ASSERT_FATAL(SOS_OK 881 SOS_ASSERT_FATAL(SOS_OK
881 == sos_thread_prepare_use 882 == sos_thread_prepare_user_space_access(as,
882 883 (sos_vaddr_t)
883 884 NULL));
884 { 885 {
885 sos_size_t sz_unmapped = sos_paging_unmap_ !! 886 sos_ret_t sz_unmapped = sos_paging_unmap_interval(uaddr, size);
886 SOS_ASSERT_FATAL(sz_unmapped >= 0); 887 SOS_ASSERT_FATAL(sz_unmapped >= 0);
887 as->phys_total -= sz_unmapped; 888 as->phys_total -= sz_unmapped;
888 } 889 }
889 if (need_to_setup_mmu) 890 if (need_to_setup_mmu)
890 SOS_ASSERT_FATAL(SOS_OK == sos_thread_end_ 891 SOS_ASSERT_FATAL(SOS_OK == sos_thread_end_user_space_access());
891 892
892 if (! used_preallocated_vr) 893 if (! used_preallocated_vr)
893 sos_kmem_vmm_free((sos_vaddr_t)preallocate 894 sos_kmem_vmm_free((sos_vaddr_t)preallocated_vr);
894 895
895 return SOS_OK; 896 return SOS_OK;
896 } 897 }
897 898
898 899
899 sos_ret_t 900 sos_ret_t
900 sos_umem_vmm_chprot(struct sos_umem_vmm_as * a 901 sos_umem_vmm_chprot(struct sos_umem_vmm_as * as,
901 sos_uaddr_t uaddr, sos_siz 902 sos_uaddr_t uaddr, sos_size_t size,
902 sos_ui32_t new_access_righ 903 sos_ui32_t new_access_rights)
903 { 904 {
904 struct sos_umem_vmm_vr *start_vr, *vr, 905 struct sos_umem_vmm_vr *start_vr, *vr,
905 *preallocated_middle_vr, *preallocated_rig 906 *preallocated_middle_vr, *preallocated_right_vr;
906 sos_bool_t used_preallocated_middle_vr, used 907 sos_bool_t used_preallocated_middle_vr, used_preallocated_right_vr;
907 908
908 if (! SOS_IS_PAGE_ALIGNED(uaddr)) 909 if (! SOS_IS_PAGE_ALIGNED(uaddr))
909 return -SOS_EINVAL; 910 return -SOS_EINVAL;
910 if (size <= 0) 911 if (size <= 0)
911 return -SOS_EINVAL; 912 return -SOS_EINVAL;
912 size = SOS_PAGE_ALIGN_SUP(size); 913 size = SOS_PAGE_ALIGN_SUP(size);
913 914
914 915
915 if (uaddr < SOS_PAGING_BASE_USER_ADDRESS) 916 if (uaddr < SOS_PAGING_BASE_USER_ADDRESS)
916 return -SOS_EINVAL; 917 return -SOS_EINVAL;
917 if (uaddr > SOS_PAGING_TOP_USER_ADDRESS - si 918 if (uaddr > SOS_PAGING_TOP_USER_ADDRESS - size)
918 return -SOS_EINVAL; 919 return -SOS_EINVAL;
919 920
920 921
921 922
922 used_preallocated_middle_vr = FALSE; 923 used_preallocated_middle_vr = FALSE;
923 used_preallocated_right_vr = FALSE; 924 used_preallocated_right_vr = FALSE;
924 preallocated_middle_vr 925 preallocated_middle_vr
925 = (struct sos_umem_vmm_vr *)sos_kmem_cache 926 = (struct sos_umem_vmm_vr *)sos_kmem_cache_alloc(cache_of_vr, 0);
926 if (! preallocated_middle_vr) 927 if (! preallocated_middle_vr)
927 return -SOS_ENOMEM; 928 return -SOS_ENOMEM;
928 preallocated_right_vr 929 preallocated_right_vr
929 = (struct sos_umem_vmm_vr *)sos_kmem_cache 930 = (struct sos_umem_vmm_vr *)sos_kmem_cache_alloc(cache_of_vr, 0);
930 if (! preallocated_right_vr) 931 if (! preallocated_right_vr)
931 { 932 {
932 sos_kmem_vmm_free((sos_vaddr_t)prealloca 933 sos_kmem_vmm_free((sos_vaddr_t)preallocated_middle_vr);
933 return -SOS_ENOMEM; 934 return -SOS_ENOMEM;
934 } 935 }
935 936
936 937
937 start_vr = find_first_intersecting_vr(as, ua 938 start_vr = find_first_intersecting_vr(as, uaddr, size);
938 if (NULL == start_vr) 939 if (NULL == start_vr)
939 return SOS_OK; 940 return SOS_OK;
940 941
941 942
942 943
943 vr = start_vr; 944 vr = start_vr;
944 while (TRUE) 945 while (TRUE)
945 { 946 {
946 947
947 948
948 if (vr->start + vr->size <= uaddr) 949 if (vr->start + vr->size <= uaddr)
949 950
950 break; 951 break;
951 952
952 953
953 if (uaddr + size < vr->start) 954 if (uaddr + size < vr->start)
954 955
955 break; 956 break;
956 957
957 if (vr->flags & SOS_VR_MAP_SHARED) 958 if (vr->flags & SOS_VR_MAP_SHARED)
958 { 959 {
959 960
960 961
961 if ( ( (new_access_rights & SOS_VM_M 962 if ( ( (new_access_rights & SOS_VM_MAP_PROT_READ)
962 && !(vr->mapped_resource->all 963 && !(vr->mapped_resource->allowed_access_rights
963 & SOS_VM_MAP_PROT_READ) 964 & SOS_VM_MAP_PROT_READ) )
964 || ( (new_access_rights & SOS_V 965 || ( (new_access_rights & SOS_VM_MAP_PROT_WRITE)
965 && !(vr->mapped_resource-> 966 && !(vr->mapped_resource->allowed_access_rights
966 & SOS_VM_MAP_PROT_WRI 967 & SOS_VM_MAP_PROT_WRITE) )
967 || ( (new_access_rights & SOS_V 968 || ( (new_access_rights & SOS_VM_MAP_PROT_EXEC)
968 && !(vr->mapped_resource-> 969 && !(vr->mapped_resource->allowed_access_rights
969 & SOS_VM_MAP_PROT_EXE 970 & SOS_VM_MAP_PROT_EXEC) ) )
970 return -SOS_EPERM; 971 return -SOS_EPERM;
971 } 972 }
972 973
973 vr = vr->next_in_as; 974 vr = vr->next_in_as;
974 } 975 }
975 976
976 977
977 978
978 vr = start_vr; 979 vr = start_vr;
979 while (TRUE) 980 while (TRUE)
980 { 981 {
981 982
982 983
983 984
984 if (vr->start + vr->size <= uaddr) 985 if (vr->start + vr->size <= uaddr)
985 986
986 break; 987 break;
987 988
988 989
989 if (uaddr + size <= vr->start) 990 if (uaddr + size <= vr->start)
990 991
991 break; 992 break;
992 993
993 994
994 if (vr->access_rights == new_access_righ 995 if (vr->access_rights == new_access_rights)
995 996
996 { 997 {
997 vr = vr->next_in_as; 998 vr = vr->next_in_as;
998 continue; 999 continue;
999 } 1000 }
1000 1001
1001 1002
1002 if ((vr->start >= uaddr) 1003 if ((vr->start >= uaddr)
1003 && (vr->start + vr->size <= uaddr + 1004 && (vr->start + vr->size <= uaddr + size))
1004 { 1005 {
1005 1006
1006 as_account_change_of_vr_protection( 1007 as_account_change_of_vr_protection(as, vr->flags & SOS_VR_MAP_SHARED,
1007 1008 vr->size, vr->access_rights,
1008 1009 new_access_rights);
1009 vr->access_rights = new_access_righ 1010 vr->access_rights = new_access_rights;
1010 1011
1011 if (vr->flags & SOS_VR_MAP_SHARED) 1012 if (vr->flags & SOS_VR_MAP_SHARED)
1012 1013
1013 1014
1014 sos_paging_set_prot_of_interval(v 1015 sos_paging_set_prot_of_interval(vr->start, vr->size,
1015 n 1016 new_access_rights);
1016 else 1017 else
1017 1018
1018 { 1019 {
1019 1020
1020 1021
1021 1022
1022 1023
1023 1024
1024 if (! (new_access_rights & SOS_ 1025 if (! (new_access_rights & SOS_VM_MAP_PROT_WRITE))
1025 sos_paging_set_prot_of_interv 1026 sos_paging_set_prot_of_interval(vr->start, vr->size,
1026 1027 new_access_rights);
1027 } 1028 }
1028 1029
1029 vr = vr->next_in_as; 1030 vr = vr->next_in_as;
1030 continue; 1031 continue;
1031 } 1032 }
1032 1033
1033 1034
1034 else if ( (vr->start < uaddr) 1035 else if ( (vr->start < uaddr)
1035 && (vr->start + vr->size > ua 1036 && (vr->start + vr->size > uaddr + size) )
1036 { 1037 {
1037 1038
1038 1039
1039 1040
1040 SOS_ASSERT_FATAL(! used_preallocate 1041 SOS_ASSERT_FATAL(! used_preallocated_middle_vr);
1041 SOS_ASSERT_FATAL(! used_preallocate 1042 SOS_ASSERT_FATAL(! used_preallocated_right_vr);
1042 used_preallocated_middle_vr = TRUE; 1043 used_preallocated_middle_vr = TRUE;
1043 memcpy(preallocated_middle_vr, vr, 1044 memcpy(preallocated_middle_vr, vr, sizeof(*vr));
1044 used_preallocated_right_vr = TRUE; 1045 used_preallocated_right_vr = TRUE;
1045 memcpy(preallocated_right_vr, vr, s 1046 memcpy(preallocated_right_vr, vr, sizeof(*vr));
1046 1047
1047 1048
1048 preallocated_middle_vr->start = uad 1049 preallocated_middle_vr->start = uaddr;
1049 preallocated_middle_vr->size = siz 1050 preallocated_middle_vr->size = size;
1050 preallocated_right_vr->start = uad 1051 preallocated_right_vr->start = uaddr + size;
1051 preallocated_right_vr->size = vr- 1052 preallocated_right_vr->size = vr->start + vr->size
1052 - 1053 - (uaddr + size);
1053 preallocated_middle_vr->offset_in_r 1054 preallocated_middle_vr->offset_in_resource
1054 += uaddr - vr->start; 1055 += uaddr - vr->start;
1055 preallocated_right_vr->offset_in_re 1056 preallocated_right_vr->offset_in_resource
1056 += uaddr + size - vr->start; 1057 += uaddr + size - vr->start;
1057 vr->size = uaddr - vr->start; 1058 vr->size = uaddr - vr->start;
1058 1059
1059 1060
1060 preallocated_middle_vr->access_righ 1061 preallocated_middle_vr->access_rights = new_access_rights;
1061 as_account_change_of_vr_protection( 1062 as_account_change_of_vr_protection(as, vr->flags & SOS_VR_MAP_SHARED,
1062 1063 size, vr->access_rights,
1063 1064 new_access_rights);
1064 1065
1065 1066
1066 list_insert_after_named(as->list_vr 1067 list_insert_after_named(as->list_vr, vr, preallocated_middle_vr,
1067 prev_in_as, 1068 prev_in_as, next_in_as);
1068 list_insert_after_named(as->list_vr 1069 list_insert_after_named(as->list_vr, preallocated_middle_vr,
1069 preallocate 1070 preallocated_right_vr,
1070 prev_in_as, 1071 prev_in_as, next_in_as);
1071 1072
1072 list_add_tail_named(vr->mapped_reso 1073 list_add_tail_named(vr->mapped_resource->list_vr,
1073 preallocated_mi 1074 preallocated_middle_vr,
1074 prev_in_mapped_ 1075 prev_in_mapped_resource,
1075 next_in_mapped_ 1076 next_in_mapped_resource);
1076 list_add_tail_named(vr->mapped_reso 1077 list_add_tail_named(vr->mapped_resource->list_vr,
1077 preallocated_ri 1078 preallocated_right_vr,
1078 prev_in_mapped_ 1079 prev_in_mapped_resource,
1079 next_in_mapped_ 1080 next_in_mapped_resource);
1080 1081
1081 1082
1082 if (!(preallocated_middle_vr->flags 1083 if (!(preallocated_middle_vr->flags & SOS_VR_MAP_SHARED)
1083 && (new_access_rights & SOS_VM_ 1084 && (new_access_rights & SOS_VM_MAP_PROT_WRITE))
1084 1085
1085 sos_paging_prepare_COW(preallocat 1086 sos_paging_prepare_COW(preallocated_middle_vr->start,
1086 preallocat 1087 preallocated_middle_vr->size);
1087 else 1088 else
1088 sos_paging_set_prot_of_interval(p 1089 sos_paging_set_prot_of_interval(preallocated_middle_vr->start,
1089 p 1090 preallocated_middle_vr->size,
1090 n 1091 new_access_rights);
1091 1092
1092 if (preallocated_right_vr->ops && p 1093 if (preallocated_right_vr->ops && preallocated_right_vr->ops->ref)
1093 preallocated_right_vr->ops->ref(p 1094 preallocated_right_vr->ops->ref(preallocated_right_vr);
1094 if (preallocated_middle_vr->ops && 1095 if (preallocated_middle_vr->ops && preallocated_middle_vr->ops->ref)
1095 preallocated_middle_vr->ops->ref( 1096 preallocated_middle_vr->ops->ref(preallocated_middle_vr);
1096 1097
1097 1098
1098 break; 1099 break;
1099 } 1100 }
1100 1101
1101 1102
1102 else if (uaddr <= vr->start) 1103 else if (uaddr <= vr->start)
1103 { 1104 {
1104 1105
1105 sos_uoffset_t offset_in_region = ua 1106 sos_uoffset_t offset_in_region = uaddr + size - vr->start;
1106 1107
1107 1108
1108 SOS_ASSERT_FATAL(! used_preallocate 1109 SOS_ASSERT_FATAL(! used_preallocated_middle_vr);
1109 used_preallocated_middle_vr = TRUE; 1110 used_preallocated_middle_vr = TRUE;
1110 memcpy(preallocated_middle_vr, vr, 1111 memcpy(preallocated_middle_vr, vr, sizeof(*vr));
1111 1112
1112 1113
1113 preallocated_middle_vr->start += of 1114 preallocated_middle_vr->start += offset_in_region;
1114 preallocated_middle_vr->size -= of 1115 preallocated_middle_vr->size -= offset_in_region;
1115 vr->size = of 1116 vr->size = offset_in_region;
1116 preallocated_middle_vr->offset_in_r 1117 preallocated_middle_vr->offset_in_resource += offset_in_region;
1117 1118
1118 1119
1119 as_account_change_of_vr_protection( 1120 as_account_change_of_vr_protection(as, vr->flags & SOS_VR_MAP_SHARED,
1120 1121 vr->size,
1121 1122 vr->access_rights,
1122 1123 new_access_rights);
1123 vr->access_rights = new_access_righ 1124 vr->access_rights = new_access_rights;
1124 1125
1125 1126
1126 list_insert_after_named(as->list_vr 1127 list_insert_after_named(as->list_vr, vr,
1127 preallocate 1128 preallocated_middle_vr,
1128 prev_in_as, 1129 prev_in_as, next_in_as);
1129 list_add_tail_named(vr->mapped_reso 1130 list_add_tail_named(vr->mapped_resource->list_vr,
1130 preallocated_mi 1131 preallocated_middle_vr,
1131 prev_in_mapped_ 1132 prev_in_mapped_resource,
1132 next_in_mapped_ 1133 next_in_mapped_resource);
1133 1134
1134 1135
1135 if (!(vr->flags & SOS_VR_MAP_SHARED 1136 if (!(vr->flags & SOS_VR_MAP_SHARED)
1136 && (new_access_rights & SOS_VM_ 1137 && (new_access_rights & SOS_VM_MAP_PROT_WRITE))
1137 1138
1138 sos_paging_prepare_COW(vr->start, 1139 sos_paging_prepare_COW(vr->start, vr->size);
1139 else 1140 else
1140 sos_paging_set_prot_of_interval(v 1141 sos_paging_set_prot_of_interval(vr->start, vr->size,
1141 n 1142 new_access_rights);
1142 1143
1143 if (preallocated_middle_vr->ops && 1144 if (preallocated_middle_vr->ops && preallocated_middle_vr->ops->ref)
1144 preallocated_middle_vr->ops->ref( 1145 preallocated_middle_vr->ops->ref(preallocated_middle_vr);
1145 1146
1146 1147
1147 1148
1148 break; 1149 break;
1149 } 1150 }
1150 1151
1151 1152
1152 else if (uaddr + size >= vr->start + vr 1153 else if (uaddr + size >= vr->start + vr->size)
1153 { 1154 {
1154 1155
1155 sos_uoffset_t offset_in_region = ua 1156 sos_uoffset_t offset_in_region = uaddr - vr->start;
1156 1157
1157 1158
1158 SOS_ASSERT_FATAL(! used_preallocate 1159 SOS_ASSERT_FATAL(! used_preallocated_right_vr);
1159 used_preallocated_right_vr = TRUE; 1160 used_preallocated_right_vr = TRUE;
1160 memcpy(preallocated_right_vr, vr, s 1161 memcpy(preallocated_right_vr, vr, sizeof(*vr));
1161 1162
1162 1163
1163 preallocated_right_vr->start 1164 preallocated_right_vr->start += offset_in_region;
1164 preallocated_right_vr->size 1165 preallocated_right_vr->size -= offset_in_region;
1165 vr->size 1166 vr->size = offset_in_region;
1166 preallocated_right_vr->offset_in_re 1167 preallocated_right_vr->offset_in_resource += offset_in_region;
1167 1168
1168 1169
1169 as_account_change_of_vr_protection( 1170 as_account_change_of_vr_protection(as, vr->flags & SOS_VR_MAP_SHARED,
1170 1171 preallocated_right_vr->size,
1171 1172 vr->access_rights,
1172 1173 new_access_rights);
1173 preallocated_right_vr->access_right 1174 preallocated_right_vr->access_rights = new_access_rights;
1174 1175
1175 1176
1176 list_insert_after_named(as->list_vr 1177 list_insert_after_named(as->list_vr, vr,
1177 preallocate 1178 preallocated_right_vr,
1178 prev_in_as, 1179 prev_in_as, next_in_as);
1179 list_add_tail_named(vr->mapped_reso 1180 list_add_tail_named(vr->mapped_resource->list_vr,
1180 preallocated_ri 1181 preallocated_right_vr,
1181 prev_in_mapped_ 1182 prev_in_mapped_resource,
1182 next_in_mapped_ 1183 next_in_mapped_resource);
1183 1184
1184 1185
1185 if (!(preallocated_right_vr->flags 1186 if (!(preallocated_right_vr->flags & SOS_VR_MAP_SHARED)
1186 && (new_access_rights & SOS_VM_ 1187 && (new_access_rights & SOS_VM_MAP_PROT_WRITE))
1187 1188
1188 sos_paging_prepare_COW(preallocat 1189 sos_paging_prepare_COW(preallocated_right_vr->start,
1189 preallocat 1190 preallocated_right_vr->size);
1190 else 1191 else
1191 sos_paging_set_prot_of_interval(p 1192 sos_paging_set_prot_of_interval(preallocated_right_vr->start,
1192 p 1193 preallocated_right_vr->size,
1193 n 1194 new_access_rights);
1194 1195
1195 if (preallocated_right_vr->ops && p 1196 if (preallocated_right_vr->ops && preallocated_right_vr->ops->ref)
1196 preallocated_right_vr->ops->ref(p 1197 preallocated_right_vr->ops->ref(preallocated_right_vr);
1197 1198
1198 vr = vr->next_in_as; 1199 vr = vr->next_in_as;
1199 continue; 1200 continue;
1200 } 1201 }
1201 1202
1202 sos_display_fatal_error("BUG"); 1203 sos_display_fatal_error("BUG");
1203 } 1204 }
1204 1205
1205 if (! used_preallocated_middle_vr) 1206 if (! used_preallocated_middle_vr)
1206 sos_kmem_vmm_free((sos_vaddr_t)preallocat 1207 sos_kmem_vmm_free((sos_vaddr_t)preallocated_middle_vr);
1207 if (! used_preallocated_right_vr) 1208 if (! used_preallocated_right_vr)
1208 sos_kmem_vmm_free((sos_vaddr_t)preallocat 1209 sos_kmem_vmm_free((sos_vaddr_t)preallocated_right_vr);
>> 1210
>> 1211 return SOS_OK;
>> 1212 }
>> 1213
>> 1214
>> 1215 sos_ret_t
>> 1216 sos_umem_vmm_sync(struct sos_umem_vmm_as * as,
>> 1217 sos_uaddr_t uaddr, sos_size_t size,
>> 1218 sos_ui32_t flags)
>> 1219 {
>> 1220 if (! SOS_IS_PAGE_ALIGNED(uaddr))
>> 1221 return -SOS_EINVAL;
>> 1222 if (size <= 0)
>> 1223 return -SOS_EINVAL;
>> 1224 size = SOS_PAGE_ALIGN_SUP(size);
>> 1225
>> 1226
>> 1227 if (uaddr < SOS_PAGING_BASE_USER_ADDRESS)
>> 1228 return -SOS_EINVAL;
>> 1229 if (uaddr > SOS_PAGING_TOP_USER_ADDRESS - size)
>> 1230 return -SOS_EINVAL;
>> 1231
>> 1232
>> 1233
>> 1234 while (TRUE)
>> 1235 {
>> 1236 struct sos_umem_vmm_vr *vr;
>> 1237
>> 1238 if (size <= 0)
>> 1239 break;
>> 1240
>> 1241
>> 1242 vr = find_first_intersecting_vr(as, uaddr, size);
>> 1243 if (NULL == vr)
>> 1244 break;
>> 1245
>> 1246
>> 1247 if ( !(vr->flags & SOS_VR_MAP_SHARED)
>> 1248 || (vr->mapped_resource->flags & SOS_MAPPED_RESOURCE_ANONYMOUS)
>> 1249
>> 1250
>> 1251 || ! vr->ops->sync_page )
>> 1252 {
>> 1253 if (size <= vr->size)
>> 1254 break;
>> 1255
>> 1256 uaddr += vr->size;
>> 1257 size -= vr->size;
>> 1258 }
>> 1259
>> 1260
>> 1261 for ( ; (size > 0)
>> 1262 && (uaddr - vr->start < vr->size) ;
>> 1263 uaddr += SOS_PAGE_SIZE,
>> 1264 size -= SOS_PAGE_SIZE)
>> 1265 if (sos_paging_is_dirty(uaddr))
>> 1266 {
>> 1267
>> 1268 vr->ops->sync_page(vr, uaddr, flags);
>> 1269 uaddr += SOS_PAGE_SIZE;
>> 1270 size -= SOS_PAGE_SIZE;
>> 1271 break;
>> 1272 }
>> 1273 }
1209 1274
1210 return SOS_OK; 1275 return SOS_OK;
1211 } 1276 }
1212 1277
1213 1278
1214 sos_ret_t 1279 sos_ret_t
1215 sos_umem_vmm_resize(struct sos_umem_vmm_as * 1280 sos_umem_vmm_resize(struct sos_umem_vmm_as * as,
1216 sos_uaddr_t old_uaddr, so 1281 sos_uaddr_t old_uaddr, sos_size_t old_size,
1217 sos_uaddr_t *new_uaddr, s 1282 sos_uaddr_t *new_uaddr, sos_size_t new_size,
1218 sos_ui32_t flags) 1283 sos_ui32_t flags)
1219 { 1284 {
1220 sos_luoffset_t new_offset_in_resource; 1285 sos_luoffset_t new_offset_in_resource;
1221 sos_bool_t must_move_vr = FALSE; 1286 sos_bool_t must_move_vr = FALSE;
1222 struct sos_umem_vmm_vr *vr, *prev_vr, *next 1287 struct sos_umem_vmm_vr *vr, *prev_vr, *next_vr;
1223 1288
1224 1289
1225 if (*new_uaddr < SOS_PAGING_BASE_USER_ADDRE 1290 if (*new_uaddr < SOS_PAGING_BASE_USER_ADDRESS)
1226 return -SOS_EINVAL; 1291 return -SOS_EINVAL;
1227 if (*new_uaddr > SOS_PAGING_TOP_USER_ADDRES 1292 if (*new_uaddr > SOS_PAGING_TOP_USER_ADDRESS - new_size)
1228 return -SOS_EINVAL; 1293 return -SOS_EINVAL;
1229 1294
1230 old_uaddr = SOS_PAGE_ALIGN_INF(old_uaddr); 1295 old_uaddr = SOS_PAGE_ALIGN_INF(old_uaddr);
1231 old_size = SOS_PAGE_ALIGN_SUP(old_size); 1296 old_size = SOS_PAGE_ALIGN_SUP(old_size);
1232 if (! SOS_IS_PAGE_ALIGNED(*new_uaddr)) 1297 if (! SOS_IS_PAGE_ALIGNED(*new_uaddr))
1233 return -SOS_EINVAL; 1298 return -SOS_EINVAL;
1234 if (new_size <= 0) 1299 if (new_size <= 0)
1235 return -SOS_EINVAL; 1300 return -SOS_EINVAL;
1236 new_size = SOS_PAGE_ALIGN_SUP(new_size); 1301 new_size = SOS_PAGE_ALIGN_SUP(new_size);
1237 1302
1238 1303
1239 vr = find_first_intersecting_vr(as, old_uad 1304 vr = find_first_intersecting_vr(as, old_uaddr, old_size);
1240 if (! vr) 1305 if (! vr)
1241 return -SOS_EINVAL; 1306 return -SOS_EINVAL;
1242 1307
1243 1308
1244 if ( (vr->start > old_uaddr) 1309 if ( (vr->start > old_uaddr)
1245 || (vr->start + vr->size < old_uaddr + 1310 || (vr->start + vr->size < old_uaddr + old_size) )
1246 return -SOS_EINVAL; 1311 return -SOS_EINVAL;
1247 1312
1248 1313
1249 1314
1250 prev_vr = vr->prev_in_as; 1315 prev_vr = vr->prev_in_as;
1251 if (prev_vr->start >= vr->start) 1316 if (prev_vr->start >= vr->start)
1252 prev_vr = NULL; 1317 prev_vr = NULL;
1253 next_vr = vr->prev_in_as; 1318 next_vr = vr->prev_in_as;
1254 if (next_vr->start <= vr->start) 1319 if (next_vr->start <= vr->start)
1255 next_vr = NULL; 1320 next_vr = NULL;
1256 1321
1257 1322
1258 1323
1259 1324
1260 1325
1261 1326
1262 1327
1263 if ( (*new_uaddr < vr->start) 1328 if ( (*new_uaddr < vr->start)
1264 && (vr->start - *new_uaddr > vr->offse 1329 && (vr->start - *new_uaddr > vr->offset_in_resource) )
1265 return -SOS_EINVAL; 1330 return -SOS_EINVAL;
1266 1331
1267 1332
1268 if (vr->start > *new_uaddr) 1333 if (vr->start > *new_uaddr)
1269 new_offset_in_resource 1334 new_offset_in_resource
1270 = vr->offset_in_resource 1335 = vr->offset_in_resource
1271 - (vr->start - *new_uaddr); 1336 - (vr->start - *new_uaddr);
1272 else 1337 else
1273 new_offset_in_resource 1338 new_offset_in_resource
1274 = vr->offset_in_resource 1339 = vr->offset_in_resource
1275 + (*new_uaddr - vr->start); 1340 + (*new_uaddr - vr->start);
1276 1341
1277 1342
1278 1343
1279 if (prev_vr && (prev_vr->start + prev_vr->s 1344 if (prev_vr && (prev_vr->start + prev_vr->size > *new_uaddr))
1280 must_move_vr |= TRUE; 1345 must_move_vr |= TRUE;
1281 if (next_vr && (next_vr->start < *new_uaddr 1346 if (next_vr && (next_vr->start < *new_uaddr + new_size))
1282 must_move_vr |= TRUE; 1347 must_move_vr |= TRUE;
1283 1348
1284 1349
1285 if (*new_uaddr < SOS_PAGING_BASE_USER_ADDRE 1350 if (*new_uaddr < SOS_PAGING_BASE_USER_ADDRESS)
1286 must_move_vr |= TRUE; 1351 must_move_vr |= TRUE;
1287 if (*new_uaddr > SOS_PAGING_TOP_USER_ADDRES 1352 if (*new_uaddr > SOS_PAGING_TOP_USER_ADDRESS - new_size)
1288 must_move_vr |= TRUE; 1353 must_move_vr |= TRUE;
1289 1354
1290 1355
1291 if ( must_move_vr && !(flags & SOS_VR_REMAP 1356 if ( must_move_vr && !(flags & SOS_VR_REMAP_MAYMOVE) )
1292 return -SOS_EINVAL; 1357 return -SOS_EINVAL;
1293 1358
1294 1359
1295 1360
1296 if (must_move_vr) 1361 if (must_move_vr)
1297 { 1362 {
1298 sos_uaddr_t uaddr, result_uaddr; 1363 sos_uaddr_t uaddr, result_uaddr;
1299 sos_ret_t retval; 1364 sos_ret_t retval;
1300 1365
1301 result_uaddr = *new_uaddr; 1366 result_uaddr = *new_uaddr;
1302 retval = sos_umem_vmm_map(as, & result_ 1367 retval = sos_umem_vmm_map(as, & result_uaddr, new_size,
1303 vr->access_ri 1368 vr->access_rights,
1304 vr->flags | I 1369 vr->flags | INTERNAL_MAP_CALLED_FROM_MREMAP,
1305 vr->mapped_re 1370 vr->mapped_resource,
1306 new_offset_in 1371 new_offset_in_resource);
1307 if (SOS_OK != retval) 1372 if (SOS_OK != retval)
1308 return retval; 1373 return retval;
1309 1374
1310 1375
1311 for (uaddr = vr->start ; 1376 for (uaddr = vr->start ;
1312 uaddr < vr->start + vr->size ; 1377 uaddr < vr->start + vr->size ;
1313 uaddr += SOS_PAGE_SIZE) 1378 uaddr += SOS_PAGE_SIZE)
1314 { 1379 {
1315 sos_paddr_t paddr; 1380 sos_paddr_t paddr;
1316 sos_ui32_t prot; 1381 sos_ui32_t prot;
1317 sos_uaddr_t vaddr; 1382 sos_uaddr_t vaddr;
1318 1383
1319 if (uaddr < *new_uaddr) 1384 if (uaddr < *new_uaddr)
1320 continue; 1385 continue;
1321 if (uaddr > *new_uaddr + new_size) 1386 if (uaddr > *new_uaddr + new_size)
1322 continue; 1387 continue;
1323 1388
1324 1389
1325 1390
1326 if (vr->start >= *new_uaddr) 1391 if (vr->start >= *new_uaddr)
1327 vaddr = result_uaddr 1392 vaddr = result_uaddr
1328 + (uaddr - vr->start) 1393 + (uaddr - vr->start)
1329 + (vr->start - *new_uaddr); 1394 + (vr->start - *new_uaddr);
1330 else 1395 else
1331 vaddr = result_uaddr 1396 vaddr = result_uaddr
1332 + (uaddr - vr->start) 1397 + (uaddr - vr->start)
1333 - (*new_uaddr - vr->start); 1398 - (*new_uaddr - vr->start);
1334 1399
1335 paddr = sos_paging_get_paddr(uaddr) 1400 paddr = sos_paging_get_paddr(uaddr);
1336 if (! paddr) 1401 if (! paddr)
1337 1402
1338 continue; 1403 continue;
1339 1404
1340 prot = sos_paging_get_prot(uaddr); 1405 prot = sos_paging_get_prot(uaddr);
1341 SOS_ASSERT_FATAL(prot); 1406 SOS_ASSERT_FATAL(prot);
1342 1407
1343 1408
1344 retval = sos_paging_map(paddr, vadd 1409 retval = sos_paging_map(paddr, vaddr, TRUE, prot);
1345 if (SOS_OK != retval) 1410 if (SOS_OK != retval)
1346 { 1411 {
1347 sos_umem_vmm_unmap(as, result_u 1412 sos_umem_vmm_unmap(as, result_uaddr, new_size);
1348 return retval; 1413 return retval;
1349 } 1414 }
1350 } 1415 }
1351 1416
1352 retval = sos_umem_vmm_unmap(as, vr->sta 1417 retval = sos_umem_vmm_unmap(as, vr->start, vr->size);
1353 if (SOS_OK != retval) 1418 if (SOS_OK != retval)
1354 { 1419 {
1355 sos_umem_vmm_unmap(as, result_uaddr 1420 sos_umem_vmm_unmap(as, result_uaddr, new_size);
1356 return retval; 1421 return retval;
1357 } 1422 }
1358 1423
1359 *new_uaddr = result_uaddr; 1424 *new_uaddr = result_uaddr;
1360 return retval; 1425 return retval;
1361 } 1426 }
1362 1427
1363 1428
1364 1429
1365 1430
1366 if (*new_uaddr + new_size < vr->start + vr- 1431 if (*new_uaddr + new_size < vr->start + vr->size)
1367 sos_umem_vmm_unmap(as, *new_uaddr + new_s 1432 sos_umem_vmm_unmap(as, *new_uaddr + new_size,
1368 vr->start + vr->size - 1433 vr->start + vr->size - (*new_uaddr + new_size));
1369 else 1434 else
1370 { 1435 {
1371 as_account_change_of_vr_protection(as, 1436 as_account_change_of_vr_protection(as, vr->flags & SOS_VR_MAP_SHARED,
1372 *new 1437 *new_uaddr + new_size
1373 - 1438 - (vr->start + vr->size),
1374 0, v 1439 0, vr->access_rights);
1375 vr->size += *new_uaddr + new_size - (vr 1440 vr->size += *new_uaddr + new_size - (vr->start + vr->size);
1376 } 1441 }
1377 1442
1378 if (*new_uaddr > vr->start) 1443 if (*new_uaddr > vr->start)
1379 sos_umem_vmm_unmap(as, vr->start, *new_ua 1444 sos_umem_vmm_unmap(as, vr->start, *new_uaddr - vr->start);
1380 else 1445 else
1381 { 1446 {
1382 as_account_change_of_vr_protection(as, 1447 as_account_change_of_vr_protection(as, vr->flags & SOS_VR_MAP_SHARED,
1383 vr-> 1448 vr->start - *new_uaddr,
1384 0, v 1449 0, vr->access_rights);
1385 vr->size += vr->start - *new_uaddr; 1450 vr->size += vr->start - *new_uaddr;
1386 vr->start = *new_uaddr; 1451 vr->start = *new_uaddr;
1387 vr->offset_in_resource = new_offset_in_ 1452 vr->offset_in_resource = new_offset_in_resource;
1388 } 1453 }
1389 1454
1390 SOS_ASSERT_FATAL(vr->start == *new_uaddr); 1455 SOS_ASSERT_FATAL(vr->start == *new_uaddr);
1391 SOS_ASSERT_FATAL(vr->size == new_size); 1456 SOS_ASSERT_FATAL(vr->size == new_size);
1392 SOS_ASSERT_FATAL(vr->offset_in_resource == 1457 SOS_ASSERT_FATAL(vr->offset_in_resource == new_offset_in_resource);
1393 1458
1394 return SOS_OK; 1459 return SOS_OK;
1395 } 1460 }
1396 1461
1397 1462
1398 sos_ret_t sos_umem_vmm_try_resolve_page_fault 1463 sos_ret_t sos_umem_vmm_try_resolve_page_fault(sos_uaddr_t uaddr,
1399 1464 sos_bool_t write_access,
1400 1465 sos_bool_t user_access)
1401 { 1466 {
1402 struct sos_process *process = sos_threa 1467 struct sos_process *process = sos_thread_get_current()->process;
1403 struct sos_umem_vmm_as *as; 1468 struct sos_umem_vmm_as *as;
1404 struct sos_umem_vmm_vr *vr; 1469 struct sos_umem_vmm_vr *vr;
1405 1470
1406 if (! process) 1471 if (! process)
1407 return -SOS_EFAULT; 1472 return -SOS_EFAULT;
1408 1473
1409 as = sos_process_get_address_space(process) 1474 as = sos_process_get_address_space(process);
1410 if (! as) 1475 if (! as)
1411 return -SOS_EFAULT; 1476 return -SOS_EFAULT;
1412 1477
1413 vr = find_first_intersecting_vr(as, uaddr, 1478 vr = find_first_intersecting_vr(as, uaddr, 1);
1414 if (! vr) 1479 if (! vr)
1415 return -SOS_EFAULT; 1480 return -SOS_EFAULT;
1416 1481
1417 1482
1418 if (write_access && !(vr->access_rights & S 1483 if (write_access && !(vr->access_rights & SOS_VM_MAP_PROT_WRITE))
1419 return -SOS_EFAULT; 1484 return -SOS_EFAULT;
1420 1485
1421 1486
1422 if (write_access && !(vr->flags & SOS_VR_MA 1487 if (write_access && !(vr->flags & SOS_VR_MAP_SHARED))
1423 { 1488 {
1424 if (SOS_OK == sos_paging_try_resolve_CO 1489 if (SOS_OK == sos_paging_try_resolve_COW(uaddr))
1425 { 1490 {
1426 as->pgflt_cow ++; 1491 as->pgflt_cow ++;
1427 return SOS_OK; 1492 return SOS_OK;
1428 } 1493 }
1429 } 1494 }
1430 1495
1431 1496
1432 if (SOS_OK != vr->ops->page_in(vr, uaddr, w 1497 if (SOS_OK != vr->ops->page_in(vr, uaddr, write_access))
1433 { 1498 {
1434 as->pgflt_invalid ++; 1499 as->pgflt_invalid ++;
1435 return -SOS_EFAULT; 1500 return -SOS_EFAULT;
1436 } 1501 }
1437 1502
1438 as->phys_total += SOS_PAGE_SIZE; 1503 as->phys_total += SOS_PAGE_SIZE;
1439 as->pgflt_page_in ++; 1504 as->pgflt_page_in ++;
1440 1505
1441 1506
1442 if (!(vr->flags & SOS_VR_MAP_SHARED)) 1507 if (!(vr->flags & SOS_VR_MAP_SHARED))
1443 { 1508 {
1444 sos_paging_prepare_COW(SOS_PAGE_ALIGN_I 1509 sos_paging_prepare_COW(SOS_PAGE_ALIGN_INF(uaddr),
1445 SOS_PAGE_SIZE); 1510 SOS_PAGE_SIZE);
1446 } 1511 }
1447 1512
1448 return SOS_OK; 1513 return SOS_OK;
1449 } 1514 }
1450 1515
1451 1516
1452 sos_ret_t 1517 sos_ret_t
1453 sos_umem_vmm_init_heap(struct sos_umem_vmm_as 1518 sos_umem_vmm_init_heap(struct sos_umem_vmm_as * as,
1454 sos_uaddr_t heap_start 1519 sos_uaddr_t heap_start)
1455 { 1520 {
1456 SOS_ASSERT_FATAL(! as->heap_start); 1521 SOS_ASSERT_FATAL(! as->heap_start);
1457 1522
1458 as->heap_start = heap_start; 1523 as->heap_start = heap_start;
1459 as->heap_size = 0; 1524 as->heap_size = 0;
1460 return SOS_OK; 1525 return SOS_OK;
1461 } 1526 }
1462 1527
1463 1528
1464 sos_uaddr_t 1529 sos_uaddr_t
1465 sos_umem_vmm_brk(struct sos_umem_vmm_as * as, 1530 sos_umem_vmm_brk(struct sos_umem_vmm_as * as,
1466 sos_uaddr_t new_top_uaddr) 1531 sos_uaddr_t new_top_uaddr)
1467 { 1532 {
1468 sos_uaddr_t new_start; 1533 sos_uaddr_t new_start;
1469 sos_size_t new_size; 1534 sos_size_t new_size;
1470 SOS_ASSERT_FATAL(as->heap_start); 1535 SOS_ASSERT_FATAL(as->heap_start);
1471 1536
1472 if (! new_top_uaddr) 1537 if (! new_top_uaddr)
1473 return as->heap_start + as->heap_size; 1538 return as->heap_start + as->heap_size;
1474 1539
1475 if (new_top_uaddr == as->heap_start + as->h 1540 if (new_top_uaddr == as->heap_start + as->heap_size)
1476 return as->heap_start + as->heap_size; 1541 return as->heap_start + as->heap_size;
1477 1542
1478 if (new_top_uaddr < as->heap_start) 1543 if (new_top_uaddr < as->heap_start)
1479 return (sos_uaddr_t)NULL; 1544 return (sos_uaddr_t)NULL;
1480 1545
1481 new_top_uaddr = SOS_PAGE_ALIGN_SUP(new_top_ 1546 new_top_uaddr = SOS_PAGE_ALIGN_SUP(new_top_uaddr);
1482 new_start = as->heap_start; 1547 new_start = as->heap_start;
1483 new_size = new_top_uaddr - as->heap_start; 1548 new_size = new_top_uaddr - as->heap_start;
1484 1549
1485 1550
1486 if (! as->heap_size) 1551 if (! as->heap_size)
1487 { 1552 {
1488 if (SOS_OK != sos_dev_zero_map(as, & as 1553 if (SOS_OK != sos_dev_zero_map(as, & as->heap_start,
1489 new_size 1554 new_size,
1490 SOS_VM_M 1555 SOS_VM_MAP_PROT_READ
1491 | SOS_VM 1556 | SOS_VM_MAP_PROT_WRITE,
1492 0 1557 0 ))
1493 return (sos_uaddr_t)NULL; 1558 return (sos_uaddr_t)NULL;
1494 1559
1495 as->heap_size = new_size; 1560 as->heap_size = new_size;
1496 return as->heap_start + as->heap_size; 1561 return as->heap_start + as->heap_size;
1497 } 1562 }
1498 1563
1499 1564
1500 if (new_size <= 0) 1565 if (new_size <= 0)
1501 { 1566 {
1502 if (SOS_OK != sos_umem_vmm_unmap(as, 1567 if (SOS_OK != sos_umem_vmm_unmap(as,
1503 as->he 1568 as->heap_start, as->heap_size))
1504 return (sos_uaddr_t)NULL; 1569 return (sos_uaddr_t)NULL;
1505 } 1570 }
1506 else 1571 else
1507 { 1572 {
1508 if (SOS_OK != sos_umem_vmm_resize(as, 1573 if (SOS_OK != sos_umem_vmm_resize(as,
1509 as->h 1574 as->heap_start, as->heap_size,
1510 & new 1575 & new_start, new_size,
1511 0)) 1576 0))
1512 return (sos_uaddr_t)NULL; 1577 return (sos_uaddr_t)NULL;
1513 } 1578 }
1514 1579
1515 SOS_ASSERT_FATAL(new_start == as->heap_star 1580 SOS_ASSERT_FATAL(new_start == as->heap_start);
1516 as->heap_size = new_size; 1581 as->heap_size = new_size;
1517 return new_top_uaddr; 1582 return new_top_uaddr;
1518 } 1583 }
1519 1584
1520 1585
1521 static struct sos_umem_vmm_vr * 1586 static struct sos_umem_vmm_vr *
1522 find_enclosing_or_next_vr(struct sos_umem_vmm 1587 find_enclosing_or_next_vr(struct sos_umem_vmm_as * as,
1523 sos_uaddr_t uaddr) 1588 sos_uaddr_t uaddr)
1524 { 1589 {
1525 struct sos_umem_vmm_vr *vr; 1590 struct sos_umem_vmm_vr *vr;
1526 int nb_vr; 1591 int nb_vr;
1527 1592
1528 if (uaddr < SOS_PAGING_BASE_USER_ADDRESS) 1593 if (uaddr < SOS_PAGING_BASE_USER_ADDRESS)
1529 return NULL; 1594 return NULL;
1530 if (uaddr > SOS_PAGING_TOP_USER_ADDRESS) 1595 if (uaddr > SOS_PAGING_TOP_USER_ADDRESS)
1531 return NULL; 1596 return NULL;
1532 1597
1533 list_foreach_named(as->list_vr, vr, nb_vr, 1598 list_foreach_named(as->list_vr, vr, nb_vr, prev_in_as, next_in_as)
1534 { 1599 {
1535 1600
1536 1601
1537 if (uaddr <= vr->start + (vr->size - 1) 1602 if (uaddr <= vr->start + (vr->size - 1))
1538 return vr; 1603 return vr;
1539 } 1604 }
1540 1605
1541 return NULL; 1606 return NULL;
1542 } 1607 }
1543 1608
1544 1609
1545 static struct sos_umem_vmm_vr * 1610 static struct sos_umem_vmm_vr *
1546 find_first_intersecting_vr(struct sos_umem_vm 1611 find_first_intersecting_vr(struct sos_umem_vmm_as * as,
1547 sos_uaddr_t start_ 1612 sos_uaddr_t start_uaddr, sos_size_t size)
1548 { 1613 {
1549 struct sos_umem_vmm_vr * vr; 1614 struct sos_umem_vmm_vr * vr;
1550 vr = find_enclosing_or_next_vr(as, start_ua 1615 vr = find_enclosing_or_next_vr(as, start_uaddr);
1551 if (! vr) 1616 if (! vr)
1552 return NULL; 1617 return NULL;
1553 1618
1554 if (start_uaddr + size <= vr->start) 1619 if (start_uaddr + size <= vr->start)
1555 return NULL; 1620 return NULL;
1556 1621
1557 return vr; 1622 return vr;
1558 } 1623 }
1559 1624
1560 1625
1561 static sos_uaddr_t 1626 static sos_uaddr_t
1562 find_first_free_interval(struct sos_umem_vmm_ 1627 find_first_free_interval(struct sos_umem_vmm_as * as,
1563 sos_uaddr_t hint_uad 1628 sos_uaddr_t hint_uaddr, sos_size_t size)
1564 { 1629 {
1565 struct sos_umem_vmm_vr * initial_vr, * vr; 1630 struct sos_umem_vmm_vr * initial_vr, * vr;
1566 1631
1567 if (hint_uaddr < SOS_PAGING_BASE_USER_ADDRE 1632 if (hint_uaddr < SOS_PAGING_BASE_USER_ADDRESS)
1568 hint_uaddr = SOS_PAGING_BASE_USER_ADDRESS 1633 hint_uaddr = SOS_PAGING_BASE_USER_ADDRESS;
1569 1634
1570 if (hint_uaddr > SOS_PAGING_TOP_USER_ADDRES 1635 if (hint_uaddr > SOS_PAGING_TOP_USER_ADDRESS - size + 1)
1571 return (sos_uaddr_t)NULL; 1636 return (sos_uaddr_t)NULL;
1572 1637
1573 initial_vr = vr = find_enclosing_or_next_vr 1638 initial_vr = vr = find_enclosing_or_next_vr(as, hint_uaddr);
1574 if (! vr) 1639 if (! vr)
1575 1640
1576 return hint_uaddr; 1641 return hint_uaddr;
1577 1642
1578 1643
1579 do 1644 do
1580 { 1645 {
1581 1646
1582 if (hint_uaddr + size <= vr->start) 1647 if (hint_uaddr + size <= vr->start)
1583 1648
1584 return hint_uaddr; 1649 return hint_uaddr;
1585 1650
1586 1651
1587 1652
1588 if (vr->next_in_as->start >= hint_uaddr 1653 if (vr->next_in_as->start >= hint_uaddr)
1589 1654
1590 hint_uaddr = vr->start + vr->size; 1655 hint_uaddr = vr->start + vr->size;
1591 else 1656 else
1592 { 1657 {
1593 1658
1594 1659
1595 1660
1596 if (hint_uaddr <= SOS_PAGING_TOP_US 1661 if (hint_uaddr <= SOS_PAGING_TOP_USER_ADDRESS - size)
1597 return hint_uaddr; 1662 return hint_uaddr;
1598 1663
1599 hint_uaddr = SOS_PAGING_BASE_USER_A 1664 hint_uaddr = SOS_PAGING_BASE_USER_ADDRESS;
1600 } 1665 }
1601 1666
1602 1667
1603 vr = vr->next_in_as; 1668 vr = vr->next_in_as;
1604 } 1669 }
1605 while (vr != initial_vr); 1670 while (vr != initial_vr);
1606 1671
1607 1672
1608 1673
1609 1674
1610 return (sos_uaddr_t)NULL; 1675 return (sos_uaddr_t)NULL;
1611 } 1676 }
1612 1677
1613 1678
1614 static void 1679 static void
1615 as_account_change_of_vr_protection(struct sos 1680 as_account_change_of_vr_protection(struct sos_umem_vmm_as * as,
1616 sos_bool_t 1681 sos_bool_t is_shared,
1617 sos_size_t 1682 sos_size_t size,
1618 sos_ui32_t 1683 sos_ui32_t prev_access_rights,
1619 sos_ui32_t 1684 sos_ui32_t new_access_rights)
1620 { 1685 {
1621 if (prev_access_rights == new_access_rights 1686 if (prev_access_rights == new_access_rights)
1622 return; 1687 return;
1623 1688
1624 #define _UPDATE_VMSTAT(field,is_increment) \ 1689 #define _UPDATE_VMSTAT(field,is_increment) \
1625 ({ if (is_increment > 0) \ 1690 ({ if (is_increment > 0) \
1626 as->field += size; \ 1691 as->field += size; \
1627 else \ 1692 else \
1628 { SOS_ASSERT_FATAL(as->field >= size); 1693 { SOS_ASSERT_FATAL(as->field >= size); as->field -= size; } })
1629 #define UPDATE_VMSTAT(field,is_increment) \ 1694 #define UPDATE_VMSTAT(field,is_increment) \
1630 ({ if (is_shared) _UPDATE_VMSTAT(vm_shrd.fi 1695 ({ if (is_shared) _UPDATE_VMSTAT(vm_shrd.field, is_increment); \
1631 _UPDATE_VMSTAT(vm_total.field, is_increm 1696 _UPDATE_VMSTAT(vm_total.field, is_increment); \
1632 SOS_ASSERT_FATAL(as->vm_total.field >= a 1697 SOS_ASSERT_FATAL(as->vm_total.field >= as->vm_shrd.field); })
1633 1698
1634 if ( (new_access_rights & SOS_VM_MAP_PROT_W 1699 if ( (new_access_rights & SOS_VM_MAP_PROT_WRITE)
1635 && !(prev_access_rights & SOS_VM_MAP_P 1700 && !(prev_access_rights & SOS_VM_MAP_PROT_WRITE))
1636 { 1701 {
1637 UPDATE_VMSTAT(rw, +1); 1702 UPDATE_VMSTAT(rw, +1);
1638 if (prev_access_rights & SOS_VM_MAP_PRO 1703 if (prev_access_rights & SOS_VM_MAP_PROT_READ)
1639 UPDATE_VMSTAT(ro, -1); 1704 UPDATE_VMSTAT(ro, -1);
1640 } 1705 }
1641 else if ( !(new_access_rights & SOS_VM_MAP_ 1706 else if ( !(new_access_rights & SOS_VM_MAP_PROT_WRITE)
1642 && (prev_access_rights & SOS_VM_M 1707 && (prev_access_rights & SOS_VM_MAP_PROT_WRITE))
1643 { 1708 {
1644 if (new_access_rights & SOS_VM_MAP_PROT 1709 if (new_access_rights & SOS_VM_MAP_PROT_READ)
1645 UPDATE_VMSTAT(ro, +1); 1710 UPDATE_VMSTAT(ro, +1);
1646 UPDATE_VMSTAT(rw, -1); 1711 UPDATE_VMSTAT(rw, -1);
1647 } 1712 }
1648 else if (new_access_rights & SOS_VM_MAP_PRO 1713 else if (new_access_rights & SOS_VM_MAP_PROT_READ)
1649 UPDATE_VMSTAT(ro, +1); 1714 UPDATE_VMSTAT(ro, +1);
1650 else if (!(new_access_rights & SOS_VM_MAP_P 1715 else if (!(new_access_rights & SOS_VM_MAP_PROT_READ))
1651 UPDATE_VMSTAT(ro, -1); 1716 UPDATE_VMSTAT(ro, -1);
1652 1717
1653 if ( (new_access_rights & SOS_VM_MAP_PROT_E 1718 if ( (new_access_rights & SOS_VM_MAP_PROT_EXEC)
1654 && !(prev_access_rights & SOS_VM_MAP_P 1719 && !(prev_access_rights & SOS_VM_MAP_PROT_EXEC))
1655 { 1720 {
1656 UPDATE_VMSTAT(code, +1); 1721 UPDATE_VMSTAT(code, +1);
1657 } 1722 }
1658 else if ( !(new_access_rights & SOS_VM_MAP_ 1723 else if ( !(new_access_rights & SOS_VM_MAP_PROT_EXEC)
1659 && (prev_access_rights & SOS_VM_M 1724 && (prev_access_rights & SOS_VM_MAP_PROT_EXEC))
1660 { 1725 {
1661 UPDATE_VMSTAT(code, -1); 1726 UPDATE_VMSTAT(code, -1);
1662 } 1727 }
1663 1728
1664 if (new_access_rights && !prev_access_right 1729 if (new_access_rights && !prev_access_rights)
1665 UPDATE_VMSTAT(overall, +1); 1730 UPDATE_VMSTAT(overall, +1);
1666 else if (!new_access_rights && prev_access_ 1731 else if (!new_access_rights && prev_access_rights)
1667 UPDATE_VMSTAT(overall, -1); 1732 UPDATE_VMSTAT(overall, -1);
1668 1733
1669 } 1734 }