20 files changed, 75 insertions, 69 deletions

diff --git a/sys/geom/cache/g_cache.c b/sys/geom/cache/g_cache.c
index d28c2ad62bad6..05e45e6ea452d 100644
--- a/sys/geom/cache/g_cache.c
+++ b/sys/geom/cache/g_cache.c
@@ -494,7 +494,7 @@ g_cache_create(struct g_class *mp, struct g_provider *pp,
 
 	/* Block size restrictions. */
 	bshift = ffs(md->md_bsize) - 1;
-	if (md->md_bsize == 0 || md->md_bsize > MAXPHYS ||
+	if (md->md_bsize == 0 || md->md_bsize > maxphys ||
 	    md->md_bsize != 1 << bshift ||
 	    (md->md_bsize % pp->sectorsize) != 0) {
 		G_CACHE_DEBUG(0, "Invalid blocksize for provider %s.", pp->name);
diff --git a/sys/geom/eli/g_eli_integrity.c b/sys/geom/eli/g_eli_integrity.c
index d20b753256ddd..4cf982e3ddfa1 100644
--- a/sys/geom/eli/g_eli_integrity.c
+++ b/sys/geom/eli/g_eli_integrity.c
@@ -352,17 +352,17 @@ g_eli_auth_write_done(struct cryptop *crp)
 
 	/*
 	 * We write more than what is requested, so we have to be ready to write
-	 * more than MAXPHYS.
+	 * more than maxphys.
 	 */
 	cbp2 = NULL;
-	if (cbp->bio_length > MAXPHYS) {
+	if (cbp->bio_length > maxphys) {
 		cbp2 = g_duplicate_bio(bp);
-		cbp2->bio_length = cbp->bio_length - MAXPHYS;
-		cbp2->bio_data = cbp->bio_data + MAXPHYS;
-		cbp2->bio_offset = cbp->bio_offset + MAXPHYS;
+		cbp2->bio_length = cbp->bio_length - maxphys;
+		cbp2->bio_data = cbp->bio_data + maxphys;
+		cbp2->bio_offset = cbp->bio_offset + maxphys;
 		cbp2->bio_to = cp->provider;
 		cbp2->bio_done = g_eli_write_done;
-		cbp->bio_length = MAXPHYS;
+		cbp->bio_length = maxphys;
 	}
 	/*
 	 * Send encrypted data to the provider.
@@ -413,17 +413,17 @@ g_eli_auth_read(struct g_eli_softc *sc, struct bio *bp)
 
 	/*
 	 * We read more than what is requested, so we have to be ready to read
-	 * more than MAXPHYS.
+	 * more than maxphys.
 	 */
 	cbp2 = NULL;
-	if (cbp->bio_length > MAXPHYS) {
+	if (cbp->bio_length > maxphys) {
 		cbp2 = g_duplicate_bio(bp);
-		cbp2->bio_length = cbp->bio_length - MAXPHYS;
-		cbp2->bio_data = cbp->bio_data + MAXPHYS;
-		cbp2->bio_offset = cbp->bio_offset + MAXPHYS;
+		cbp2->bio_length = cbp->bio_length - maxphys;
+		cbp2->bio_data = cbp->bio_data + maxphys;
+		cbp2->bio_offset = cbp->bio_offset + maxphys;
 		cbp2->bio_to = cp->provider;
 		cbp2->bio_done = g_eli_read_done;
-		cbp->bio_length = MAXPHYS;
+		cbp->bio_length = maxphys;
 	}
 	/*
 	 * Read encrypted data from provider.
diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index 3dcf8a38a1e20..9c33ab71e6c88 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -377,7 +377,7 @@ g_dev_taste(struct g_class *mp, struct g_provider *pp, int insist __unused)
 	}
 	dev = sc->sc_dev;
 	dev->si_flags |= SI_UNMAPPED;
-	dev->si_iosize_max = MAXPHYS;
+	dev->si_iosize_max = maxphys;
 	error = init_dumpdev(dev);
 	if (error != 0)
 		printf("%s: init_dumpdev() failed (gp->name=%s, error=%d)\n",
@@ -713,14 +713,14 @@ g_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread
 
 		if (zone_args->zone_cmd == DISK_ZONE_REPORT_ZONES) {
 			rep = &zone_args->zone_params.report;
-#define	MAXENTRIES	(MAXPHYS / sizeof(struct disk_zone_rep_entry))
+#define	MAXENTRIES	(maxphys / sizeof(struct disk_zone_rep_entry))
 			if (rep->entries_allocated > MAXENTRIES)
 				rep->entries_allocated = MAXENTRIES;
 			alloc_size = rep->entries_allocated *
 			    sizeof(struct disk_zone_rep_entry);
 			if (alloc_size != 0)
 				new_entries = g_malloc(alloc_size,
-				    M_WAITOK| M_ZERO);
+				    M_WAITOK | M_ZERO);
 			old_entries = rep->entries;
 			rep->entries = new_entries;
 		}
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c
index 0e857aa3ce105..31213f0f2b220 100644
--- a/sys/geom/geom_io.c
+++ b/sys/geom/geom_io.c
@@ -882,7 +882,7 @@ g_read_data(struct g_consumer *cp, off_t offset, off_t length, int *error)
 	int errorc;
 
 	KASSERT(length > 0 && length >= cp->provider->sectorsize &&
-	    length <= MAXPHYS, ("g_read_data(): invalid length %jd",
+	    length <= maxphys, ("g_read_data(): invalid length %jd",
 	    (intmax_t)length));
 
 	bp = g_alloc_bio();
@@ -937,7 +937,7 @@ g_write_data(struct g_consumer *cp, off_t offset, void *ptr, off_t length)
 	int error;
 
 	KASSERT(length > 0 && length >= cp->provider->sectorsize &&
-	    length <= MAXPHYS, ("g_write_data(): invalid length %jd",
+	    length <= maxphys, ("g_write_data(): invalid length %jd",
 	    (intmax_t)length));
 
 	bp = g_alloc_bio();
diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c
index 43c1054968790..0b518d172b5a6 100644
--- a/sys/geom/journal/g_journal.c
+++ b/sys/geom/journal/g_journal.c
@@ -1053,7 +1053,7 @@ g_journal_optimize(struct bio *head)
 			continue;
 		}
 		/* Be sure we don't end up with too big bio. */
-		if (pbp->bio_length + cbp->bio_length > MAXPHYS) {
+		if (pbp->bio_length + cbp->bio_length > maxphys) {
 			pbp = cbp;
 			continue;
 		}
diff --git a/sys/geom/journal/g_journal.h b/sys/geom/journal/g_journal.h
index fa6127537c368..45a6f39f0e53c 100644
--- a/sys/geom/journal/g_journal.h
+++ b/sys/geom/journal/g_journal.h
@@ -215,7 +215,7 @@ struct g_journal_entry {
 #define	GJ_RECORD_HEADER_MAGIC		"GJRHDR"
 #define	GJ_RECORD_HEADER_NENTRIES	(20)
 #define	GJ_RECORD_MAX_SIZE(sc)	\
-	((sc)->sc_jprovider->sectorsize + GJ_RECORD_HEADER_NENTRIES * MAXPHYS)
+	((sc)->sc_jprovider->sectorsize + GJ_RECORD_HEADER_NENTRIES * maxphys)
 #define	GJ_VALIDATE_OFFSET(offset, sc)	do {				\
 	if ((offset) + GJ_RECORD_MAX_SIZE(sc) >= (sc)->sc_jend) {	\
 		(offset) = (sc)->sc_jstart;				\
diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c
index 26962cf175518..350845205485f 100644
--- a/sys/geom/mirror/g_mirror.c
+++ b/sys/geom/mirror/g_mirror.c
@@ -2070,7 +2070,7 @@ g_mirror_sync_reinit(const struct g_mirror_disk *disk, struct bio *bp,
 	bp->bio_to = disk->d_softc->sc_provider;
 	bp->bio_caller1 = (void *)(uintptr_t)idx;
 	bp->bio_offset = offset;
-	bp->bio_length = MIN(MAXPHYS,
+	bp->bio_length = MIN(maxphys,
 	    disk->d_softc->sc_mediasize - bp->bio_offset);
 }
 
@@ -2128,7 +2128,7 @@ g_mirror_sync_start(struct g_mirror_disk *disk)
 		bp = g_alloc_bio();
 		sync->ds_bios[i] = bp;
 
-		bp->bio_data = malloc(MAXPHYS, M_MIRROR, M_WAITOK);
+		bp->bio_data = malloc(maxphys, M_MIRROR, M_WAITOK);
 		bp->bio_caller1 = (void *)(uintptr_t)i;
 		g_mirror_sync_reinit(disk, bp, sync->ds_offset);
 		sync->ds_offset += bp->bio_length;
diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c
index 2cfb5a6c42815..5e383cd357336 100644
--- a/sys/geom/nop/g_nop.c
+++ b/sys/geom/nop/g_nop.c
@@ -381,7 +381,7 @@ g_nop_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp,
 		gctl_error(req, "Invalid secsize for provider %s.", pp->name);
 		return (EINVAL);
 	}
-	if (secsize > MAXPHYS) {
+	if (secsize > maxphys) {
 		gctl_error(req, "secsize is too big.");
 		return (EINVAL);
 	}
diff --git a/sys/geom/part/g_part_apm.c b/sys/geom/part/g_part_apm.c
index 92019c7e4f169..aa008871d58fb 100644
--- a/sys/geom/part/g_part_apm.c
+++ b/sys/geom/part/g_part_apm.c
@@ -582,10 +582,10 @@ g_part_apm_write(struct g_part_table *basetable, struct g_consumer *cp)
 			baseentry = LIST_NEXT(baseentry, gpe_entry);
 	}
 
-	for (index = 0; index < tblsz; index += MAXPHYS / pp->sectorsize) {
+	for (index = 0; index < tblsz; index += maxphys / pp->sectorsize) {
 		error = g_write_data(cp, (1 + index) * pp->sectorsize,
 		    buf + index * pp->sectorsize,
-		    (tblsz - index > MAXPHYS / pp->sectorsize) ? MAXPHYS:
+		    (tblsz - index > maxphys / pp->sectorsize) ? maxphys:
 		    (tblsz - index) * pp->sectorsize);
 		if (error) {
 			g_free(buf);
diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c
index c9eef1c8f7158..89a92977dff61 100644
--- a/sys/geom/part/g_part_gpt.c
+++ b/sys/geom/part/g_part_gpt.c
@@ -552,8 +552,8 @@ gpt_read_tbl(struct g_part_gpt_table *table, struct g_consumer *cp,
 	tblsz = hdr->hdr_entries * hdr->hdr_entsz;
 	sectors = howmany(tblsz, pp->sectorsize);
 	buf = g_malloc(sectors * pp->sectorsize, M_WAITOK | M_ZERO);
-	for (idx = 0; idx < sectors; idx += MAXPHYS / pp->sectorsize) {
-		size = (sectors - idx > MAXPHYS / pp->sectorsize) ?  MAXPHYS:
+	for (idx = 0; idx < sectors; idx += maxphys / pp->sectorsize) {
+		size = (sectors - idx > maxphys / pp->sectorsize) ?  maxphys:
 		    (sectors - idx) * pp->sectorsize;
 		p = g_read_data(cp, (table->lba[elt] + idx) * pp->sectorsize,
 		    size, &error);
@@ -1237,11 +1237,11 @@ g_part_gpt_write(struct g_part_table *basetable, struct g_consumer *cp)
 	crc = crc32(buf, table->hdr->hdr_size);
 	le32enc(buf + 16, crc);
 
-	for (index = 0; index < tblsz; index += MAXPHYS / pp->sectorsize) {
+	for (index = 0; index < tblsz; index += maxphys / pp->sectorsize) {
 		error = g_write_data(cp,
 		    (table->lba[GPT_ELT_PRITBL] + index) * pp->sectorsize,
 		    buf + (index + 1) * pp->sectorsize,
-		    (tblsz - index > MAXPHYS / pp->sectorsize) ? MAXPHYS:
+		    (tblsz - index > maxphys / pp->sectorsize) ? maxphys :
 		    (tblsz - index) * pp->sectorsize);
 		if (error)
 			goto out;
@@ -1259,11 +1259,11 @@ g_part_gpt_write(struct g_part_table *basetable, struct g_consumer *cp)
 	crc = crc32(buf, table->hdr->hdr_size);
 	le32enc(buf + 16, crc);
 
-	for (index = 0; index < tblsz; index += MAXPHYS / pp->sectorsize) {
+	for (index = 0; index < tblsz; index += maxphys / pp->sectorsize) {
 		error = g_write_data(cp,
 		    (table->lba[GPT_ELT_SECTBL] + index) * pp->sectorsize,
 		    buf + (index + 1) * pp->sectorsize,
-		    (tblsz - index > MAXPHYS / pp->sectorsize) ? MAXPHYS:
+		    (tblsz - index > maxphys / pp->sectorsize) ? maxphys :
 		    (tblsz - index) * pp->sectorsize);
 		if (error)
 			goto out;
diff --git a/sys/geom/part/g_part_ldm.c b/sys/geom/part/g_part_ldm.c
index 6debf39d04f7a..e53578f57fee1 100644
--- a/sys/geom/part/g_part_ldm.c
+++ b/sys/geom/part/g_part_ldm.c
@@ -1020,10 +1020,10 @@ ldm_vmdb_parse(struct ldm_db *db, struct g_consumer *cp)
 	pp = cp->provider;
 	size = howmany(db->dh.last_seq * db->dh.size, pp->sectorsize);
 	size -= 1; /* one sector takes vmdb header */
-	for (n = 0; n < size; n += MAXPHYS / pp->sectorsize) {
+	for (n = 0; n < size; n += maxphys / pp->sectorsize) {
 		offset = db->ph.db_offset + db->th.conf_offset + n + 1;
-		sectors = (size - n) > (MAXPHYS / pp->sectorsize) ?
-		    MAXPHYS / pp->sectorsize: size - n;
+		sectors = (size - n) > (maxphys / pp->sectorsize) ?
+		    maxphys / pp->sectorsize : size - n;
 		/* read VBLKs */
 		buf = g_read_data(cp, offset * pp->sectorsize,
 		    sectors * pp->sectorsize, &error);
diff --git a/sys/geom/raid/md_ddf.c b/sys/geom/raid/md_ddf.c
index 68c058da61f44..0a3ec6637337a 100644
--- a/sys/geom/raid/md_ddf.c
+++ b/sys/geom/raid/md_ddf.c
@@ -1160,12 +1160,12 @@ hdrerror:
 		    (GET16(meta, hdr->Configuration_Record_Length) * ss - 512) / 12));
 	}
 
-	if (GET32(meta, hdr->cd_length) * ss >= MAXPHYS ||
-	    GET32(meta, hdr->pdr_length) * ss >= MAXPHYS ||
-	    GET32(meta, hdr->vdr_length) * ss >= MAXPHYS ||
-	    GET32(meta, hdr->cr_length) * ss >= MAXPHYS ||
-	    GET32(meta, hdr->pdd_length) * ss >= MAXPHYS ||
-	    GET32(meta, hdr->bbmlog_length) * ss >= MAXPHYS) {
+	if (GET32(meta, hdr->cd_length) * ss >= maxphys ||
+	    GET32(meta, hdr->pdr_length) * ss >= maxphys ||
+	    GET32(meta, hdr->vdr_length) * ss >= maxphys ||
+	    GET32(meta, hdr->cr_length) * ss >= maxphys ||
+	    GET32(meta, hdr->pdd_length) * ss >= maxphys ||
+	    GET32(meta, hdr->bbmlog_length) * ss >= maxphys) {
 		G_RAID_DEBUG(1, "%s: Blocksize is too big.", pp->name);
 		goto hdrerror;
 	}
diff --git a/sys/geom/raid/md_promise.c b/sys/geom/raid/md_promise.c
index bec52d26a7c66..aacf0106ea155 100644
--- a/sys/geom/raid/md_promise.c
+++ b/sys/geom/raid/md_promise.c
@@ -344,7 +344,7 @@ promise_meta_read(struct g_consumer *cp, struct promise_raid_conf **metaarr)
 	pp = cp->provider;
 	subdisks = 0;
 
-	if (pp->sectorsize * 4 > MAXPHYS) {
+	if (pp->sectorsize * 4 > maxphys) {
 		G_RAID_DEBUG(1, "%s: Blocksize is too big.", pp->name);
 		return (subdisks);
 	}
diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c
index bf4f1cab86633..5fe67c00068d7 100644
--- a/sys/geom/raid3/g_raid3.c
+++ b/sys/geom/raid3/g_raid3.c
@@ -1723,7 +1723,7 @@ g_raid3_sync_request(struct bio *bp)
 		g_reset_bio(bp);
 		bp->bio_cmd = BIO_READ;
 		bp->bio_offset = sync->ds_offset * (sc->sc_ndisks - 1);
-		bp->bio_length = MIN(MAXPHYS, sc->sc_mediasize - bp->bio_offset);
+		bp->bio_length = MIN(maxphys, sc->sc_mediasize - bp->bio_offset);
 		sync->ds_offset += bp->bio_length / (sc->sc_ndisks - 1);
 		bp->bio_done = g_raid3_sync_done;
 		bp->bio_data = data;
@@ -1752,7 +1752,7 @@ g_raid3_sync_request(struct bio *bp)
 			if (boffset < moffset)
 				moffset = boffset;
 		}
-		if (sync->ds_offset_done + (MAXPHYS * 100) < moffset) {
+		if (sync->ds_offset_done + maxphys * 100 < moffset) {
 			/* Update offset_done on every 100 blocks. */
 			sync->ds_offset_done = moffset;
 			g_raid3_update_metadata(disk);
@@ -2241,10 +2241,10 @@ g_raid3_sync_start(struct g_raid3_softc *sc)
 		disk->d_sync.ds_bios[n] = bp;
 		bp->bio_parent = NULL;
 		bp->bio_cmd = BIO_READ;
-		bp->bio_data = malloc(MAXPHYS, M_RAID3, M_WAITOK);
+		bp->bio_data = malloc(maxphys, M_RAID3, M_WAITOK);
 		bp->bio_cflags = 0;
 		bp->bio_offset = disk->d_sync.ds_offset * (sc->sc_ndisks - 1);
-		bp->bio_length = MIN(MAXPHYS, sc->sc_mediasize - bp->bio_offset);
+		bp->bio_length = MIN(maxphys, sc->sc_mediasize - bp->bio_offset);
 		disk->d_sync.ds_offset += bp->bio_length / (sc->sc_ndisks - 1);
 		bp->bio_done = g_raid3_sync_done;
 		bp->bio_from = disk->d_sync.ds_consumer;
@@ -2909,7 +2909,7 @@ g_raid3_read_metadata(struct g_consumer *cp, struct g_raid3_metadata *md)
 		    cp->provider->name);
 		return (error);
 	}
-	if (md->md_sectorsize > MAXPHYS) {
+	if (md->md_sectorsize > maxphys) {
 		G_RAID3_DEBUG(0, "The blocksize is too big.");
 		return (EINVAL);
 	}
diff --git a/sys/geom/shsec/g_shsec.c b/sys/geom/shsec/g_shsec.c
index 4e359bee4d254..a3b2f59d05553 100644
--- a/sys/geom/shsec/g_shsec.c
+++ b/sys/geom/shsec/g_shsec.c
@@ -73,11 +73,12 @@ struct g_class g_shsec_class = {
 SYSCTL_DECL(_kern_geom);
 static SYSCTL_NODE(_kern_geom, OID_AUTO, shsec, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
     "GEOM_SHSEC stuff");
-static u_int g_shsec_debug = 0;
+static u_int g_shsec_debug;
 SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, debug, CTLFLAG_RWTUN, &g_shsec_debug, 0,
     "Debug level");
-static u_int g_shsec_maxmem = MAXPHYS * 100;
-SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, maxmem, CTLFLAG_RDTUN, &g_shsec_maxmem,
+static u_long g_shsec_maxmem;
+SYSCTL_ULONG(_kern_geom_shsec, OID_AUTO, maxmem,
+    CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &g_shsec_maxmem,
     0, "Maximum memory that can be allocated for I/O (in bytes)");
 static u_int g_shsec_alloc_failed = 0;
 SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, alloc_failed, CTLFLAG_RD,
@@ -113,10 +114,12 @@ static void
 g_shsec_init(struct g_class *mp __unused)
 {
 
-	g_shsec_zone = uma_zcreate("g_shsec_zone", MAXPHYS, NULL, NULL, NULL,
+	g_shsec_maxmem = maxphys * 100;
+	TUNABLE_ULONG_FETCH("kern.geom.shsec.maxmem,", &g_shsec_maxmem);
+	g_shsec_zone = uma_zcreate("g_shsec_zone", maxphys, NULL, NULL, NULL,
 	    NULL, 0, 0);
-	g_shsec_maxmem -= g_shsec_maxmem % MAXPHYS;
-	uma_zone_set_max(g_shsec_zone, g_shsec_maxmem / MAXPHYS);
+	g_shsec_maxmem -= g_shsec_maxmem % maxphys;
+	uma_zone_set_max(g_shsec_zone, g_shsec_maxmem / maxphys);
 }
 
 static void
diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c
index 0a76a1d8a0741..22cc16753d9a1 100644
--- a/sys/geom/stripe/g_stripe.c
+++ b/sys/geom/stripe/g_stripe.c
@@ -92,9 +92,10 @@ SYSCTL_PROC(_kern_geom_stripe, OID_AUTO, fast,
     CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NEEDGIANT, NULL, 0,
     g_sysctl_stripe_fast, "I",
     "Fast, but memory-consuming, mode");
-static u_int g_stripe_maxmem = MAXPHYS * 100;
-SYSCTL_UINT(_kern_geom_stripe, OID_AUTO, maxmem, CTLFLAG_RDTUN, &g_stripe_maxmem,
-    0, "Maximum memory that can be allocated in \"fast\" mode (in bytes)");
+static u_long g_stripe_maxmem;
+SYSCTL_ULONG(_kern_geom_stripe, OID_AUTO, maxmem,
+    CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &g_stripe_maxmem, 0,
+    "Maximum memory that can be allocated in \"fast\" mode (in bytes)");
 static u_int g_stripe_fast_failed = 0;
 SYSCTL_UINT(_kern_geom_stripe, OID_AUTO, fast_failed, CTLFLAG_RD,
     &g_stripe_fast_failed, 0, "How many times \"fast\" mode failed");
@@ -129,10 +130,12 @@ static void
 g_stripe_init(struct g_class *mp __unused)
 {
 
-	g_stripe_zone = uma_zcreate("g_stripe_zone", MAXPHYS, NULL, NULL,
+	g_stripe_maxmem = maxphys * 100;
+	TUNABLE_ULONG_FETCH("kern.geom.stripe.maxmem,", &g_stripe_maxmem);
+	g_stripe_zone = uma_zcreate("g_stripe_zone", maxphys, NULL, NULL,
 	    NULL, NULL, 0, 0);
-	g_stripe_maxmem -= g_stripe_maxmem % MAXPHYS;
-	uma_zone_set_max(g_stripe_zone, g_stripe_maxmem / MAXPHYS);
+	g_stripe_maxmem -= g_stripe_maxmem % maxphys;
+	uma_zone_set_max(g_stripe_zone, g_stripe_maxmem / maxphys);
 }
 
 static void
@@ -633,7 +636,7 @@ g_stripe_start(struct bio *bp)
 	 * Do use "fast" mode when:
 	 * 1. "Fast" mode is ON.
 	 * and
-	 * 2. Request size is less than or equal to MAXPHYS,
+	 * 2. Request size is less than or equal to maxphys,
 	 *    which should always be true.
 	 * and
 	 * 3. Request size is bigger than stripesize * ndisks. If it isn't,
@@ -644,7 +647,7 @@ g_stripe_start(struct bio *bp)
 	 * and
 	 * 5. It is not a BIO_DELETE.
 	 */
-	if (g_stripe_fast && bp->bio_length <= MAXPHYS &&
+	if (g_stripe_fast && bp->bio_length <= maxphys &&
 	    bp->bio_length >= stripesize * sc->sc_ndisks &&
 	    (bp->bio_flags & BIO_UNMAPPED) == 0 &&
 	    bp->bio_cmd != BIO_DELETE) {
diff --git a/sys/geom/uzip/g_uzip.c b/sys/geom/uzip/g_uzip.c
index bbb6b3c215f87..333f16910c5a1 100644
--- a/sys/geom/uzip/g_uzip.c
+++ b/sys/geom/uzip/g_uzip.c
@@ -136,7 +136,7 @@ SYSCTL_UINT(_kern_geom_uzip, OID_AUTO, debug_block, CTLFLAG_RWTUN,
 /*
  * Maximum allowed valid block size (to prevent foot-shooting)
  */
-#define	MAX_BLKSZ	(MAXPHYS)
+#define	MAX_BLKSZ	(maxphys)
 
 static char CLOOP_MAGIC_START[] = "#!/bin/sh\n";
 
@@ -292,7 +292,7 @@ g_uzip_request(struct g_geom *gp, struct bio *bp)
 	bp2->bio_offset = TOFF_2_BOFF(sc, pp, start_blk);
 	while (1) {
 		bp2->bio_length = TLEN_2_BLEN(sc, pp, bp2, end_blk - 1);
-		if (bp2->bio_length <= MAXPHYS) {
+		if (bp2->bio_length <= maxphys) {
 			break;
 		}
 		if (end_blk == (start_blk + 1)) {
@@ -791,7 +791,7 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
 		goto e4;
 	}
 	if (sc->blksz > MAX_BLKSZ) {
-		printf("%s: block size (%u) should not be larger than %d.\n",
+		printf("%s: block size (%u) should not be larger than %lu.\n",
 		    gp->name, sc->blksz, MAX_BLKSZ);
 	}
 	total_offsets = sc->nblocks + 1;
diff --git a/sys/geom/vinum/geom_vinum_var.h b/sys/geom/vinum/geom_vinum_var.h
index f6a367db59edf..2bd70875f6cd8 100644
--- a/sys/geom/vinum/geom_vinum_var.h
+++ b/sys/geom/vinum/geom_vinum_var.h
@@ -106,7 +106,7 @@
 
 /* Synchronization/initialization request sizes. */
 #define	GV_MIN_SYNCSIZE		512
-#define	GV_MAX_SYNCSIZE		MAXPHYS
+#define	GV_MAX_SYNCSIZE		maxphys
 #define	GV_DFLT_SYNCSIZE	65536
 
 /* Flags for BIOs, as they are processed within vinum. */
diff --git a/sys/geom/virstor/g_virstor.c b/sys/geom/virstor/g_virstor.c
index 98892bcd30e4b..e27d92b509d4c 100644
--- a/sys/geom/virstor/g_virstor.c
+++ b/sys/geom/virstor/g_virstor.c
@@ -148,8 +148,8 @@ g_virstor_init(struct g_class *mp __unused)
 {
 
 	/* Catch map struct size mismatch at compile time; Map entries must
-	 * fit into MAXPHYS exactly, with no wasted space. */
-	CTASSERT(VIRSTOR_MAP_BLOCK_ENTRIES*VIRSTOR_MAP_ENTRY_SIZE == MAXPHYS);
+	 * fit into maxphys exactly, with no wasted space. */
+	MPASS(VIRSTOR_MAP_BLOCK_ENTRIES * VIRSTOR_MAP_ENTRY_SIZE == maxphys);
 
 	/* Init UMA zones, TAILQ's, other global vars */
 }
@@ -1245,7 +1245,7 @@ virstor_check_and_run(struct g_virstor_softc *sc)
 		struct g_virstor_map_entry *mapbuf;
 		size_t bs;
 
-		bs = MIN(MAXPHYS, sc->map_size - count);
+		bs = MIN(maxphys, sc->map_size - count);
 		if (bs % sc->sectorsize != 0) {
 			/* Check for alignment errors */
 			bs = rounddown(bs, sc->sectorsize);
diff --git a/sys/geom/virstor/g_virstor.h b/sys/geom/virstor/g_virstor.h
index 9f2886bafc410..0d918ac70a0cb 100644
--- a/sys/geom/virstor/g_virstor.h
+++ b/sys/geom/virstor/g_virstor.h
@@ -41,8 +41,8 @@ struct virstor_map_entry {
 };
 
 #define	VIRSTOR_MAP_ENTRY_SIZE (sizeof(struct virstor_map_entry))
-#define	VIRSTOR_MAP_BLOCK_ENTRIES (MAXPHYS / VIRSTOR_MAP_ENTRY_SIZE)
-/* Struct size is guarded by CTASSERT in main source */
+#define	VIRSTOR_MAP_BLOCK_ENTRIES (maxphys / VIRSTOR_MAP_ENTRY_SIZE)
+/* Struct size is guarded by MPASS in main source */
 
 #ifdef _KERNEL