Page MenuHomeFreeBSD
Differential D31038

rtld/tests: Avoid function name conflict with libc opendir()
ClosedPublic
Actions

Authored by arichardson on Jul 5 2021, 8:40 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 12, 8:41 PM
Unknown Object (File)
Mar 16 2025, 10:27 PM
Unknown Object (File)
Feb 24 2025, 9:57 AM
Unknown Object (File)
Feb 23 2025, 7:14 PM
Unknown Object (File)
Feb 20 2025, 2:09 PM
Unknown Object (File)
Feb 13 2025, 9:05 PM
Unknown Object (File)
Feb 12 2025, 9:44 PM
Unknown Object (File)
Jan 29 2025, 3:05 AM
View All 62 Files
Subscribers
bdragon
imp

Details

Reviewers
oshogbo
kib
markj
Commits
rGe34c713b0e66: rtld/tests: Avoid function name conflict with libc opendir()
Summary

This prevents these tests from being compiled with ASAN since the asan
interceptors also define opendir() but matching the libc function.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

arichardson created this revision.Jul 5 2021, 8:40 AM
Herald added subscribers: bdragon, imp. · View Herald TranscriptJul 5 2021, 8:40 AM
arichardson requested review of this revision.Jul 5 2021, 8:40 AM
Harbormaster completed remote builds in B40285: Diff 91758.Jul 5 2021, 8:40 AM
kib accepted this revision.Jul 5 2021, 8:59 AM
This revision is now accepted and ready to land.Jul 5 2021, 8:59 AM
oshogbo accepted this revision.Jul 5 2021, 9:33 AM

We have fdopendir in libc I wonder if this won't be confusing. Maybe we should rename this to something like rtld_opendir.
But whatever name your choose this LGTM.

markj accepted this revision.Jul 5 2021, 11:46 AM
Closed by commit rGe34c713b0e66: rtld/tests: Avoid function name conflict with libc opendir() (authored by arichardson). · Explain WhyJul 6 2021, 10:07 AM
This revision was automatically updated to reflect the committed changes.
arichardson added a commit: rGe34c713b0e66: rtld/tests: Avoid function name conflict with libc opendir().

Revision Contents
Changeset List

PathSize
libexec/
rtld-elf/
tests/
2 lines
2 lines
4 lines
2 lines

Diff 91868

View Options

libexec/rtld-elf/tests/common.h

Show First 20 Lines • Show All 480 Lines • ▼ Show 20 Lines
* Swap bitmap functions * Swap bitmap functions
*/ */
static void swp_pager_freeswapspace(const struct page_range *range); static void swp_pager_freeswapspace(const struct page_range *range);
static daddr_t swp_pager_getswapspace(int *npages); static daddr_t swp_pager_getswapspace(int *npages);
/* /*
* Metadata functions * Metadata functions
*/ */
static daddr_t swp_pager_meta_build(vm_object_t, vm_pindex_t, daddr_t); static daddr_t swp_pager_meta_build(vm_object_t, vm_pindex_t, daddr_t,
bool);
static void swp_pager_meta_free(vm_object_t, vm_pindex_t, vm_pindex_t, static void swp_pager_meta_free(vm_object_t, vm_pindex_t, vm_pindex_t,
vm_size_t *); vm_size_t *);
static void swp_pager_meta_transfer(vm_object_t src, vm_object_t dst, static void swp_pager_meta_transfer(vm_object_t src, vm_object_t dst,
vm_pindex_t pindex, vm_pindex_t count, vm_size_t *freed); vm_pindex_t pindex, vm_pindex_t count, vm_size_t *freed);
static void swp_pager_meta_free_all(vm_object_t); static void swp_pager_meta_free_all(vm_object_t);
static daddr_t swp_pager_meta_lookup(vm_object_t, vm_pindex_t); static daddr_t swp_pager_meta_lookup(vm_object_t, vm_pindex_t);
static void static void
▲ Show 20 Lines • Show All 528 Lines • ▼ Show 20 Lines for (i = 0; i < size; i += n) {
blk = swp_pager_getswapspace(&n); blk = swp_pager_getswapspace(&n);
if (blk == SWAPBLK_NONE) { if (blk == SWAPBLK_NONE) {
swp_pager_meta_free(object, start, i, NULL); swp_pager_meta_free(object, start, i, NULL);
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
return (-1); return (-1);
} }
for (j = 0; j < n; ++j) { for (j = 0; j < n; ++j) {
addr = swp_pager_meta_build(object, addr = swp_pager_meta_build(object,
start + i + j, blk + j); start + i + j, blk + j, false);
if (addr != SWAPBLK_NONE) if (addr != SWAPBLK_NONE)
swp_pager_update_freerange(&range, addr); swp_pager_update_freerange(&range, addr);
} }
} }
swp_pager_freeswapspace(&range); swp_pager_freeswapspace(&range);
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
return (0); return (0);
} }
static bool
swp_pager_xfer_source(vm_object_t srcobject, vm_object_t dstobject,
vm_pindex_t pindex, daddr_t addr)
{
daddr_t dstaddr __diagused;
KASSERT((srcobject->flags & OBJ_SWAP) != 0,
("%s: srcobject not swappable", __func__));
KASSERT((dstobject->flags & OBJ_SWAP) != 0,
("%s: dstobject not swappable", __func__));
if (swp_pager_meta_lookup(dstobject, pindex) != SWAPBLK_NONE) {
/* Caller should destroy the source block. */
return (false);
}
/* /*
* Destination has no swapblk and is not resident, transfer source.
* swp_pager_meta_build() can sleep.
*/
VM_OBJECT_WUNLOCK(srcobject);
dstaddr = swp_pager_meta_build(dstobject, pindex, addr);
KASSERT(dstaddr == SWAPBLK_NONE,
("Unexpected destination swapblk"));
VM_OBJECT_WLOCK(srcobject);
return (true);
}
/*
* SWAP_PAGER_COPY() - copy blocks from source pager to destination pager * SWAP_PAGER_COPY() - copy blocks from source pager to destination pager
* and destroy the source. * and destroy the source.
* *
* Copy any valid swapblks from the source to the destination. In * Copy any valid swapblks from the source to the destination. In
* cases where both the source and destination have a valid swapblk, * cases where both the source and destination have a valid swapblk,
* we keep the destination's. * we keep the destination's.
* *
* This routine is allowed to sleep. It may sleep allocating metadata * This routine is allowed to sleep. It may sleep allocating metadata
▲ Show 20 Lines • Show All 461 Lines • ▼ Show 20 Lines if (blk == SWAPBLK_NONE) {
rtvals[i + j] = VM_PAGER_FAIL; rtvals[i + j] = VM_PAGER_FAIL;
continue; continue;
} }
VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(object);
for (j = 0; j < n; ++j) { for (j = 0; j < n; ++j) {
mreq = ma[i + j]; mreq = ma[i + j];
vm_page_aflag_clear(mreq, PGA_SWAP_FREE); vm_page_aflag_clear(mreq, PGA_SWAP_FREE);
addr = swp_pager_meta_build(mreq->object, mreq->pindex, addr = swp_pager_meta_build(mreq->object, mreq->pindex,
blk + j); blk + j, false);
if (addr != SWAPBLK_NONE) if (addr != SWAPBLK_NONE)
swp_pager_update_freerange(&range, addr); swp_pager_update_freerange(&range, addr);
MPASS(mreq->dirty == VM_PAGE_BITS_ALL); MPASS(mreq->dirty == VM_PAGE_BITS_ALL);
mreq->oflags |= VPO_SWAPINPROG; mreq->oflags |= VPO_SWAPINPROG;
} }
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
bp = uma_zalloc(swwbuf_zone, M_WAITOK); bp = uma_zalloc(swwbuf_zone, M_WAITOK);
▲ Show 20 Lines • Show All 487 Lines • ▼ Show 20 Lines
swp_pager_free_empty_swblk(vm_object_t object, struct swblk *sb) swp_pager_free_empty_swblk(vm_object_t object, struct swblk *sb)
{ {
if (swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) { if (swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) {
SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p); SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p);
uma_zfree(swblk_zone, sb); uma_zfree(swblk_zone, sb);
} }
} }
/* /*
* SWP_PAGER_META_BUILD() - add swap block to swap meta data for object * SWP_PAGER_META_BUILD() - add swap block to swap meta data for object
* *
* The specified swapblk is added to the object's swap metadata. If * Try to add the specified swapblk to the object's swap metadata. If
* the swapblk is not valid, it is freed instead. Any previously * nowait and memory allocation fails, return the specified swapblk
* assigned swapblk is returned. * immediately to indicate failure. If nowait, add the specified swapblk
* only if there is no previously assigned swapblk. Return the previously
* assigned swapblk, if any.
*/ */
alcUnsubmitted
Done
Inline Actions

