d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generalize vm_page_ps_is_valid() to support testing other predicates on

Browse Source 
the (super)page, renaming the function to vm_page_ps_test().

Reviewed by:	kib, markj
MFC after:	1 week
This commit is contained in:
alc 2017-07-14 02:15:48 +00:00
parent 5f27f45e1a
commit 80e6bc7371
3 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/vm/vm_map.c
View File

@ -1962,7 +1962,7 @@ vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot,
(pagesizes[p->psind] - 1)) == 0) { (pagesizes[p->psind] - 1)) == 0) {
mask = atop(pagesizes[p->psind]) - 1; mask = atop(pagesizes[p->psind]) - 1;
if (tmpidx + mask < psize && if (tmpidx + mask < psize &&
vm_page_ps_is_valid(p)) { vm_page_ps_test(p, PS_ALL_VALID, NULL)) {
p += mask; p += mask;
threshold += mask; threshold += mask;
} }

30
sys/vm/vm_page.c
View File

@ -3472,12 +3472,11 @@ vm_page_is_valid(vm_page_t m, int base, int size)
} }
/* /*
* vm_page_ps_is_valid: * Returns true if all of the specified predicates are true for the entire
* * (super)page and false otherwise.
* Returns TRUE if the entire (super)page is valid and FALSE otherwise.
*/ */
boolean_t bool
vm_page_ps_is_valid(vm_page_t m) vm_page_ps_test(vm_page_t m, int flags, vm_page_t skip_m)
{ {
int i, npages; int i, npages;
@ -3490,10 +3489,25 @@ vm_page_ps_is_valid(vm_page_t m)
* occupy adjacent entries in vm_page_array[]. * occupy adjacent entries in vm_page_array[].
*/ */
for (i = 0; i < npages; i++) { for (i = 0; i < npages; i++) {
if (m[i].valid != VM_PAGE_BITS_ALL) if (&m[i] == skip_m)
return (FALSE); continue;
if ((flags & PS_NONE_BUSY) != 0 && vm_page_busied(&m[i]))
return (false);
if ((flags & PS_ALL_DIRTY) != 0) {
/*
* Calling vm_page_test_dirty() or pmap_is_modified()
* might stop this case from spuriously returning
* "false". However, that would require a write lock
* on the object containing "m[i]".
*/
if (m[i].dirty != VM_PAGE_BITS_ALL)
return (false);
} }
return (TRUE); if ((flags & PS_ALL_VALID) != 0 &&
m[i].valid != VM_PAGE_BITS_ALL)
return (false);
}
return (true);
} }
/* /*

14
sys/vm/vm_page.h
View File

@ -438,6 +438,18 @@ malloc2vm_flags(int malloc_flags)
} }
#endif #endif
/*
* Predicates supported by vm_page_ps_test():
*
* PS_ALL_DIRTY is true only if the entire (super)page is dirty.
* However, it can be spuriously false when the (super)page has become
* dirty in the pmap but that information has not been propagated to the
* machine-independent layer.
*/
#define PS_ALL_DIRTY 0x1
#define PS_ALL_VALID 0x2
#define PS_NONE_BUSY 0x4
void vm_page_busy_downgrade(vm_page_t m); void vm_page_busy_downgrade(vm_page_t m);
void vm_page_busy_sleep(vm_page_t m, const char *msg, bool nonshared); void vm_page_busy_sleep(vm_page_t m, const char *msg, bool nonshared);
void vm_page_flash(vm_page_t m); void vm_page_flash(vm_page_t m);
@ -469,7 +481,7 @@ vm_page_t vm_page_next(vm_page_t m);
int vm_page_pa_tryrelock(pmap_t, vm_paddr_t, vm_paddr_t *); int vm_page_pa_tryrelock(pmap_t, vm_paddr_t, vm_paddr_t *);
struct vm_pagequeue *vm_page_pagequeue(vm_page_t m); struct vm_pagequeue *vm_page_pagequeue(vm_page_t m);
vm_page_t vm_page_prev(vm_page_t m); vm_page_t vm_page_prev(vm_page_t m);
boolean_t vm_page_ps_is_valid(vm_page_t m); bool vm_page_ps_test(vm_page_t m, int flags, vm_page_t skip_m);
void vm_page_putfake(vm_page_t m); void vm_page_putfake(vm_page_t m);
void vm_page_readahead_finish(vm_page_t m); void vm_page_readahead_finish(vm_page_t m);
bool vm_page_reclaim_contig(int req, u_long npages, vm_paddr_t low, bool vm_page_reclaim_contig(int req, u_long npages, vm_paddr_t low,