system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

vm_phys: Add a vm_phys_seg_paddr_to_vm_page() helper

Browse source 
No functional change intended.

Suggested by:	alc
Reviewed by:	dougm, alc, kib
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D43636
This commit is contained in:
Mark Johnston 2024-06-13 20:11:36 -04:00
parent d7ec4a8859
commit 69cbb18746
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/vm/vm_page.c
View file

@ -782,7 +782,7 @@ vm_page_startup(vm_offset_t vaddr)
if (pagecount == 0) if (pagecount == 0)
continue; continue;
m = seg->first_page + atop(startp - seg->start); m = vm_phys_seg_paddr_to_vm_page(seg, startp);
vmd = VM_DOMAIN(seg->domain); vmd = VM_DOMAIN(seg->domain);
vm_domain_free_lock(vmd); vm_domain_free_lock(vmd);
vm_phys_enqueue_contig(m, pagecount); vm_phys_enqueue_contig(m, pagecount);

29
sys/vm/vm_phys.c
View file

@ -932,6 +932,19 @@ vm_phys_alloc_freelist_pages(int domain, int freelist, int pool, int order)
return (NULL); return (NULL);
} }
/*
* Find the vm_page corresponding to the given physical address, which must lie
* within the given physical memory segment.
*/
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__, (uintmax_t)pa));
return (&seg->first_page[atop(pa - seg->start)]);
}
/* /*
* Find the vm_page corresponding to the given physical address. * Find the vm_page corresponding to the given physical address.
*/ */
@ -941,7 +954,7 @@ vm_phys_paddr_to_vm_page(vm_paddr_t pa)
struct vm_phys_seg *seg; struct vm_phys_seg *seg;
if ((seg = vm_phys_paddr_to_seg(pa)) != NULL) 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); return (NULL);
} }
@ -1157,7 +1170,7 @@ vm_phys_free_pages(vm_page_t m, int order)
pa ^= ((vm_paddr_t)1 << (PAGE_SHIFT + order)); pa ^= ((vm_paddr_t)1 << (PAGE_SHIFT + order));
if (pa < seg->start || pa >= seg->end) if (pa < seg->start || pa >= seg->end)
break; 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) if (m_buddy->order != order)
break; break;
fl = (*seg->free_queues)[m_buddy->pool]; fl = (*seg->free_queues)[m_buddy->pool];
@ -1166,7 +1179,7 @@ vm_phys_free_pages(vm_page_t m, int order)
vm_phys_set_pool(m->pool, m_buddy, order); vm_phys_set_pool(m->pool, m_buddy, order);
order++; order++;
pa &= ~(((vm_paddr_t)1 << (PAGE_SHIFT + order)) - 1); 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); } while (order < VM_NFREEORDER - 1);
} }
fl = (*seg->free_queues)[m->pool]; fl = (*seg->free_queues)[m->pool];
@ -1278,8 +1291,8 @@ vm_phys_find_range(vm_page_t bounds[], int segind, int domain,
pa_end = MIN(high, seg->end); pa_end = MIN(high, seg->end);
if (pa_end - pa_start < ptoa(npages)) if (pa_end - pa_start < ptoa(npages))
continue; continue;
bounds[0] = &seg->first_page[atop(pa_start - seg->start)]; bounds[0] = vm_phys_seg_paddr_to_vm_page(seg, pa_start);
bounds[1] = &seg->first_page[atop(pa_end - seg->start)]; bounds[1] = vm_phys_seg_paddr_to_vm_page(seg, pa_end);
return (seg - vm_phys_segs); return (seg - vm_phys_segs);
} }
return (-1); return (-1);
@ -1313,7 +1326,7 @@ vm_phys_unfree_page(vm_page_t m)
order++; order++;
pa = m->phys_addr & (~(vm_paddr_t)0 << (PAGE_SHIFT + order)); pa = m->phys_addr & (~(vm_paddr_t)0 << (PAGE_SHIFT + order));
if (pa >= seg->start) 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 else
return (false); return (false);
} }
@ -1338,10 +1351,10 @@ vm_phys_unfree_page(vm_page_t m)
order--; order--;
pa_half = m_set->phys_addr ^ (1 << (PAGE_SHIFT + order)); pa_half = m_set->phys_addr ^ (1 << (PAGE_SHIFT + order));
if (m->phys_addr < pa_half) 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 { else {
m_tmp = m_set; 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); vm_freelist_add(fl, m_tmp, order, 0);
} }

1
sys/vm/vm_phys.h
View file

@ -77,6 +77,7 @@ void vm_phys_free_contig(vm_page_t m, u_long npages);
void vm_phys_free_pages(vm_page_t m, int order); void vm_phys_free_pages(vm_page_t m, int order);
void vm_phys_init(void); void vm_phys_init(void);
vm_page_t vm_phys_paddr_to_vm_page(vm_paddr_t pa); vm_page_t vm_phys_paddr_to_vm_page(vm_paddr_t pa);
vm_page_t vm_phys_seg_paddr_to_vm_page(struct vm_phys_seg *seg, vm_paddr_t pa);
void vm_phys_register_domains(int ndomains, struct mem_affinity *affinity, void vm_phys_register_domains(int ndomains, struct mem_affinity *affinity,
int *locality); int *locality);
bool vm_phys_unfree_page(vm_page_t m); bool vm_phys_unfree_page(vm_page_t m);