Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177612617
D43636.1794837290.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None
D43636.1794837290.diff
View Options
diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c
--- a/sys/vm/vm_phys.c
+++ b/sys/vm/vm_phys.c
@@ -933,6 +933,19 @@
return (NULL);
}
+/*
+ * Find the vm_page corresponding to the given physical address, which must lie
+ * within the given physical memory segment.
+ */
+static vm_page_t
+vm_phys_seg_paddr_to_vm_page(struct vm_phys_seg *seg, vm_paddr_t pa)
+{
+ KASSERT(pa >= seg->start && pa < seg->end,
+ ("%s: pa %#jx is out of range", __func__, pa));
+
+ return (&seg->first_page[atop(pa - seg->start)]);
+}
+
/*
* Find the vm_page corresponding to the given physical address.
*/
@@ -942,7 +955,7 @@
struct vm_phys_seg *seg;
if ((seg = vm_phys_paddr_to_seg(pa)) != NULL)
- return (&seg->first_page[atop(pa - seg->start)]);
+ return (vm_phys_seg_paddr_to_vm_page(seg, pa));
return (NULL);
}
@@ -1158,7 +1171,7 @@
pa ^= ((vm_paddr_t)1 << (PAGE_SHIFT + order));
if (pa < seg->start || pa >= seg->end)
break;
- m_buddy = &seg->first_page[atop(pa - seg->start)];
+ m_buddy = vm_phys_seg_paddr_to_vm_page(seg, pa);
if (m_buddy->order != order)
break;
fl = (*seg->free_queues)[m_buddy->pool];
@@ -1167,7 +1180,7 @@
vm_phys_set_pool(m->pool, m_buddy, order);
order++;
pa &= ~(((vm_paddr_t)1 << (PAGE_SHIFT + order)) - 1);
- m = &seg->first_page[atop(pa - seg->start)];
+ m = vm_phys_seg_paddr_to_vm_page(seg, pa);
} while (order < VM_NFREEORDER - 1);
}
fl = (*seg->free_queues)[m->pool];
@@ -1279,8 +1292,8 @@
pa_end = MIN(high, seg->end);
if (pa_end - pa_start < ptoa(npages))
continue;
- bounds[0] = &seg->first_page[atop(pa_start - seg->start)];
- bounds[1] = &seg->first_page[atop(pa_end - seg->start)];
+ bounds[0] = vm_phys_seg_paddr_to_vm_page(seg, pa_start);
+ bounds[1] = vm_phys_seg_paddr_to_vm_page(seg, pa_end);
return (seg - vm_phys_segs);
}
return (-1);
@@ -1314,7 +1327,7 @@
order++;
pa = m->phys_addr & (~(vm_paddr_t)0 << (PAGE_SHIFT + order));
if (pa >= seg->start)
- m_set = &seg->first_page[atop(pa - seg->start)];
+ m_set = vm_phys_seg_paddr_to_vm_page(seg, pa);
else
return (false);
}
@@ -1339,10 +1352,10 @@
order--;
pa_half = m_set->phys_addr ^ (1 << (PAGE_SHIFT + order));
if (m->phys_addr < pa_half)
- m_tmp = &seg->first_page[atop(pa_half - seg->start)];
+ m_tmp = vm_phys_seg_paddr_to_vm_page(seg, pa_half);
else {
m_tmp = m_set;
- m_set = &seg->first_page[atop(pa_half - seg->start)];
+ m_set = vm_phys_seg_paddr_to_vm_page(seg, pa_half);
}
vm_freelist_add(fl, m_tmp, order, 0);
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 16, 1:54 PM (9 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41780755
Default Alt Text
D43636.1794837290.diff (2 KB)
Attached To
Mode
D43636: vm_phys: Add a vm_phys_seg_paddr_to_vm_page() helper
Attached
Detach File
Event Timeline