summaryrefslogtreecommitdiffstats
path: root/sys/vm/device_pager.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/vm/device_pager.c')
-rw-r--r--sys/vm/device_pager.c72
1 files changed, 35 insertions, 37 deletions
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 235c917a..b8083df 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)device_pager.c 8.5 (Berkeley) 1/12/94
+ * @(#)device_pager.c 8.1 (Berkeley) 6/11/93
*/
/*
@@ -53,8 +53,8 @@
#include <vm/vm_page.h>
#include <vm/device_pager.h>
-struct pagerlst dev_pager_list; /* list of managed devices */
-struct pglist dev_pager_fakelist; /* list of available vm_page_t's */
+struct pagerlst dev_pager_list; /* list of managed devices */
+struct pglist dev_pager_fakelist; /* list of available vm_page_t's */
#ifdef DEBUG
int dpagerdebug = 0;
@@ -68,11 +68,11 @@ static vm_pager_t dev_pager_alloc
__P((caddr_t, vm_size_t, vm_prot_t, vm_offset_t));
static void dev_pager_dealloc __P((vm_pager_t));
static int dev_pager_getpage
- __P((vm_pager_t, vm_page_t *, int, boolean_t));
+ __P((vm_pager_t, vm_page_t, boolean_t));
static boolean_t dev_pager_haspage __P((vm_pager_t, vm_offset_t));
static void dev_pager_init __P((void));
static int dev_pager_putpage
- __P((vm_pager_t, vm_page_t *, int, boolean_t));
+ __P((vm_pager_t, vm_page_t, boolean_t));
static vm_page_t dev_pager_getfake __P((vm_offset_t));
static void dev_pager_putfake __P((vm_page_t));
@@ -81,9 +81,10 @@ struct pagerops devicepagerops = {
dev_pager_alloc,
dev_pager_dealloc,
dev_pager_getpage,
+ 0,
dev_pager_putpage,
- dev_pager_haspage,
- vm_pager_clusternull
+ 0,
+ dev_pager_haspage
};
static void
@@ -109,7 +110,7 @@ dev_pager_alloc(handle, size, prot, foff)
int (*mapfunc)();
vm_object_t object;
dev_pager_t devp;
- int npages, off;
+ unsigned int npages, off;
#ifdef DEBUG
if (dpagerdebug & DDB_FOLLOW)
@@ -127,7 +128,7 @@ dev_pager_alloc(handle, size, prot, foff)
/*
* Make sure this device can be mapped.
*/
- dev = (dev_t)handle;
+ dev = (dev_t)(u_long)handle;
mapfunc = cdevsw[major(dev)].d_mmap;
if (mapfunc == NULL || mapfunc == enodev || mapfunc == nullop)
return(NULL);
@@ -135,7 +136,7 @@ dev_pager_alloc(handle, size, prot, foff)
/*
* Offset should be page aligned.
*/
- if (foff & PAGE_MASK)
+ if (foff & (PAGE_SIZE-1))
return(NULL);
/*
@@ -169,15 +170,15 @@ top:
pager->pg_handle = handle;
pager->pg_ops = &devicepagerops;
pager->pg_type = PG_DEVICE;
+ pager->pg_data = (caddr_t)devp;
pager->pg_flags = 0;
- pager->pg_data = devp;
TAILQ_INIT(&devp->devp_pglist);
/*
* Allocate object and associate it with the pager.
*/
object = devp->devp_object = vm_object_allocate(0);
vm_object_enter(object, pager);
- vm_object_setpager(object, pager, (vm_offset_t)0, FALSE);
+ vm_object_setpager(object, pager, (vm_offset_t)foff, FALSE);
/*
* Finally, put it on the managed list so other can find it.
* First we re-lookup in case someone else beat us to this
@@ -239,7 +240,7 @@ dev_pager_dealloc(pager)
/*
* Free up our fake pages.
*/
- while ((m = devp->devp_pglist.tqh_first) != NULL) {
+ while (m=devp->devp_pglist.tqh_first) {
TAILQ_REMOVE(&devp->devp_pglist, m, pageq);
dev_pager_putfake(m);
}
@@ -248,39 +249,33 @@ dev_pager_dealloc(pager)
}
static int
-dev_pager_getpage(pager, mlist, npages, sync)
+dev_pager_getpage(pager, m, sync)
vm_pager_t pager;
- vm_page_t *mlist;
- int npages;
+ vm_page_t m;
boolean_t sync;
{
register vm_object_t object;
vm_offset_t offset, paddr;
vm_page_t page;
dev_t dev;
+ int s;
int (*mapfunc)(), prot;
- vm_page_t m;
#ifdef DEBUG
if (dpagerdebug & DDB_FOLLOW)
- printf("dev_pager_getpage(%x, %x, %x, %x)\n",
- pager, mlist, npages, sync);
+ printf("dev_pager_getpage(%x, %x)\n", pager, m);
#endif
- if (npages != 1)
- panic("dev_pager_getpage: cannot handle multiple pages");
- m = *mlist;
-
object = m->object;
- dev = (dev_t)pager->pg_handle;
+ dev = (dev_t)(u_long)pager->pg_handle;
offset = m->offset + object->paging_offset;
prot = PROT_READ; /* XXX should pass in? */
mapfunc = cdevsw[major(dev)].d_mmap;
-#ifdef DIAGNOSTIC
+
if (mapfunc == NULL || mapfunc == enodev || mapfunc == nullop)
panic("dev_pager_getpage: no map function");
-#endif
- paddr = pmap_phys_address((*mapfunc)(dev, (int)offset, prot));
+
+ paddr = pmap_phys_address((*mapfunc)((dev_t)dev, (int)offset, prot));
#ifdef DIAGNOSTIC
if (paddr == -1)
panic("dev_pager_getpage: map function returns error");
@@ -290,13 +285,15 @@ dev_pager_getpage(pager, mlist, npages, sync)
* up the original.
*/
page = dev_pager_getfake(paddr);
- TAILQ_INSERT_TAIL(&((dev_pager_t)pager->pg_data)->devp_pglist, page,
- pageq);
+ TAILQ_INSERT_TAIL(&((dev_pager_t)pager->pg_data)->devp_pglist,
+ page, pageq);
vm_object_lock(object);
vm_page_lock_queues();
vm_page_free(m);
- vm_page_insert(page, object, offset);
vm_page_unlock_queues();
+ s = splhigh();
+ vm_page_insert(page, object, offset);
+ splx(s);
PAGE_WAKEUP(m);
if (offset + PAGE_SIZE > object->size)
object->size = offset + PAGE_SIZE; /* XXX anal */
@@ -306,19 +303,17 @@ dev_pager_getpage(pager, mlist, npages, sync)
}
static int
-dev_pager_putpage(pager, mlist, npages, sync)
+dev_pager_putpage(pager, m, sync)
vm_pager_t pager;
- vm_page_t *mlist;
- int npages;
+ vm_page_t m;
boolean_t sync;
{
#ifdef DEBUG
if (dpagerdebug & DDB_FOLLOW)
- printf("dev_pager_putpage(%x, %x, %x, %x)\n",
- pager, mlist, npages, sync);
+ printf("dev_pager_putpage(%x, %x)\n", pager, m);
#endif
if (pager == NULL)
- return;
+ return 0;
panic("dev_pager_putpage called");
}
@@ -350,9 +345,12 @@ dev_pager_getfake(paddr)
}
m = dev_pager_fakelist.tqh_first;
TAILQ_REMOVE(&dev_pager_fakelist, m, pageq);
+
m->flags = PG_BUSY | PG_CLEAN | PG_FAKE | PG_FICTITIOUS;
- m->phys_addr = paddr;
+
m->wire_count = 1;
+ m->phys_addr = paddr;
+
return(m);
}
OpenPOWER on IntegriCloud