Page MenuHomeFreeBSD
Files F101253547

D47232.diff
No OneTemporary
Actions

D47232.diff
View Options

Index: sys/vm/swap_pager.c
===================================================================
--- sys/vm/swap_pager.c
+++ sys/vm/swap_pager.c
@@ -493,7 +493,7 @@
static void swp_pager_meta_transfer(vm_object_t src, vm_object_t dst,
vm_pindex_t pindex, vm_pindex_t count);
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(struct pctrie_iter *, vm_pindex_t);
static void
swp_pager_init_freerange(struct page_range *range)
@@ -1190,8 +1190,9 @@
}
/*
- * SWAP_PAGER_HASPAGE() - determine if we have good backing store for
- * the requested page.
+ * SWAP_PAGER_HASPAGE_ITER() - determine if we have good backing store for
+ * the requested page, accessed with the given
+ * iterator.
*
* We determine whether good backing store exists for the requested
* page and return TRUE if it does, FALSE if it doesn't.
@@ -1200,20 +1201,16 @@
* store exists before and after the requested page.
*/
static boolean_t
-swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before,
- int *after)
+swap_pager_haspage_iter(struct pctrie_iter *blks, vm_pindex_t pindex,
+ int *before, int *after)
{
daddr_t blk, blk0;
int i;
- VM_OBJECT_ASSERT_LOCKED(object);
- KASSERT((object->flags & OBJ_SWAP) != 0,
- ("%s: object not swappable", __func__));
-
/*
* do we have good backing store at the requested index ?
*/
- blk0 = swp_pager_meta_lookup(object, pindex);
+ blk0 = swp_pager_meta_lookup(blks, pindex);
if (blk0 == SWAPBLK_NONE) {
if (before)
*before = 0;
@@ -1229,7 +1226,7 @@
for (i = 1; i < SWB_NPAGES; i++) {
if (i > pindex)
break;
- blk = swp_pager_meta_lookup(object, pindex - i);
+ blk = swp_pager_meta_lookup(blks, pindex - i);
if (blk != blk0 - i)
break;
}
@@ -1241,7 +1238,7 @@
*/
if (after != NULL) {
for (i = 1; i < SWB_NPAGES; i++) {
- blk = swp_pager_meta_lookup(object, pindex + i);
+ blk = swp_pager_meta_lookup(blks, pindex + i);
if (blk != blk0 + i)
break;
}
@@ -1250,6 +1247,26 @@
return (TRUE);
}
+/*
+ * SWAP_PAGER_HASPAGE() - determine if we have good backing store for
+ * the requested page, in the given object.
+ *
+ * We determine whether good backing store exists for the requested
+ * page and return TRUE if it does, FALSE if it doesn't.
+ *
+ * If TRUE, we also try to determine how much valid, contiguous backing
+ * store exists before and after the requested page.
+ */
+static boolean_t
+swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before,
+ int *after)
+{
+ struct pctrie_iter blks;
+
+ swblk_iter_init_only(&blks, object);
+ return (swap_pager_haspage_iter(&blks, pindex, before, after));
+}
+
static void
swap_pager_unswapped_acct(vm_page_t m)
{
@@ -1337,8 +1354,8 @@
* The pages in "ma" must be busied and will remain busied upon return.
*/
static int
-swap_pager_getpages_locked(vm_object_t object, vm_page_t *ma, int count,
- int *rbehind, int *rahead)
+swap_pager_getpages_locked(struct pctrie_iter *blks, vm_object_t object,
+ vm_page_t *ma, int count, int *rbehind, int *rahead)
{
struct buf *bp;
vm_page_t bm, mpred, msucc, p;
@@ -1351,7 +1368,8 @@
KASSERT((object->flags & OBJ_SWAP) != 0,
("%s: object not swappable", __func__));
- if (!swap_pager_haspage(object, ma[0]->pindex, &maxbehind, &maxahead)) {
+ if (!swap_pager_haspage_iter(blks, ma[0]->pindex, &maxbehind,
+ &maxahead)) {
VM_OBJECT_WUNLOCK(object);
return (VM_PAGER_FAIL);
}
@@ -1424,7 +1442,7 @@
vm_object_pip_add(object, count);
pindex = bm->pindex;
- blk = swp_pager_meta_lookup(object, pindex);
+ blk = swp_pager_meta_lookup(blks, pindex);
KASSERT(blk != SWAPBLK_NONE,
("no swap blocking containing %p(%jx)", object, (uintmax_t)pindex));
@@ -1506,9 +1524,12 @@
swap_pager_getpages(vm_object_t object, vm_page_t *ma, int count,
int *rbehind, int *rahead)
{
+ struct pctrie_iter blks;
VM_OBJECT_WLOCK(object);
- return (swap_pager_getpages_locked(object, ma, count, rbehind, rahead));
+ swblk_iter_init_only(&blks, object);
+ return (swap_pager_getpages_locked(&blks, object, ma, count, rbehind,
+ rahead));
}
/*
@@ -1967,7 +1988,7 @@
/* Get the page from swap, and restart the scan. */
vm_object_pip_add(object, 1);
rahead = SWAP_META_PAGES;
- rv = swap_pager_getpages_locked(object, &m, 1,
+ rv = swap_pager_getpages_locked(&blks, object, &m, 1,
NULL, &rahead);
if (rv != VM_PAGER_OK)
panic("%s: read from swap failed: %d",
@@ -2422,20 +2443,11 @@
* busy page.
*/
static daddr_t
-swp_pager_meta_lookup(vm_object_t object, vm_pindex_t pindex)
+swp_pager_meta_lookup(struct pctrie_iter *blks, vm_pindex_t pindex)
{
struct swblk *sb;
- VM_OBJECT_ASSERT_LOCKED(object);
-
- /*
- * The meta data only exists if the object is OBJT_SWAP
- * and even then might not be allocated yet.
- */
- KASSERT((object->flags & OBJ_SWAP) != 0,
- ("Lookup object not swappable"));
-
- sb = swblk_lookup(object, pindex);
+ sb = swblk_iter_lookup(blks, pindex);
if (sb == NULL)
return (SWAPBLK_NONE);
return (sb->d[pindex % SWAP_META_PAGES]);
@@ -2496,7 +2508,7 @@
bool
swap_pager_scan_all_shadowed(vm_object_t object)
{
- struct pctrie_iter backing_blks, backing_pages, pages;
+ struct pctrie_iter backing_blks, backing_pages, blks, pages;
vm_object_t backing_object;
vm_page_t p, pp;
vm_pindex_t backing_offset_index, new_pindex, pi, pi_ubound, ps, pv;
@@ -2516,6 +2528,7 @@
backing_offset_index + object->size);
vm_page_iter_init(&pages, object);
vm_page_iter_init(&backing_pages, backing_object);
+ swblk_iter_init_only(&blks, object);
swblk_iter_init_only(&backing_blks, backing_object);
/*
@@ -2574,7 +2587,8 @@
* required to clear valid and initiate paging.
*/
if ((pp == NULL || vm_page_none_valid(pp)) &&
- !swap_pager_haspage(object, new_pindex, NULL, NULL))
+ !swap_pager_haspage_iter(&blks, new_pindex, NULL,
+ NULL))
break;
if (pi == pv)
vm_page_xunbusy(p);

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 27, 6:07 PM (12 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14360666
Default Alt Text
D47232.diff (5 KB)

Event Timeline