summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authortls <tls@NetBSD.org>2003-04-23 00:55:17 +0000
committertls <tls@NetBSD.org>2003-04-23 00:55:17 +0000
commit85c8cfb5330642bbfa98181f4ff2e70349fbb013 (patch)
tree6c9a7dd0f70802f8c91c1e755938416b80702ff6 /sys
parent7064ed78f95608287901856489484bb84e771744 (diff)
Correct use of MAXBSIZE where MAXPHYS was intended. This is a necessary
first step towards per-device MAXPHYS, and has the beneficial side effect of allowing clustering to MAXPHYS even on systems that need to run with a reduced MAXBSIZE to get more metadata buffers.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/aic7xxx.c6
-rw-r--r--sys/dev/ic/mpt_netbsd.c6
-rw-r--r--sys/miscfs/genfs/genfs_vnops.c7
-rw-r--r--sys/ufs/ufs/ufs_bmap.c6
-rw-r--r--sys/uvm/uvm_io.c6
-rw-r--r--sys/uvm/uvm_pager.c9
-rw-r--r--sys/uvm/uvm_pdaemon.c10
7 files changed, 27 insertions, 23 deletions
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index aa4f405f4cb..20341d61b28 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx.c,v 1.102 2003/04/21 22:00:42 fvdl Exp $ */
+/* $NetBSD: aic7xxx.c,v 1.103 2003/04/23 00:55:17 tls Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.102 2003/04/21 22:00:42 fvdl Exp $
+ * $Id: aic7xxx.c,v 1.103 2003/04/23 00:55:17 tls Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
*
@@ -4359,7 +4359,7 @@ ahc_alloc_scbs(struct ahc_softc *ahc)
next_scb->flags = SCB_FREE;
error = bus_dmamap_create(ahc->parent_dmat,
- AHC_MAXTRANSFER_SIZE, AHC_NSEG, MAXBSIZE, 0,
+ AHC_MAXTRANSFER_SIZE, AHC_NSEG, MAXPHYS, 0,
BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW,
&next_scb->dmamap);
if (error != 0)
diff --git a/sys/dev/ic/mpt_netbsd.c b/sys/dev/ic/mpt_netbsd.c
index 5cc0bd9e2e3..d50c84c7978 100644
--- a/sys/dev/ic/mpt_netbsd.c
+++ b/sys/dev/ic/mpt_netbsd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt_netbsd.c,v 1.4 2003/04/16 23:17:30 thorpej Exp $ */
+/* $NetBSD: mpt_netbsd.c,v 1.5 2003/04/23 00:55:19 tls Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -246,8 +246,8 @@ mpt_dma_mem_alloc(mpt_softc_t *mpt)
req->sense_pbuf = (pptr - MPT_SENSE_SIZE);
req->sense_vbuf = (vptr - MPT_SENSE_SIZE);
- error = bus_dmamap_create(mpt->sc_dmat, MAXBSIZE,
- MPT_SGL_MAX, MAXBSIZE, 0, 0, &req->dmap);
+ error = bus_dmamap_create(mpt->sc_dmat, MAXPHYS,
+ MPT_SGL_MAX, MAXPHYS, 0, 0, &req->dmap);
if (error) {
aprint_error("%s: unable to create req %d DMA map, "
"error = %d\n", mpt->sc_dev.dv_xname, i, error);
diff --git a/sys/miscfs/genfs/genfs_vnops.c b/sys/miscfs/genfs/genfs_vnops.c
index 347d44befcc..1742e4d9f64 100644
--- a/sys/miscfs/genfs/genfs_vnops.c
+++ b/sys/miscfs/genfs/genfs_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_vnops.c,v 1.75 2003/04/10 21:53:33 jdolecek Exp $ */
+/* $NetBSD: genfs_vnops.c,v 1.76 2003/04/23 00:55:19 tls Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.75 2003/04/10 21:53:33 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.76 2003/04/23 00:55:19 tls Exp $");
#include "opt_nfsserver.h"
@@ -1035,7 +1035,8 @@ genfs_putpages(void *v)
off_t endoff = ap->a_offhi;
off_t off;
int flags = ap->a_flags;
- const int maxpages = MAXBSIZE >> PAGE_SHIFT;
+ /* Even for strange MAXPHYS, the shift rounds down to a page */
+ const int maxpages = MAXPHYS >> PAGE_SHIFT;
int i, s, error, npages, nback;
int freeflag;
struct vm_page *pgs[maxpages], *pg, *nextpg, *tpg, curmp, endmp;
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 006c9c5f1ab..8f7d5fc31bc 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_bmap.c,v 1.21 2003/04/02 10:39:44 fvdl Exp $ */
+/* $NetBSD: ufs_bmap.c,v 1.22 2003/04/23 00:55:21 tls Exp $ */
/*
* Copyright (c) 1989, 1991, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_bmap.c,v 1.21 2003/04/02 10:39:44 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_bmap.c,v 1.22 2003/04/23 00:55:21 tls Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -136,7 +136,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
* don't create a block larger than the device can handle.
*/
*runp = 0;
- maxrun = MAXBSIZE / mp->mnt_stat.f_iosize - 1;
+ maxrun = MAXPHYS / mp->mnt_stat.f_iosize - 1;
}
if (bn >= 0 && bn < NDADDR) {
diff --git a/sys/uvm/uvm_io.c b/sys/uvm/uvm_io.c
index e2e734b207c..156348cdd0f 100644
--- a/sys/uvm/uvm_io.c
+++ b/sys/uvm/uvm_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_io.c,v 1.17 2001/11/10 07:37:00 lukem Exp $ */
+/* $NetBSD: uvm_io.c,v 1.18 2003/04/23 00:55:21 tls Exp $ */
/*
*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_io.c,v 1.17 2001/11/10 07:37:00 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_io.c,v 1.18 2003/04/23 00:55:21 tls Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,7 +94,7 @@ uvm_io(map, uio)
togo = togo - (endva - VM_MAXUSER_ADDRESS + 1);
pageoffset = baseva & PAGE_MASK;
baseva = trunc_page(baseva);
- chunksz = MIN(round_page(togo + pageoffset), MAXBSIZE);
+ chunksz = MIN(round_page(togo + pageoffset), trunc_page(MAXPHYS));
error = 0;
/*
diff --git a/sys/uvm/uvm_pager.c b/sys/uvm/uvm_pager.c
index 33f21be4edf..ec4f1c9b31d 100644
--- a/sys/uvm/uvm_pager.c
+++ b/sys/uvm/uvm_pager.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pager.c,v 1.59 2002/11/09 20:09:52 thorpej Exp $ */
+/* $NetBSD: uvm_pager.c,v 1.60 2003/04/23 00:55:22 tls Exp $ */
/*
*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.59 2002/11/09 20:09:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.60 2003/04/23 00:55:22 tls Exp $");
#include "opt_uvmhist.h"
@@ -95,7 +95,7 @@ uvm_pager_init()
FALSE, NULL);
simple_lock_init(&pager_map_wanted_lock);
pager_map_wanted = FALSE;
- emergva = uvm_km_valloc(kernel_map, MAXBSIZE);
+ emergva = uvm_km_valloc(kernel_map, round_page(MAXPHYS));
emerginuse = FALSE;
/*
@@ -162,7 +162,8 @@ ReStart:
emerginuse = TRUE;
simple_unlock(&pager_map_wanted_lock);
kva = emergva;
- KASSERT(npages <= MAXBSIZE >> PAGE_SHIFT);
+ /* The shift implicitly truncates to PAGE_SIZE */
+ KASSERT(npages <= (MAXPHYS >> PAGE_SHIFT));
goto enter;
}
if ((flags & UVMPAGER_MAPIN_WAITOK) == 0) {
diff --git a/sys/uvm/uvm_pdaemon.c b/sys/uvm/uvm_pdaemon.c
index 62649e0c6f5..053adffe2eb 100644
--- a/sys/uvm/uvm_pdaemon.c
+++ b/sys/uvm/uvm_pdaemon.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdaemon.c,v 1.50 2003/02/25 00:22:20 simonb Exp $ */
+/* $NetBSD: uvm_pdaemon.c,v 1.51 2003/04/23 00:55:22 tls Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.50 2003/02/25 00:22:20 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.51 2003/04/23 00:55:22 tls Exp $");
#include "opt_uvmhist.h"
@@ -362,7 +362,7 @@ uvmpd_scan_inactive(pglst)
struct vm_page *p, *nextpg = NULL; /* Quell compiler warning */
struct uvm_object *uobj;
struct vm_anon *anon;
- struct vm_page *swpps[MAXBSIZE >> PAGE_SHIFT];
+ struct vm_page *swpps[round_page(MAXPHYS) >> PAGE_SHIFT];
struct simplelock *slock;
int swnpages, swcpages;
int swslot;
@@ -621,7 +621,9 @@ uvmpd_scan_inactive(pglst)
*/
if (swslot == 0) {
- swnpages = MAXBSIZE >> PAGE_SHIFT;
+ /* Even with strange MAXPHYS, the shift
+ implicitly rounds down to a page. */
+ swnpages = MAXPHYS >> PAGE_SHIFT;
swslot = uvm_swap_alloc(&swnpages, TRUE);
if (swslot == 0) {
simple_unlock(slock);