git: 39996120a019 - stable/14 - Fix new users of MAXPHYS and hide it from the kernel namespace

[Konstantin Belousov]

The branch stable/14 has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=39996120a019b620b89fea74f5fb77cfc0d80856

commit 39996120a019b620b89fea74f5fb77cfc0d80856
Author:     Andrew Gallatin <galla...@freebsd.org>
AuthorDate: 2024-04-29 23:11:56 +0000
Commit:     Konstantin Belousov <k...@freebsd.org>
CommitDate: 2025-07-09 00:28:28 +0000

    Fix new users of MAXPHYS and hide it from the kernel namespace
    
    This is partial MFC, that changes the kernel consumers to use maxphys
    instead of MAXPHYS, but leaves the header rearrangement out.
    
    (cherry picked from commit 13a5a46c49d0ec3e10e5476ad763947f165052e2)
---
 sys/compat/linux/linux_socket.c | 2 +-
 sys/dev/md/md.c                 | 6 +++---
 sys/dev/rtsx/rtsx.c             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index 4fcdd9517bda..ee93ba9a6034 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -2468,7 +2468,7 @@ sendfile_fallback(struct thread *td, struct file *fp, 
l_int out,
                out_offset = 0;
 
        flags = FOF_OFFSET | FOF_NOUPDATE;
-       bufsz = min(count, MAXPHYS);
+       bufsz = min(count, maxphys);
        buf = malloc(bufsz, M_LINUX, M_WAITOK);
        bytes_sent = 0;
        while (bytes_sent < count) {
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index f6634c709225..27cf401234ac 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -963,7 +963,7 @@ unmapped_step:
                    PAGE_MASK))));
                iolen = min(ptoa(npages) - (ma_offs & PAGE_MASK), len);
                KASSERT(iolen > 0, ("zero iolen"));
-               KASSERT(npages <= atop(MAXPHYS + PAGE_SIZE),
+               KASSERT(npages <= atop(maxphys + PAGE_SIZE),
                    ("npages %d too large", npages));
                pmap_qenter(sc->kva, &bp->bio_ma[atop(ma_offs)], npages);
                aiov.iov_base = (void *)(sc->kva + (ma_offs & PAGE_MASK));
@@ -1493,7 +1493,7 @@ mdcreate_vnode(struct md_s *sc, struct md_req *mdr, 
struct thread *td)
                goto bad;
        }
 
-       sc->kva = kva_alloc(MAXPHYS + PAGE_SIZE);
+       sc->kva = kva_alloc(maxphys + PAGE_SIZE);
        return (0);
 bad:
        VOP_UNLOCK(nd.ni_vp);
@@ -1553,7 +1553,7 @@ mddestroy(struct md_s *sc, struct thread *td)
        if (sc->uma)
                uma_zdestroy(sc->uma);
        if (sc->kva)
-               kva_free(sc->kva, MAXPHYS + PAGE_SIZE);
+               kva_free(sc->kva, maxphys + PAGE_SIZE);
 
        LIST_REMOVE(sc, list);
        free_unr(md_uh, sc->unit);
diff --git a/sys/dev/rtsx/rtsx.c b/sys/dev/rtsx/rtsx.c
index 461f39e3d3c4..44c15bdec60d 100644
--- a/sys/dev/rtsx/rtsx.c
+++ b/sys/dev/rtsx/rtsx.c
@@ -312,7 +312,7 @@ static int  rtsx_resume(device_t dev);
 #define        RTSX_DMA_ALIGN          4
 #define        RTSX_HOSTCMD_MAX        256
 #define        RTSX_DMA_CMD_BIFSIZE    (sizeof(uint32_t) * RTSX_HOSTCMD_MAX)
-#define        RTSX_DMA_DATA_BUFSIZE   MAXPHYS
+#define        RTSX_DMA_DATA_BUFSIZE   maxphys
 
 #define        ISSET(t, f) ((t) & (f))
 
@@ -2767,7 +2767,7 @@ rtsx_xfer(struct rtsx_softc *sc, struct mmc_command *cmd)
                              (unsigned long)cmd->data->len, (unsigned 
long)cmd->data->xfer_len);
 
        if (cmd->data->len > RTSX_DMA_DATA_BUFSIZE) {
-               device_printf(sc->rtsx_dev, "rtsx_xfer() length too large: %ld 
> %d\n",
+               device_printf(sc->rtsx_dev, "rtsx_xfer() length too large: %ld 
> %ld\n",
                              (unsigned long)cmd->data->len, 
RTSX_DMA_DATA_BUFSIZE);
                cmd->error = MMC_ERR_INVALID;
                return (MMC_ERR_INVALID);