This sentence should still be included: "If the swapblk is not valid, it is freed instead."

alc: This sentence should still be included: "If the swapblk is not valid, it is freed instead."
static daddr_t static daddr_t
alcUnsubmitted
Not Done
Inline Actions
* swapblk immediately to indicate failure; otherwise, wait and retry until
- * memory allocation succeeds.. Return the previously assigned swapblk, if
+ * memory allocation succeeds. Return the previously assigned swapblk, if
* any.

There is an extra period.

alc: There is an extra period.
swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk) swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk,
bool nowait)
alcUnsubmitted
Done
Inline Actions

"nowait" doesn't fully convey the effect. I would include "xfer" or "transfer" in the parameter name.

alc: "nowait" doesn't fully convey the effect. I would include "xfer" or "transfer" in the…
{ {
static volatile int swblk_zone_exhausted, swpctrie_zone_exhausted; static volatile int swblk_zone_exhausted, swpctrie_zone_exhausted;
struct swblk *sb, *sb1; struct swblk *sb, *sb1;
vm_pindex_t modpi, rdpi; vm_pindex_t modpi, rdpi;
daddr_t prev_swapblk; daddr_t prev_swapblk;
int error, i; int i;
VM_OBJECT_ASSERT_WLOCKED(object); VM_OBJECT_ASSERT_WLOCKED(object);
rdpi = rounddown(pindex, SWAP_META_PAGES); rdpi = rounddown(pindex, SWAP_META_PAGES);
sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi); sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi);
if (sb == NULL) { if (sb != NULL)
goto allocated;
if (swapblk == SWAPBLK_NONE) if (swapblk == SWAPBLK_NONE)
return (SWAPBLK_NONE); return (SWAPBLK_NONE);
for (;;) { while ((sb = uma_zalloc(swblk_zone,
sb = uma_zalloc(swblk_zone, M_NOWAIT | (curproc == M_NOWAIT | (curproc == pageproc ? M_USE_RESERVE : 0))) == NULL) {
pageproc ? M_USE_RESERVE : 0)); if (nowait)
if (sb != NULL) { return (swapblk);
sb->p = rdpi;
for (i = 0; i < SWAP_META_PAGES; i++)
sb->d[i] = SWAPBLK_NONE;
if (atomic_cmpset_int(&swblk_zone_exhausted,
1, 0))
printf("swblk zone ok\n");
break;
}
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
if (uma_zone_exhausted(swblk_zone)) { if (uma_zone_exhausted(swblk_zone)) {
if (atomic_cmpset_int(&swblk_zone_exhausted, if (atomic_cmpset_int(&swblk_zone_exhausted, 0, 1))
0, 1))
printf("swap blk zone exhausted, " printf("swap blk zone exhausted, "
"increase kern.maxswzone\n"); "increase kern.maxswzone\n");
vm_pageout_oom(VM_OOM_SWAPZ); vm_pageout_oom(VM_OOM_SWAPZ);
pause("swzonxb", 10); pause("swzonxb", 10);
} else } else
uma_zwait(swblk_zone); uma_zwait(swblk_zone);
VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(object);
sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi);
rdpi);
if (sb != NULL) if (sb != NULL)
/* /*
* Somebody swapped out a nearby page, * Somebody swapped out a nearby page, allocating swblk
* allocating swblk at the rdpi index, * at the rdpi index, while we dropped the object lock.
* while we dropped the object lock.
*/ */
goto allocated; goto allocated;
} }
for (;;) { sb->p = rdpi;
error = SWAP_PCTRIE_INSERT( for (i = 0; i < SWAP_META_PAGES; i++)
&object->un_pager.swp.swp_blks, sb); sb->d[i] = SWAPBLK_NONE;
if (error == 0) { if (atomic_cmpset_int(&swblk_zone_exhausted, 1, 0))
if (atomic_cmpset_int(&swpctrie_zone_exhausted, printf("swblk zone ok\n");
1, 0)) while (SWAP_PCTRIE_INSERT(&object->un_pager.swp.swp_blks, sb) != 0) {
printf("swpctrie zone ok\n"); if (nowait) {
break; uma_zfree(swblk_zone, sb);
return (swapblk);
} }
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
if (uma_zone_exhausted(swpctrie_zone)) { if (uma_zone_exhausted(swpctrie_zone)) {
if (atomic_cmpset_int(&swpctrie_zone_exhausted, if (atomic_cmpset_int(&swpctrie_zone_exhausted, 0, 1))
0, 1))
printf("swap pctrie zone exhausted, " printf("swap pctrie zone exhausted, "
"increase kern.maxswzone\n"); "increase kern.maxswzone\n");
vm_pageout_oom(VM_OOM_SWAPZ); vm_pageout_oom(VM_OOM_SWAPZ);
pause("swzonxp", 10); pause("swzonxp", 10);
} else } else
uma_zwait(swpctrie_zone); uma_zwait(swpctrie_zone);
VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(object);
sb1 = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, sb1 = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi);
rdpi);
if (sb1 != NULL) { if (sb1 != NULL) {
uma_zfree(swblk_zone, sb); uma_zfree(swblk_zone, sb);
sb = sb1; sb = sb1;
goto allocated; goto allocated;
} }
} }
} if (atomic_cmpset_int(&swpctrie_zone_exhausted, 1, 0))
printf("swpctrie zone ok\n");
allocated: allocated:
MPASS(sb->p == rdpi); MPASS(sb->p == rdpi);
modpi = pindex % SWAP_META_PAGES; modpi = pindex % SWAP_META_PAGES;
/* Return prior contents of metadata. */ /* Return prior contents of metadata. */
prev_swapblk = sb->d[modpi]; prev_swapblk = sb->d[modpi];
if (!nowait || prev_swapblk == SWAPBLK_NONE) {
/* Enter block into metadata. */ /* Enter block into metadata. */
sb->d[modpi] = swapblk; sb->d[modpi] = swapblk;
/* /*
* Free the swblk if we end up with the empty page run. * Free the swblk if we end up with the empty page run.
*/ */
if (swapblk == SWAPBLK_NONE) if (swapblk == SWAPBLK_NONE)
swp_pager_free_empty_swblk(object, sb); swp_pager_free_empty_swblk(object, sb);
}
return (prev_swapblk); return (prev_swapblk);
} }
/* /*
* SWP_PAGER_META_TRANSFER() - free a range of blocks in the srcobject's swap * SWP_PAGER_META_TRANSFER() - free a range of blocks in the srcobject's swap
* metadata, or transfer it into dstobject. * metadata, or transfer it into dstobject.
* *
* This routine will free swap metadata structures as they are cleaned * This routine will free swap metadata structures as they are cleaned
* out. * out.
*/ */
static void static void
swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject,
vm_pindex_t pindex, vm_pindex_t count, vm_size_t *moved) vm_pindex_t pindex, vm_pindex_t count, vm_size_t *moved)
{ {
struct page_range range; struct page_range range;
struct swblk *sb; struct swblk *sb;
daddr_t blk;
vm_page_t m; vm_page_t m;
vm_pindex_t offset, last; vm_pindex_t offset, last;
vm_size_t mc; vm_size_t mc;
int i, limit, start; int i, limit, start;
VM_OBJECT_ASSERT_WLOCKED(srcobject); VM_OBJECT_ASSERT_WLOCKED(srcobject);
MPASS(moved == NULL || dstobject == NULL); MPASS(moved == NULL || dstobject == NULL);
Show All 9 Lines for (;;) {
sb = SWAP_PCTRIE_LOOKUP_GE(&srcobject->un_pager.swp.swp_blks, sb = SWAP_PCTRIE_LOOKUP_GE(&srcobject->un_pager.swp.swp_blks,
rounddown(pindex, SWAP_META_PAGES)); rounddown(pindex, SWAP_META_PAGES));
if (sb == NULL || sb->p >= last) if (sb == NULL || sb->p >= last)
break; break;
start = pindex > sb->p ? pindex - sb->p : 0; start = pindex > sb->p ? pindex - sb->p : 0;
limit = last - sb->p < SWAP_META_PAGES ? last - sb->p : limit = last - sb->p < SWAP_META_PAGES ? last - sb->p :
SWAP_META_PAGES; SWAP_META_PAGES;
for (i = start; i < limit; i++) { for (i = start; i < limit; i++) {
if (sb->d[i] == SWAPBLK_NONE) blk = sb->d[i];
if (blk == SWAPBLK_NONE)
continue; continue;
if (dstobject == NULL || if (dstobject == NULL ||
!swp_pager_xfer_source(srcobject, dstobject, (blk = swp_pager_meta_build(dstobject,
sb->p + i - offset, sb->d[i])) { sb->p + i - offset, blk, true),
blk != sb->d[i] && blk != SWAPBLK_NONE))
swp_pager_update_freerange(&range, sb->d[i]); swp_pager_update_freerange(&range, sb->d[i]);
else if (blk == sb->d[i]) {
/*
* Destination has no swapblk and is not
* resident, so transfer source.
* swp_pager_meta_build() failed memory
* allocation already, likely to sleep in retry.
*/
VM_OBJECT_WUNLOCK(srcobject);
swp_pager_meta_build(dstobject,
sb->p + i - offset, blk, false);
VM_OBJECT_WLOCK(srcobject);
} }
if (moved != NULL) { if (moved != NULL) {
if (m != NULL && m->pindex != pindex + i - 1) if (m != NULL && m->pindex != pindex + i - 1)
m = NULL; m = NULL;
m = m != NULL ? vm_page_next(m) : m = m != NULL ? vm_page_next(m) :
vm_page_lookup(srcobject, pindex + i); vm_page_lookup(srcobject, pindex + i);
if (m == NULL || vm_page_none_valid(m)) if (m == NULL || vm_page_none_valid(m))
mc++; mc++;
▲ Show 20 Lines • Show All 989 Lines • Show Last 20 Lines
View Options

libexec/rtld-elf/tests/common.c

Show First 20 Lines • Show All 480 Lines • ▼ Show 20 Lines
* Swap bitmap functions * Swap bitmap functions
*/ */
static void swp_pager_freeswapspace(const struct page_range *range); static void swp_pager_freeswapspace(const struct page_range *range);
static daddr_t swp_pager_getswapspace(int *npages); static daddr_t swp_pager_getswapspace(int *npages);
/* /*
* Metadata functions * Metadata functions
*/ */
static daddr_t swp_pager_meta_build(vm_object_t, vm_pindex_t, daddr_t); static daddr_t swp_pager_meta_build(vm_object_t, vm_pindex_t, daddr_t,
bool);
static void swp_pager_meta_free(vm_object_t, vm_pindex_t, vm_pindex_t, static void swp_pager_meta_free(vm_object_t, vm_pindex_t, vm_pindex_t,
vm_size_t *); vm_size_t *);
static void swp_pager_meta_transfer(vm_object_t src, vm_object_t dst, static void swp_pager_meta_transfer(vm_object_t src, vm_object_t dst,
vm_pindex_t pindex, vm_pindex_t count, vm_size_t *freed); vm_pindex_t pindex, vm_pindex_t count, vm_size_t *freed);
static void swp_pager_meta_free_all(vm_object_t); static void swp_pager_meta_free_all(vm_object_t);
static daddr_t swp_pager_meta_lookup(vm_object_t, vm_pindex_t); static daddr_t swp_pager_meta_lookup(vm_object_t, vm_pindex_t);
static void static void
▲ Show 20 Lines • Show All 528 Lines • ▼ Show 20 Lines for (i = 0; i < size; i += n) {
blk = swp_pager_getswapspace(&n); blk = swp_pager_getswapspace(&n);
if (blk == SWAPBLK_NONE) { if (blk == SWAPBLK_NONE) {
swp_pager_meta_free(object, start, i, NULL); swp_pager_meta_free(object, start, i, NULL);
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
return (-1); return (-1);
} }
for (j = 0; j < n; ++j) { for (j = 0; j < n; ++j) {
addr = swp_pager_meta_build(object, addr = swp_pager_meta_build(object,
start + i + j, blk + j); start + i + j, blk + j, false);
if (addr != SWAPBLK_NONE) if (addr != SWAPBLK_NONE)
swp_pager_update_freerange(&range, addr); swp_pager_update_freerange(&range, addr);
} }
} }
swp_pager_freeswapspace(&range); swp_pager_freeswapspace(&range);
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
return (0); return (0);
} }
static bool
swp_pager_xfer_source(vm_object_t srcobject, vm_object_t dstobject,
vm_pindex_t pindex, daddr_t addr)
{
daddr_t dstaddr __diagused;
KASSERT((srcobject->flags & OBJ_SWAP) != 0,
("%s: srcobject not swappable", __func__));
KASSERT((dstobject->flags & OBJ_SWAP) != 0,
("%s: dstobject not swappable", __func__));
if (swp_pager_meta_lookup(dstobject, pindex) != SWAPBLK_NONE) {
/* Caller should destroy the source block. */
return (false);
}
/* /*
* Destination has no swapblk and is not resident, transfer source.
* swp_pager_meta_build() can sleep.
*/
VM_OBJECT_WUNLOCK(srcobject);
dstaddr = swp_pager_meta_build(dstobject, pindex, addr);
KASSERT(dstaddr == SWAPBLK_NONE,
("Unexpected destination swapblk"));
VM_OBJECT_WLOCK(srcobject);
return (true);
}
/*
* SWAP_PAGER_COPY() - copy blocks from source pager to destination pager * SWAP_PAGER_COPY() - copy blocks from source pager to destination pager
* and destroy the source. * and destroy the source.
* *
* Copy any valid swapblks from the source to the destination. In * Copy any valid swapblks from the source to the destination. In
* cases where both the source and destination have a valid swapblk, * cases where both the source and destination have a valid swapblk,
* we keep the destination's. * we keep the destination's.
* *
* This routine is allowed to sleep. It may sleep allocating metadata * This routine is allowed to sleep. It may sleep allocating metadata
▲ Show 20 Lines • Show All 461 Lines • ▼ Show 20 Lines if (blk == SWAPBLK_NONE) {
rtvals[i + j] = VM_PAGER_FAIL; rtvals[i + j] = VM_PAGER_FAIL;
continue; continue;
} }
VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(object);
for (j = 0; j < n; ++j) { for (j = 0; j < n; ++j) {
mreq = ma[i + j]; mreq = ma[i + j];
vm_page_aflag_clear(mreq, PGA_SWAP_FREE); vm_page_aflag_clear(mreq, PGA_SWAP_FREE);
addr = swp_pager_meta_build(mreq->object, mreq->pindex, addr = swp_pager_meta_build(mreq->object, mreq->pindex,
blk + j); blk + j, false);
if (addr != SWAPBLK_NONE) if (addr != SWAPBLK_NONE)
swp_pager_update_freerange(&range, addr); swp_pager_update_freerange(&range, addr);
MPASS(mreq->dirty == VM_PAGE_BITS_ALL); MPASS(mreq->dirty == VM_PAGE_BITS_ALL);
mreq->oflags |= VPO_SWAPINPROG; mreq->oflags |= VPO_SWAPINPROG;
} }
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
bp = uma_zalloc(swwbuf_zone, M_WAITOK); bp = uma_zalloc(swwbuf_zone, M_WAITOK);
▲ Show 20 Lines • Show All 487 Lines • ▼ Show 20 Lines
swp_pager_free_empty_swblk(vm_object_t object, struct swblk *sb) swp_pager_free_empty_swblk(vm_object_t object, struct swblk *sb)
{ {
if (swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) { if (swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) {
SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p); SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p);
uma_zfree(swblk_zone, sb); uma_zfree(swblk_zone, sb);
} }
} }
/* /*
* SWP_PAGER_META_BUILD() - add swap block to swap meta data for object * SWP_PAGER_META_BUILD() - add swap block to swap meta data for object
* *
* The specified swapblk is added to the object's swap metadata. If * Try to add the specified swapblk to the object's swap metadata. If
* the swapblk is not valid, it is freed instead. Any previously * nowait and memory allocation fails, return the specified swapblk
* assigned swapblk is returned. * immediately to indicate failure. If nowait, add the specified swapblk
* only if there is no previously assigned swapblk. Return the previously
* assigned swapblk, if any.
*/ */
alcUnsubmitted
Done
Inline Actions

This sentence should still be included: "If the swapblk is not valid, it is freed instead."

alc: This sentence should still be included: "If the swapblk is not valid, it is freed instead."
static daddr_t static daddr_t
alcUnsubmitted
Not Done
Inline Actions
* swapblk immediately to indicate failure; otherwise, wait and retry until
- * memory allocation succeeds.. Return the previously assigned swapblk, if
+ * memory allocation succeeds. Return the previously assigned swapblk, if
* any.

There is an extra period.

alc: There is an extra period.
swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk) swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk,
bool nowait)
alcUnsubmitted
Done
Inline Actions

"nowait" doesn't fully convey the effect. I would include "xfer" or "transfer" in the parameter name.

alc: "nowait" doesn't fully convey the effect. I would include "xfer" or "transfer" in the…
{ {
static volatile int swblk_zone_exhausted, swpctrie_zone_exhausted; static volatile int swblk_zone_exhausted, swpctrie_zone_exhausted;
struct swblk *sb, *sb1; struct swblk *sb, *sb1;
vm_pindex_t modpi, rdpi; vm_pindex_t modpi, rdpi;
daddr_t prev_swapblk; daddr_t prev_swapblk;
int error, i; int i;
VM_OBJECT_ASSERT_WLOCKED(object); VM_OBJECT_ASSERT_WLOCKED(object);
rdpi = rounddown(pindex, SWAP_META_PAGES); rdpi = rounddown(pindex, SWAP_META_PAGES);
sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi); sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi);
if (sb == NULL) { if (sb != NULL)
goto allocated;
if (swapblk == SWAPBLK_NONE) if (swapblk == SWAPBLK_NONE)
return (SWAPBLK_NONE); return (SWAPBLK_NONE);
for (;;) { while ((sb = uma_zalloc(swblk_zone,
sb = uma_zalloc(swblk_zone, M_NOWAIT | (curproc == M_NOWAIT | (curproc == pageproc ? M_USE_RESERVE : 0))) == NULL) {
pageproc ? M_USE_RESERVE : 0)); if (nowait)
if (sb != NULL) { return (swapblk);
sb->p = rdpi;
for (i = 0; i < SWAP_META_PAGES; i++)
sb->d[i] = SWAPBLK_NONE;
if (atomic_cmpset_int(&swblk_zone_exhausted,
1, 0))
printf("swblk zone ok\n");
break;
}
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
if (uma_zone_exhausted(swblk_zone)) { if (uma_zone_exhausted(swblk_zone)) {
if (atomic_cmpset_int(&swblk_zone_exhausted, if (atomic_cmpset_int(&swblk_zone_exhausted, 0, 1))
0, 1))
printf("swap blk zone exhausted, " printf("swap blk zone exhausted, "
"increase kern.maxswzone\n"); "increase kern.maxswzone\n");
vm_pageout_oom(VM_OOM_SWAPZ); vm_pageout_oom(VM_OOM_SWAPZ);
pause("swzonxb", 10); pause("swzonxb", 10);
} else } else
uma_zwait(swblk_zone); uma_zwait(swblk_zone);
VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(object);
sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi);
rdpi);
if (sb != NULL) if (sb != NULL)
/* /*
* Somebody swapped out a nearby page, * Somebody swapped out a nearby page, allocating swblk
* allocating swblk at the rdpi index, * at the rdpi index, while we dropped the object lock.
* while we dropped the object lock.
*/ */
goto allocated; goto allocated;
} }
for (;;) { sb->p = rdpi;
error = SWAP_PCTRIE_INSERT( for (i = 0; i < SWAP_META_PAGES; i++)
&object->un_pager.swp.swp_blks, sb); sb->d[i] = SWAPBLK_NONE;
if (error == 0) { if (atomic_cmpset_int(&swblk_zone_exhausted, 1, 0))
if (atomic_cmpset_int(&swpctrie_zone_exhausted, printf("swblk zone ok\n");
1, 0)) while (SWAP_PCTRIE_INSERT(&object->un_pager.swp.swp_blks, sb) != 0) {
printf("swpctrie zone ok\n"); if (nowait) {
break; uma_zfree(swblk_zone, sb);
return (swapblk);
} }
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
if (uma_zone_exhausted(swpctrie_zone)) { if (uma_zone_exhausted(swpctrie_zone)) {
if (atomic_cmpset_int(&swpctrie_zone_exhausted, if (atomic_cmpset_int(&swpctrie_zone_exhausted, 0, 1))
0, 1))
printf("swap pctrie zone exhausted, " printf("swap pctrie zone exhausted, "
"increase kern.maxswzone\n"); "increase kern.maxswzone\n");
vm_pageout_oom(VM_OOM_SWAPZ); vm_pageout_oom(VM_OOM_SWAPZ);
pause("swzonxp", 10); pause("swzonxp", 10);
} else } else
uma_zwait(swpctrie_zone); uma_zwait(swpctrie_zone);
VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(object);
sb1 = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, sb1 = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi);
rdpi);
if (sb1 != NULL) { if (sb1 != NULL) {
uma_zfree(swblk_zone, sb); uma_zfree(swblk_zone, sb);
sb = sb1; sb = sb1;
goto allocated; goto allocated;
} }
} }
} if (atomic_cmpset_int(&swpctrie_zone_exhausted, 1, 0))
printf("swpctrie zone ok\n");
allocated: allocated:
MPASS(sb->p == rdpi); MPASS(sb->p == rdpi);
modpi = pindex % SWAP_META_PAGES; modpi = pindex % SWAP_META_PAGES;
/* Return prior contents of metadata. */ /* Return prior contents of metadata. */
prev_swapblk = sb->d[modpi]; prev_swapblk = sb->d[modpi];
if (!nowait || prev_swapblk == SWAPBLK_NONE) {
/* Enter block into metadata. */ /* Enter block into metadata. */
sb->d[modpi] = swapblk; sb->d[modpi] = swapblk;
/* /*
* Free the swblk if we end up with the empty page run. * Free the swblk if we end up with the empty page run.
*/ */
if (swapblk == SWAPBLK_NONE) if (swapblk == SWAPBLK_NONE)
swp_pager_free_empty_swblk(object, sb); swp_pager_free_empty_swblk(object, sb);
}
return (prev_swapblk); return (prev_swapblk);
} }
/* /*
* SWP_PAGER_META_TRANSFER() - free a range of blocks in the srcobject's swap * SWP_PAGER_META_TRANSFER() - free a range of blocks in the srcobject's swap
* metadata, or transfer it into dstobject. * metadata, or transfer it into dstobject.
* *
* This routine will free swap metadata structures as they are cleaned * This routine will free swap metadata structures as they are cleaned
* out. * out.
*/ */
static void static void
swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject,
vm_pindex_t pindex, vm_pindex_t count, vm_size_t *moved) vm_pindex_t pindex, vm_pindex_t count, vm_size_t *moved)
{ {
struct page_range range; struct page_range range;
struct swblk *sb; struct swblk *sb;
daddr_t blk;
vm_page_t m; vm_page_t m;
vm_pindex_t offset, last; vm_pindex_t offset, last;
vm_size_t mc; vm_size_t mc;
int i, limit, start; int i, limit, start;
VM_OBJECT_ASSERT_WLOCKED(srcobject); VM_OBJECT_ASSERT_WLOCKED(srcobject);
MPASS(moved == NULL || dstobject == NULL); MPASS(moved == NULL || dstobject == NULL);
Show All 9 Lines for (;;) {
sb = SWAP_PCTRIE_LOOKUP_GE(&srcobject->un_pager.swp.swp_blks, sb = SWAP_PCTRIE_LOOKUP_GE(&srcobject->un_pager.swp.swp_blks,
rounddown(pindex, SWAP_META_PAGES)); rounddown(pindex, SWAP_META_PAGES));
if (sb == NULL || sb->p >= last) if (sb == NULL || sb->p >= last)
break; break;
start = pindex > sb->p ? pindex - sb->p : 0; start = pindex > sb->p ? pindex - sb->p : 0;
limit = last - sb->p < SWAP_META_PAGES ? last - sb->p : limit = last - sb->p < SWAP_META_PAGES ? last - sb->p :
SWAP_META_PAGES; SWAP_META_PAGES;
for (i = start; i < limit; i++) { for (i = start; i < limit; i++) {
if (sb->d[i] == SWAPBLK_NONE) blk = sb->d[i];
if (blk == SWAPBLK_NONE)
continue; continue;
if (dstobject == NULL || if (dstobject == NULL ||
!swp_pager_xfer_source(srcobject, dstobject, (blk = swp_pager_meta_build(dstobject,
sb->p + i - offset, sb->d[i])) { sb->p + i - offset, blk, true),
blk != sb->d[i] && blk != SWAPBLK_NONE))
swp_pager_update_freerange(&range, sb->d[i]); swp_pager_update_freerange(&range, sb->d[i]);
else if (blk == sb->d[i]) {
/*
* Destination has no swapblk and is not
* resident, so transfer source.
* swp_pager_meta_build() failed memory
* allocation already, likely to sleep in retry.
*/
VM_OBJECT_WUNLOCK(srcobject);
swp_pager_meta_build(dstobject,
sb->p + i - offset, blk, false);
VM_OBJECT_WLOCK(srcobject);
} }
if (moved != NULL) { if (moved != NULL) {
if (m != NULL && m->pindex != pindex + i - 1) if (m != NULL && m->pindex != pindex + i - 1)
m = NULL; m = NULL;
m = m != NULL ? vm_page_next(m) : m = m != NULL ? vm_page_next(m) :
vm_page_lookup(srcobject, pindex + i); vm_page_lookup(srcobject, pindex + i);
if (m == NULL || vm_page_none_valid(m)) if (m == NULL || vm_page_none_valid(m))
mc++; mc++;
▲ Show 20 Lines • Show All 989 Lines • Show Last 20 Lines
View Options

libexec/rtld-elf/tests/ld_library_pathfds.c

Show First 20 Lines • Show All 480 Lines • ▼ Show 20 Lines
* Swap bitmap functions * Swap bitmap functions
*/ */
static void swp_pager_freeswapspace(const struct page_range *range); static void swp_pager_freeswapspace(const struct page_range *range);
static daddr_t swp_pager_getswapspace(int *npages); static daddr_t swp_pager_getswapspace(int *npages);
/* /*
* Metadata functions * Metadata functions
*/ */
static daddr_t swp_pager_meta_build(vm_object_t, vm_pindex_t, daddr_t); static daddr_t swp_pager_meta_build(vm_object_t, vm_pindex_t, daddr_t,
bool);
static void swp_pager_meta_free(vm_object_t, vm_pindex_t, vm_pindex_t, static void swp_pager_meta_free(vm_object_t, vm_pindex_t, vm_pindex_t,
vm_size_t *); vm_size_t *);
static void swp_pager_meta_transfer(vm_object_t src, vm_object_t dst, static void swp_pager_meta_transfer(vm_object_t src, vm_object_t dst,
vm_pindex_t pindex, vm_pindex_t count, vm_size_t *freed); vm_pindex_t pindex, vm_pindex_t count, vm_size_t *freed);
static void swp_pager_meta_free_all(vm_object_t); static void swp_pager_meta_free_all(vm_object_t);
static daddr_t swp_pager_meta_lookup(vm_object_t, vm_pindex_t); static daddr_t swp_pager_meta_lookup(vm_object_t, vm_pindex_t);
static void static void
▲ Show 20 Lines • Show All 528 Lines • ▼ Show 20 Lines for (i = 0; i < size; i += n) {
blk = swp_pager_getswapspace(&n); blk = swp_pager_getswapspace(&n);
if (blk == SWAPBLK_NONE) { if (blk == SWAPBLK_NONE) {
swp_pager_meta_free(object, start, i, NULL); swp_pager_meta_free(object, start, i, NULL);
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
return (-1); return (-1);
} }
for (j = 0; j < n; ++j) { for (j = 0; j < n; ++j) {
addr = swp_pager_meta_build(object, addr = swp_pager_meta_build(object,
start + i + j, blk + j); start + i + j, blk + j, false);
if (addr != SWAPBLK_NONE) if (addr != SWAPBLK_NONE)
swp_pager_update_freerange(&range, addr); swp_pager_update_freerange(&range, addr);
} }
} }
swp_pager_freeswapspace(&range); swp_pager_freeswapspace(&range);
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
return (0); return (0);
} }
static bool
swp_pager_xfer_source(vm_object_t srcobject, vm_object_t dstobject,
vm_pindex_t pindex, daddr_t addr)
{
daddr_t dstaddr __diagused;
KASSERT((srcobject->flags & OBJ_SWAP) != 0,
("%s: srcobject not swappable", __func__));
KASSERT((dstobject->flags & OBJ_SWAP) != 0,
("%s: dstobject not swappable", __func__));
if (swp_pager_meta_lookup(dstobject, pindex) != SWAPBLK_NONE) {
/* Caller should destroy the source block. */
return (false);
}
/* /*
* Destination has no swapblk and is not resident, transfer source.
* swp_pager_meta_build() can sleep.
*/
VM_OBJECT_WUNLOCK(srcobject);
dstaddr = swp_pager_meta_build(dstobject, pindex, addr);
KASSERT(dstaddr == SWAPBLK_NONE,
("Unexpected destination swapblk"));
VM_OBJECT_WLOCK(srcobject);
return (true);
}
/*
* SWAP_PAGER_COPY() - copy blocks from source pager to destination pager * SWAP_PAGER_COPY() - copy blocks from source pager to destination pager
* and destroy the source. * and destroy the source.
* *
* Copy any valid swapblks from the source to the destination. In * Copy any valid swapblks from the source to the destination. In
* cases where both the source and destination have a valid swapblk, * cases where both the source and destination have a valid swapblk,
* we keep the destination's. * we keep the destination's.
* *
* This routine is allowed to sleep. It may sleep allocating metadata * This routine is allowed to sleep. It may sleep allocating metadata
▲ Show 20 Lines • Show All 461 Lines • ▼ Show 20 Lines if (blk == SWAPBLK_NONE) {
rtvals[i + j] = VM_PAGER_FAIL; rtvals[i + j] = VM_PAGER_FAIL;
continue; continue;
} }
VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(object);
for (j = 0; j < n; ++j) { for (j = 0; j < n; ++j) {
mreq = ma[i + j]; mreq = ma[i + j];
vm_page_aflag_clear(mreq, PGA_SWAP_FREE); vm_page_aflag_clear(mreq, PGA_SWAP_FREE);
addr = swp_pager_meta_build(mreq->object, mreq->pindex, addr = swp_pager_meta_build(mreq->object, mreq->pindex,
blk + j); blk + j, false);
if (addr != SWAPBLK_NONE) if (addr != SWAPBLK_NONE)
swp_pager_update_freerange(&range, addr); swp_pager_update_freerange(&range, addr);
MPASS(mreq->dirty == VM_PAGE_BITS_ALL); MPASS(mreq->dirty == VM_PAGE_BITS_ALL);
mreq->oflags |= VPO_SWAPINPROG; mreq->oflags |= VPO_SWAPINPROG;
} }
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
bp = uma_zalloc(swwbuf_zone, M_WAITOK); bp = uma_zalloc(swwbuf_zone, M_WAITOK);
▲ Show 20 Lines • Show All 487 Lines • ▼ Show 20 Lines
swp_pager_free_empty_swblk(vm_object_t object, struct swblk *sb) swp_pager_free_empty_swblk(vm_object_t object, struct swblk *sb)
{ {
if (swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) { if (swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) {
SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p); SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p);
uma_zfree(swblk_zone, sb); uma_zfree(swblk_zone, sb);
} }
} }
/* /*
* SWP_PAGER_META_BUILD() - add swap block to swap meta data for object * SWP_PAGER_META_BUILD() - add swap block to swap meta data for object
* *
* The specified swapblk is added to the object's swap metadata. If * Try to add the specified swapblk to the object's swap metadata. If
* the swapblk is not valid, it is freed instead. Any previously * nowait and memory allocation fails, return the specified swapblk
* assigned swapblk is returned. * immediately to indicate failure. If nowait, add the specified swapblk
* only if there is no previously assigned swapblk. Return the previously
* assigned swapblk, if any.
*/ */
alcUnsubmitted
Done
Inline Actions

This sentence should still be included: "If the swapblk is not valid, it is freed instead."

alc: This sentence should still be included: "If the swapblk is not valid, it is freed instead."
static daddr_t static daddr_t
alcUnsubmitted
Not Done
Inline Actions
* swapblk immediately to indicate failure; otherwise, wait and retry until
- * memory allocation succeeds.. Return the previously assigned swapblk, if
+ * memory allocation succeeds. Return the previously assigned swapblk, if
* any.

There is an extra period.

alc: There is an extra period.
swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk) swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk,
bool nowait)
alcUnsubmitted
Done
Inline Actions

"nowait" doesn't fully convey the effect. I would include "xfer" or "transfer" in the parameter name.

alc: "nowait" doesn't fully convey the effect. I would include "xfer" or "transfer" in the…
{ {
static volatile int swblk_zone_exhausted, swpctrie_zone_exhausted; static volatile int swblk_zone_exhausted, swpctrie_zone_exhausted;
struct swblk *sb, *sb1; struct swblk *sb, *sb1;
vm_pindex_t modpi, rdpi; vm_pindex_t modpi, rdpi;
daddr_t prev_swapblk; daddr_t prev_swapblk;
int error, i; int i;
VM_OBJECT_ASSERT_WLOCKED(object); VM_OBJECT_ASSERT_WLOCKED(object);
rdpi = rounddown(pindex, SWAP_META_PAGES); rdpi = rounddown(pindex, SWAP_META_PAGES);
sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi); sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi);
if (sb == NULL) { if (sb != NULL)
goto allocated;
if (swapblk == SWAPBLK_NONE) if (swapblk == SWAPBLK_NONE)
return (SWAPBLK_NONE); return (SWAPBLK_NONE);
for (;;) { while ((sb = uma_zalloc(swblk_zone,
sb = uma_zalloc(swblk_zone, M_NOWAIT | (curproc == M_NOWAIT | (curproc == pageproc ? M_USE_RESERVE : 0))) == NULL) {
pageproc ? M_USE_RESERVE : 0)); if (nowait)
if (sb != NULL) { return (swapblk);
sb->p = rdpi;
for (i = 0; i < SWAP_META_PAGES; i++)
sb->d[i] = SWAPBLK_NONE;
if (atomic_cmpset_int(&swblk_zone_exhausted,
1, 0))
printf("swblk zone ok\n");
break;
}
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
if (uma_zone_exhausted(swblk_zone)) { if (uma_zone_exhausted(swblk_zone)) {
if (atomic_cmpset_int(&swblk_zone_exhausted, if (atomic_cmpset_int(&swblk_zone_exhausted, 0, 1))
0, 1))
printf("swap blk zone exhausted, " printf("swap blk zone exhausted, "
"increase kern.maxswzone\n"); "increase kern.maxswzone\n");
vm_pageout_oom(VM_OOM_SWAPZ); vm_pageout_oom(VM_OOM_SWAPZ);
pause("swzonxb", 10); pause("swzonxb", 10);
} else } else
uma_zwait(swblk_zone); uma_zwait(swblk_zone);
VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(object);
sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi);
rdpi);
if (sb != NULL) if (sb != NULL)
/* /*
* Somebody swapped out a nearby page, * Somebody swapped out a nearby page, allocating swblk
* allocating swblk at the rdpi index, * at the rdpi index, while we dropped the object lock.
* while we dropped the object lock.
*/ */
goto allocated; goto allocated;
} }
for (;;) { sb->p = rdpi;
error = SWAP_PCTRIE_INSERT( for (i = 0; i < SWAP_META_PAGES; i++)
&object->un_pager.swp.swp_blks, sb); sb->d[i] = SWAPBLK_NONE;
if (error == 0) { if (atomic_cmpset_int(&swblk_zone_exhausted, 1, 0))
if (atomic_cmpset_int(&swpctrie_zone_exhausted, printf("swblk zone ok\n");
1, 0)) while (SWAP_PCTRIE_INSERT(&object->un_pager.swp.swp_blks, sb) != 0) {
printf("swpctrie zone ok\n"); if (nowait) {
break; uma_zfree(swblk_zone, sb);
return (swapblk);
} }
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
if (uma_zone_exhausted(swpctrie_zone)) { if (uma_zone_exhausted(swpctrie_zone)) {
if (atomic_cmpset_int(&swpctrie_zone_exhausted, if (atomic_cmpset_int(&swpctrie_zone_exhausted, 0, 1))
0, 1))
printf("swap pctrie zone exhausted, " printf("swap pctrie zone exhausted, "
"increase kern.maxswzone\n"); "increase kern.maxswzone\n");
vm_pageout_oom(VM_OOM_SWAPZ); vm_pageout_oom(VM_OOM_SWAPZ);
pause("swzonxp", 10); pause("swzonxp", 10);
} else } else
uma_zwait(swpctrie_zone); uma_zwait(swpctrie_zone);
VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(object);
sb1 = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, sb1 = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi);
rdpi);
if (sb1 != NULL) { if (sb1 != NULL) {
uma_zfree(swblk_zone, sb); uma_zfree(swblk_zone, sb);
sb = sb1; sb = sb1;
goto allocated; goto allocated;
} }
} }
} if (atomic_cmpset_int(&swpctrie_zone_exhausted, 1, 0))
printf("swpctrie zone ok\n");
allocated: allocated:
MPASS(sb->p == rdpi); MPASS(sb->p == rdpi);
modpi = pindex % SWAP_META_PAGES; modpi = pindex % SWAP_META_PAGES;
/* Return prior contents of metadata. */ /* Return prior contents of metadata. */
prev_swapblk = sb->d[modpi]; prev_swapblk = sb->d[modpi];
if (!nowait || prev_swapblk == SWAPBLK_NONE) {
/* Enter block into metadata. */ /* Enter block into metadata. */
sb->d[modpi] = swapblk; sb->d[modpi] = swapblk;
/* /*
* Free the swblk if we end up with the empty page run. * Free the swblk if we end up with the empty page run.
*/ */
if (swapblk == SWAPBLK_NONE) if (swapblk == SWAPBLK_NONE)
swp_pager_free_empty_swblk(object, sb); swp_pager_free_empty_swblk(object, sb);
}
return (prev_swapblk); return (prev_swapblk);
} }
/* /*
* SWP_PAGER_META_TRANSFER() - free a range of blocks in the srcobject's swap * SWP_PAGER_META_TRANSFER() - free a range of blocks in the srcobject's swap
* metadata, or transfer it into dstobject. * metadata, or transfer it into dstobject.
* *
* This routine will free swap metadata structures as they are cleaned * This routine will free swap metadata structures as they are cleaned
* out. * out.
*/ */
static void static void
swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject,
vm_pindex_t pindex, vm_pindex_t count, vm_size_t *moved) vm_pindex_t pindex, vm_pindex_t count, vm_size_t *moved)
{ {
struct page_range range; struct page_range range;
struct swblk *sb; struct swblk *sb;
daddr_t blk;
vm_page_t m; vm_page_t m;
vm_pindex_t offset, last; vm_pindex_t offset, last;
vm_size_t mc; vm_size_t mc;
int i, limit, start; int i, limit, start;
VM_OBJECT_ASSERT_WLOCKED(srcobject); VM_OBJECT_ASSERT_WLOCKED(srcobject);
MPASS(moved == NULL || dstobject == NULL); MPASS(moved == NULL || dstobject == NULL);
Show All 9 Lines for (;;) {
sb = SWAP_PCTRIE_LOOKUP_GE(&srcobject->un_pager.swp.swp_blks, sb = SWAP_PCTRIE_LOOKUP_GE(&srcobject->un_pager.swp.swp_blks,
rounddown(pindex, SWAP_META_PAGES)); rounddown(pindex, SWAP_META_PAGES));
if (sb == NULL || sb->p >= last) if (sb == NULL || sb->p >= last)
break; break;
start = pindex > sb->p ? pindex - sb->p : 0; start = pindex > sb->p ? pindex - sb->p : 0;
limit = last - sb->p < SWAP_META_PAGES ? last - sb->p : limit = last - sb->p < SWAP_META_PAGES ? last - sb->p :
SWAP_META_PAGES; SWAP_META_PAGES;
for (i = start; i < limit; i++) { for (i = start; i < limit; i++) {
if (sb->d[i] == SWAPBLK_NONE) blk = sb->d[i];
if (blk == SWAPBLK_NONE)
continue; continue;
if (dstobject == NULL || if (dstobject == NULL ||
!swp_pager_xfer_source(srcobject, dstobject, (blk = swp_pager_meta_build(dstobject,
sb->p + i - offset, sb->d[i])) { sb->p + i - offset, blk, true),
blk != sb->d[i] && blk != SWAPBLK_NONE))
swp_pager_update_freerange(&range, sb->d[i]); swp_pager_update_freerange(&range, sb->d[i]);
else if (blk == sb->d[i]) {
/*
* Destination has no swapblk and is not
* resident, so transfer source.
* swp_pager_meta_build() failed memory
* allocation already, likely to sleep in retry.
*/
VM_OBJECT_WUNLOCK(srcobject);
swp_pager_meta_build(dstobject,
sb->p + i - offset, blk, false);
VM_OBJECT_WLOCK(srcobject);
} }
if (moved != NULL) { if (moved != NULL) {
if (m != NULL && m->pindex != pindex + i - 1) if (m != NULL && m->pindex != pindex + i - 1)
m = NULL; m = NULL;
m = m != NULL ? vm_page_next(m) : m = m != NULL ? vm_page_next(m) :
vm_page_lookup(srcobject, pindex + i); vm_page_lookup(srcobject, pindex + i);
if (m == NULL || vm_page_none_valid(m)) if (m == NULL || vm_page_none_valid(m))
mc++; mc++;
▲ Show 20 Lines • Show All 989 Lines • Show Last 20 Lines
View Options

libexec/rtld-elf/tests/ld_preload_fds.c

Show First 20 Lines • Show All 480 Lines • ▼ Show 20 Lines
* Swap bitmap functions * Swap bitmap functions
*/ */
static void swp_pager_freeswapspace(const struct page_range *range); static void swp_pager_freeswapspace(const struct page_range *range);
static daddr_t swp_pager_getswapspace(int *npages); static daddr_t swp_pager_getswapspace(int *npages);
/* /*
* Metadata functions * Metadata functions
*/ */
static daddr_t swp_pager_meta_build(vm_object_t, vm_pindex_t, daddr_t); static daddr_t swp_pager_meta_build(vm_object_t, vm_pindex_t, daddr_t,
bool);
static void swp_pager_meta_free(vm_object_t, vm_pindex_t, vm_pindex_t, static void swp_pager_meta_free(vm_object_t, vm_pindex_t, vm_pindex_t,
vm_size_t *); vm_size_t *);
static void swp_pager_meta_transfer(vm_object_t src, vm_object_t dst, static void swp_pager_meta_transfer(vm_object_t src, vm_object_t dst,
vm_pindex_t pindex, vm_pindex_t count, vm_size_t *freed); vm_pindex_t pindex, vm_pindex_t count, vm_size_t *freed);
static void swp_pager_meta_free_all(vm_object_t); static void swp_pager_meta_free_all(vm_object_t);
static daddr_t swp_pager_meta_lookup(vm_object_t, vm_pindex_t); static daddr_t swp_pager_meta_lookup(vm_object_t, vm_pindex_t);
static void static void
▲ Show 20 Lines • Show All 528 Lines • ▼ Show 20 Lines for (i = 0; i < size; i += n) {
blk = swp_pager_getswapspace(&n); blk = swp_pager_getswapspace(&n);
if (blk == SWAPBLK_NONE) { if (blk == SWAPBLK_NONE) {
swp_pager_meta_free(object, start, i, NULL); swp_pager_meta_free(object, start, i, NULL);
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
return (-1); return (-1);
} }
for (j = 0; j < n; ++j) { for (j = 0; j < n; ++j) {
addr = swp_pager_meta_build(object, addr = swp_pager_meta_build(object,
start + i + j, blk + j); start + i + j, blk + j, false);
if (addr != SWAPBLK_NONE) if (addr != SWAPBLK_NONE)
swp_pager_update_freerange(&range, addr); swp_pager_update_freerange(&range, addr);
} }
} }
swp_pager_freeswapspace(&range); swp_pager_freeswapspace(&range);
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
return (0); return (0);
} }
static bool
swp_pager_xfer_source(vm_object_t srcobject, vm_object_t dstobject,
vm_pindex_t pindex, daddr_t addr)
{
daddr_t dstaddr __diagused;
KASSERT((srcobject->flags & OBJ_SWAP) != 0,
("%s: srcobject not swappable", __func__));
KASSERT((dstobject->flags & OBJ_SWAP) != 0,
("%s: dstobject not swappable", __func__));
if (swp_pager_meta_lookup(dstobject, pindex) != SWAPBLK_NONE) {
/* Caller should destroy the source block. */
return (false);
}
/* /*
* Destination has no swapblk and is not resident, transfer source.
* swp_pager_meta_build() can sleep.
*/
VM_OBJECT_WUNLOCK(srcobject);
dstaddr = swp_pager_meta_build(dstobject, pindex, addr);
KASSERT(dstaddr == SWAPBLK_NONE,
("Unexpected destination swapblk"));
VM_OBJECT_WLOCK(srcobject);
return (true);
}
/*
* SWAP_PAGER_COPY() - copy blocks from source pager to destination pager * SWAP_PAGER_COPY() - copy blocks from source pager to destination pager
* and destroy the source. * and destroy the source.
* *
* Copy any valid swapblks from the source to the destination. In * Copy any valid swapblks from the source to the destination. In
* cases where both the source and destination have a valid swapblk, * cases where both the source and destination have a valid swapblk,
* we keep the destination's. * we keep the destination's.
* *
* This routine is allowed to sleep. It may sleep allocating metadata * This routine is allowed to sleep. It may sleep allocating metadata
▲ Show 20 Lines • Show All 461 Lines • ▼ Show 20 Lines if (blk == SWAPBLK_NONE) {
rtvals[i + j] = VM_PAGER_FAIL; rtvals[i + j] = VM_PAGER_FAIL;
continue; continue;
} }
VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(object);
for (j = 0; j < n; ++j) { for (j = 0; j < n; ++j) {
mreq = ma[i + j]; mreq = ma[i + j];
vm_page_aflag_clear(mreq, PGA_SWAP_FREE); vm_page_aflag_clear(mreq, PGA_SWAP_FREE);
addr = swp_pager_meta_build(mreq->object, mreq->pindex, addr = swp_pager_meta_build(mreq->object, mreq->pindex,
blk + j); blk + j, false);
if (addr != SWAPBLK_NONE) if (addr != SWAPBLK_NONE)
swp_pager_update_freerange(&range, addr); swp_pager_update_freerange(&range, addr);
MPASS(mreq->dirty == VM_PAGE_BITS_ALL); MPASS(mreq->dirty == VM_PAGE_BITS_ALL);
mreq->oflags |= VPO_SWAPINPROG; mreq->oflags |= VPO_SWAPINPROG;
} }
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
bp = uma_zalloc(swwbuf_zone, M_WAITOK); bp = uma_zalloc(swwbuf_zone, M_WAITOK);
▲ Show 20 Lines • Show All 487 Lines • ▼ Show 20 Lines
swp_pager_free_empty_swblk(vm_object_t object, struct swblk *sb) swp_pager_free_empty_swblk(vm_object_t object, struct swblk *sb)
{ {
if (swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) { if (swp_pager_swblk_empty(sb, 0, SWAP_META_PAGES)) {
SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p); SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p);
uma_zfree(swblk_zone, sb); uma_zfree(swblk_zone, sb);
} }
} }
/* /*
* SWP_PAGER_META_BUILD() - add swap block to swap meta data for object * SWP_PAGER_META_BUILD() - add swap block to swap meta data for object
* *
* The specified swapblk is added to the object's swap metadata. If * Try to add the specified swapblk to the object's swap metadata. If
* the swapblk is not valid, it is freed instead. Any previously * nowait and memory allocation fails, return the specified swapblk
* assigned swapblk is returned. * immediately to indicate failure. If nowait, add the specified swapblk
* only if there is no previously assigned swapblk. Return the previously
* assigned swapblk, if any.
*/ */
alcUnsubmitted
Done
Inline Actions

This sentence should still be included: "If the swapblk is not valid, it is freed instead."

alc: This sentence should still be included: "If the swapblk is not valid, it is freed instead."
static daddr_t static daddr_t
alcUnsubmitted
Not Done
Inline Actions
* swapblk immediately to indicate failure; otherwise, wait and retry until
- * memory allocation succeeds.. Return the previously assigned swapblk, if
+ * memory allocation succeeds. Return the previously assigned swapblk, if
* any.

There is an extra period.

alc: There is an extra period.
swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk) swp_pager_meta_build(vm_object_t object, vm_pindex_t pindex, daddr_t swapblk,
bool nowait)
alcUnsubmitted
Done
Inline Actions

"nowait" doesn't fully convey the effect. I would include "xfer" or "transfer" in the parameter name.

alc: "nowait" doesn't fully convey the effect. I would include "xfer" or "transfer" in the…
{ {
static volatile int swblk_zone_exhausted, swpctrie_zone_exhausted; static volatile int swblk_zone_exhausted, swpctrie_zone_exhausted;
struct swblk *sb, *sb1; struct swblk *sb, *sb1;
vm_pindex_t modpi, rdpi; vm_pindex_t modpi, rdpi;
daddr_t prev_swapblk; daddr_t prev_swapblk;
int error, i; int i;
VM_OBJECT_ASSERT_WLOCKED(object); VM_OBJECT_ASSERT_WLOCKED(object);
rdpi = rounddown(pindex, SWAP_META_PAGES); rdpi = rounddown(pindex, SWAP_META_PAGES);
sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi); sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi);
if (sb == NULL) { if (sb != NULL)
goto allocated;
if (swapblk == SWAPBLK_NONE) if (swapblk == SWAPBLK_NONE)
return (SWAPBLK_NONE); return (SWAPBLK_NONE);
for (;;) { while ((sb = uma_zalloc(swblk_zone,
sb = uma_zalloc(swblk_zone, M_NOWAIT | (curproc == M_NOWAIT | (curproc == pageproc ? M_USE_RESERVE : 0))) == NULL) {
pageproc ? M_USE_RESERVE : 0)); if (nowait)
if (sb != NULL) { return (swapblk);
sb->p = rdpi;
for (i = 0; i < SWAP_META_PAGES; i++)
sb->d[i] = SWAPBLK_NONE;
if (atomic_cmpset_int(&swblk_zone_exhausted,
1, 0))
printf("swblk zone ok\n");
break;
}
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
if (uma_zone_exhausted(swblk_zone)) { if (uma_zone_exhausted(swblk_zone)) {
if (atomic_cmpset_int(&swblk_zone_exhausted, if (atomic_cmpset_int(&swblk_zone_exhausted, 0, 1))
0, 1))
printf("swap blk zone exhausted, " printf("swap blk zone exhausted, "
"increase kern.maxswzone\n"); "increase kern.maxswzone\n");
vm_pageout_oom(VM_OOM_SWAPZ); vm_pageout_oom(VM_OOM_SWAPZ);
pause("swzonxb", 10); pause("swzonxb", 10);
} else } else
uma_zwait(swblk_zone); uma_zwait(swblk_zone);
VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(object);
sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, sb = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi);
rdpi);
if (sb != NULL) if (sb != NULL)
/* /*
* Somebody swapped out a nearby page, * Somebody swapped out a nearby page, allocating swblk
* allocating swblk at the rdpi index, * at the rdpi index, while we dropped the object lock.
* while we dropped the object lock.
*/ */
goto allocated; goto allocated;
} }
for (;;) { sb->p = rdpi;
error = SWAP_PCTRIE_INSERT( for (i = 0; i < SWAP_META_PAGES; i++)
&object->un_pager.swp.swp_blks, sb); sb->d[i] = SWAPBLK_NONE;
if (error == 0) { if (atomic_cmpset_int(&swblk_zone_exhausted, 1, 0))
if (atomic_cmpset_int(&swpctrie_zone_exhausted, printf("swblk zone ok\n");
1, 0)) while (SWAP_PCTRIE_INSERT(&object->un_pager.swp.swp_blks, sb) != 0) {
printf("swpctrie zone ok\n"); if (nowait) {
break; uma_zfree(swblk_zone, sb);
return (swapblk);
} }
VM_OBJECT_WUNLOCK(object); VM_OBJECT_WUNLOCK(object);
if (uma_zone_exhausted(swpctrie_zone)) { if (uma_zone_exhausted(swpctrie_zone)) {
if (atomic_cmpset_int(&swpctrie_zone_exhausted, if (atomic_cmpset_int(&swpctrie_zone_exhausted, 0, 1))
0, 1))
printf("swap pctrie zone exhausted, " printf("swap pctrie zone exhausted, "
"increase kern.maxswzone\n"); "increase kern.maxswzone\n");
vm_pageout_oom(VM_OOM_SWAPZ); vm_pageout_oom(VM_OOM_SWAPZ);
pause("swzonxp", 10); pause("swzonxp", 10);
} else } else
uma_zwait(swpctrie_zone); uma_zwait(swpctrie_zone);
VM_OBJECT_WLOCK(object); VM_OBJECT_WLOCK(object);
sb1 = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, sb1 = SWAP_PCTRIE_LOOKUP(&object->un_pager.swp.swp_blks, rdpi);
rdpi);
if (sb1 != NULL) { if (sb1 != NULL) {
uma_zfree(swblk_zone, sb); uma_zfree(swblk_zone, sb);
sb = sb1; sb = sb1;
goto allocated; goto allocated;
} }
} }
} if (atomic_cmpset_int(&swpctrie_zone_exhausted, 1, 0))
printf("swpctrie zone ok\n");
allocated: allocated:
MPASS(sb->p == rdpi); MPASS(sb->p == rdpi);
modpi = pindex % SWAP_META_PAGES; modpi = pindex % SWAP_META_PAGES;
/* Return prior contents of metadata. */ /* Return prior contents of metadata. */
prev_swapblk = sb->d[modpi]; prev_swapblk = sb->d[modpi];
if (!nowait || prev_swapblk == SWAPBLK_NONE) {
/* Enter block into metadata. */ /* Enter block into metadata. */
sb->d[modpi] = swapblk; sb->d[modpi] = swapblk;
/* /*
* Free the swblk if we end up with the empty page run. * Free the swblk if we end up with the empty page run.
*/ */
if (swapblk == SWAPBLK_NONE) if (swapblk == SWAPBLK_NONE)
swp_pager_free_empty_swblk(object, sb); swp_pager_free_empty_swblk(object, sb);
}
return (prev_swapblk); return (prev_swapblk);
} }
/* /*
* SWP_PAGER_META_TRANSFER() - free a range of blocks in the srcobject's swap * SWP_PAGER_META_TRANSFER() - free a range of blocks in the srcobject's swap
* metadata, or transfer it into dstobject. * metadata, or transfer it into dstobject.
* *
* This routine will free swap metadata structures as they are cleaned * This routine will free swap metadata structures as they are cleaned
* out. * out.
*/ */
static void static void
swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject,
vm_pindex_t pindex, vm_pindex_t count, vm_size_t *moved) vm_pindex_t pindex, vm_pindex_t count, vm_size_t *moved)
{ {
struct page_range range; struct page_range range;
struct swblk *sb; struct swblk *sb;
daddr_t blk;
vm_page_t m; vm_page_t m;
vm_pindex_t offset, last; vm_pindex_t offset, last;
vm_size_t mc; vm_size_t mc;
int i, limit, start; int i, limit, start;
VM_OBJECT_ASSERT_WLOCKED(srcobject); VM_OBJECT_ASSERT_WLOCKED(srcobject);
MPASS(moved == NULL || dstobject == NULL); MPASS(moved == NULL || dstobject == NULL);
Show All 9 Lines for (;;) {
sb = SWAP_PCTRIE_LOOKUP_GE(&srcobject->un_pager.swp.swp_blks, sb = SWAP_PCTRIE_LOOKUP_GE(&srcobject->un_pager.swp.swp_blks,
rounddown(pindex, SWAP_META_PAGES)); rounddown(pindex, SWAP_META_PAGES));
if (sb == NULL || sb->p >= last) if (sb == NULL || sb->p >= last)
break; break;
start = pindex > sb->p ? pindex - sb->p : 0; start = pindex > sb->p ? pindex - sb->p : 0;
limit = last - sb->p < SWAP_META_PAGES ? last - sb->p : limit = last - sb->p < SWAP_META_PAGES ? last - sb->p :
SWAP_META_PAGES; SWAP_META_PAGES;
for (i = start; i < limit; i++) { for (i = start; i < limit; i++) {
if (sb->d[i] == SWAPBLK_NONE) blk = sb->d[i];
if (blk == SWAPBLK_NONE)
continue; continue;
if (dstobject == NULL || if (dstobject == NULL ||
!swp_pager_xfer_source(srcobject, dstobject, (blk = swp_pager_meta_build(dstobject,
sb->p + i - offset, sb->d[i])) { sb->p + i - offset, blk, true),
blk != sb->d[i] && blk != SWAPBLK_NONE))
swp_pager_update_freerange(&range, sb->d[i]); swp_pager_update_freerange(&range, sb->d[i]);
else if (blk == sb->d[i]) {
/*
* Destination has no swapblk and is not
* resident, so transfer source.
* swp_pager_meta_build() failed memory
* allocation already, likely to sleep in retry.
*/
VM_OBJECT_WUNLOCK(srcobject);
swp_pager_meta_build(dstobject,
sb->p + i - offset, blk, false);
VM_OBJECT_WLOCK(srcobject);
} }
if (moved != NULL) { if (moved != NULL) {
if (m != NULL && m->pindex != pindex + i - 1) if (m != NULL && m->pindex != pindex + i - 1)
m = NULL; m = NULL;
m = m != NULL ? vm_page_next(m) : m = m != NULL ? vm_page_next(m) :
vm_page_lookup(srcobject, pindex + i); vm_page_lookup(srcobject, pindex + i);
if (m == NULL || vm_page_none_valid(m)) if (m == NULL || vm_page_none_valid(m))
mc++; mc++;
▲ Show 20 Lines • Show All 989 Lines • Show Last 20 Lines