Page MenuHomeFreeBSD
Files F145075265

D16427.id45792.diff
No OneTemporary
Actions

D16427.id45792.diff
View Options

Index: sys/arm64/arm64/pmap.c
===================================================================
--- sys/arm64/arm64/pmap.c
+++ sys/arm64/arm64/pmap.c
@@ -5074,76 +5074,45 @@
int
pmap_mincore(pmap_t pmap, vm_offset_t addr, vm_paddr_t *locked_pa)
{
- pd_entry_t *l1p, l1;
- pd_entry_t *l2p, l2;
- pt_entry_t *l3p, l3;
- vm_paddr_t pa;
+ pt_entry_t *pte, tpte;
+ vm_paddr_t mask, pa;
+ int lvl, val;
bool managed;
- int val;
PMAP_LOCK(pmap);
retry:
- pa = 0;
val = 0;
- managed = false;
-
- l1p = pmap_l1(pmap, addr);
- if (l1p == NULL) /* No l1 */
- goto done;
-
- l1 = pmap_load(l1p);
- if ((l1 & ATTR_DESCR_MASK) == L1_INVAL)
- goto done;
-
- if ((l1 & ATTR_DESCR_MASK) == L1_BLOCK) {
- pa = (l1 & ~ATTR_MASK) | (addr & L1_OFFSET);
- managed = (l1 & ATTR_SW_MANAGED) == ATTR_SW_MANAGED;
- val = MINCORE_SUPER | MINCORE_INCORE;
- if (pmap_page_dirty(l1))
- val |= MINCORE_MODIFIED | MINCORE_MODIFIED_OTHER;
- if ((l1 & ATTR_AF) == ATTR_AF)
- val |= MINCORE_REFERENCED | MINCORE_REFERENCED_OTHER;
- goto done;
- }
-
- l2p = pmap_l1_to_l2(l1p, addr);
- if (l2p == NULL) /* No l2 */
- goto done;
-
- l2 = pmap_load(l2p);
- if ((l2 & ATTR_DESCR_MASK) == L2_INVAL)
- goto done;
-
- if ((l2 & ATTR_DESCR_MASK) == L2_BLOCK) {
- pa = (l2 & ~ATTR_MASK) | (addr & L2_OFFSET);
- managed = (l2 & ATTR_SW_MANAGED) == ATTR_SW_MANAGED;
- val = MINCORE_SUPER | MINCORE_INCORE;
- if (pmap_page_dirty(l2))
- val |= MINCORE_MODIFIED | MINCORE_MODIFIED_OTHER;
- if ((l2 & ATTR_AF) == ATTR_AF)
- val |= MINCORE_REFERENCED | MINCORE_REFERENCED_OTHER;
- goto done;
- }
-
- l3p = pmap_l2_to_l3(l2p, addr);
- if (l3p == NULL) /* No l3 */
- goto done;
+ pte = pmap_pte(pmap, addr, &lvl);
+ if (pte != NULL) {
+ tpte = pmap_load(pte);
- l3 = pmap_load(l2p);
- if ((l3 & ATTR_DESCR_MASK) == L3_INVAL)
- goto done;
+ switch (lvl) {
+ case 3:
+ mask = L3_OFFSET;
+ break;
+ case 2:
+ mask = L2_OFFSET;
+ break;
+ case 1:
+ mask = L1_OFFSET;
+ break;
+ default:
+ panic("pmap_mincore: invalid level %d", lvl);
+ }
- if ((l3 & ATTR_DESCR_MASK) == L3_PAGE) {
- pa = (l3 & ~ATTR_MASK) | (addr & L3_OFFSET);
- managed = (l3 & ATTR_SW_MANAGED) == ATTR_SW_MANAGED;
val = MINCORE_INCORE;
- if (pmap_page_dirty(l3))
+ if (lvl != 3)
+ val |= MINCORE_SUPER;
+ if (pmap_page_dirty(tpte))
val |= MINCORE_MODIFIED | MINCORE_MODIFIED_OTHER;
- if ((l3 & ATTR_AF) == ATTR_AF)
+ if ((tpte & ATTR_AF) == ATTR_AF)
val |= MINCORE_REFERENCED | MINCORE_REFERENCED_OTHER;
- }
-done:
+ managed = (tpte & ATTR_SW_MANAGED) == ATTR_SW_MANAGED;
+ pa = (tpte & ~ATTR_MASK) | (addr & mask);
+ } else
+ managed = false;
+
if ((val & (MINCORE_MODIFIED_OTHER | MINCORE_REFERENCED_OTHER)) !=
(MINCORE_MODIFIED_OTHER | MINCORE_REFERENCED_OTHER) && managed) {
/* Ensure that "PHYS_TO_VM_PAGE(pa)->object" doesn't change. */

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 16, 4:58 PM (19 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28784178
Default Alt Text
D16427.id45792.diff (2 KB)

Event Timeline