patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

demand_paging: eviction/nru: fix incorrect dirty bit return val

Browse source 
In k_mem_paging_eviction_select(), the returned dirty bit value
may not be actually associated with the page selected, but
rather the last page examined. So fix this.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2021-09-17 09:55:12 -07:00 committed by Christopher Friedt
parent a1a6619056
commit c1e81855bc
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subsys/demand_paging/eviction/nru.c
View file

@ -45,6 +45,7 @@ struct z_page_frame *k_mem_paging_eviction_select(bool *dirty_ptr)
unsigned int last_prec = 4U; unsigned int last_prec = 4U;
struct z_page_frame *last_pf = NULL, *pf; struct z_page_frame *last_pf = NULL, *pf;
bool accessed; bool accessed;
bool last_dirty = false;
bool dirty = false; bool dirty = false;
uintptr_t flags, phys; uintptr_t flags, phys;
@ -71,18 +72,20 @@ struct z_page_frame *k_mem_paging_eviction_select(bool *dirty_ptr)
if (prec == 0) { if (prec == 0) {
/* If we find a not accessed, clean page we're done */ /* If we find a not accessed, clean page we're done */
last_pf = pf; last_pf = pf;
last_dirty = dirty;
break; break;
} }
if (prec < last_prec) { if (prec < last_prec) {
last_prec = prec; last_prec = prec;
last_pf = pf; last_pf = pf;
last_dirty = dirty;
} }
} }
/* Shouldn't ever happen unless every page is pinned */ /* Shouldn't ever happen unless every page is pinned */
__ASSERT(last_pf != NULL, "no page to evict"); __ASSERT(last_pf != NULL, "no page to evict");
*dirty_ptr = dirty; *dirty_ptr = last_dirty;
return last_pf; return last_pf;
} }