Page MenuHomeFreeBSD
Differential D48450

Centralize and simpify implemention of some VM macros
ClosedPublic
Actions

Authored by jhb on Jan 13 2025, 7:27 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Aug 26, 10:04 AM
Unknown Object (File)
Sat, Aug 2, 8:51 PM
Unknown Object (File)
Jul 5 2025, 5:50 AM
Unknown Object (File)
Jul 4 2025, 12:09 AM
Unknown Object (File)
Jul 1 2025, 9:02 PM
Unknown Object (File)
Jun 27 2025, 8:58 PM
Unknown Object (File)
Jun 27 2025, 3:19 AM
Unknown Object (File)
Jun 18 2025, 3:18 AM
View All 37 Files
Subscribers
emaste
imp
jhibbits
riscv

Details

Reviewers
kib
brooks
markj
andrew
manu
Commits
rG660331da7a75: Centralize and simpify implemention of some VM macros
Summary

These macros have substantially identical implementations on each
platform. Use roundup2/rounddown2 for round_page/trunc_page.

This version standardizes on not adding an explicit cast as that
appears to be required on at least one powerpc port. A couple of
tweaks were required to make this work.

Obtained from: CheriBSD

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 61705
Build 58589: arc lint + arc unit

Revision Contents
Changeset List

PathSize
sys/
amd64/
amd64/
2 lines
include/
7 lines
arm/
arm/
3 lines
include/
7 lines
arm64/
include/
8 lines
i386/
include/
7 lines
powerpc/
include/
7 lines
riscv/
include/
8 lines
sys/
11 lines
usr.bin/
systat/
3 lines

Diff 149204

View Options

sys/amd64/amd64/pmap.c

Show All 36 Lines
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/pcpu.h> #include <sys/pcpu.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/socketvar.h> #include <sys/socketvar.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <netinet/tcp.h>
#include <rpc/rpc.h> #include <rpc/rpc.h>
#include <rpc/rpc_com.h> #include <rpc/rpc_com.h>
#include <rpc/krpc.h> #include <rpc/krpc.h>
#include <rpc/rpcsec_tls.h> #include <rpc/rpcsec_tls.h>
static enum clnt_stat clnt_reconnect_call(CLIENT *, struct rpc_callextra *, static enum clnt_stat clnt_reconnect_call(CLIENT *, struct rpc_callextra *,
rpcproc_t, struct mbuf *, struct mbuf **, struct timeval); rpcproc_t, struct mbuf *, struct mbuf **, struct timeval);
static void clnt_reconnect_geterr(CLIENT *, struct rpc_err *); static void clnt_reconnect_geterr(CLIENT *, struct rpc_err *);
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Linesclnt_reconnect_create(
rc->rc_retries = INT_MAX; rc->rc_retries = INT_MAX;
rc->rc_privport = FALSE; rc->rc_privport = FALSE;
rc->rc_waitchan = "rpcrecv"; rc->rc_waitchan = "rpcrecv";
rc->rc_intr = 0; rc->rc_intr = 0;
rc->rc_connecting = FALSE; rc->rc_connecting = FALSE;
rc->rc_closed = FALSE; rc->rc_closed = FALSE;
rc->rc_ucred = crdup(curthread->td_ucred); rc->rc_ucred = crdup(curthread->td_ucred);
rc->rc_client = NULL; rc->rc_client = NULL;
rc->rc_ddp = false;
rc->rc_tls = false; rc->rc_tls = false;
rc->rc_tlscertname = NULL; rc->rc_tlscertname = NULL;
rc->rc_reconcall = NULL; rc->rc_reconcall = NULL;
rc->rc_reconarg = NULL; rc->rc_reconarg = NULL;
cl->cl_refs = 1; cl->cl_refs = 1;
cl->cl_ops = &clnt_reconnect_ops; cl->cl_ops = &clnt_reconnect_ops;
cl->cl_private = (caddr_t)(void *)rc; cl->cl_private = (caddr_t)(void *)rc;
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Lines if (rc->rc_tls && newclient != NULL) {
rpc_createerr.cf_error.re_errno = 0; rpc_createerr.cf_error.re_errno = 0;
CLNT_CLOSE(newclient); CLNT_CLOSE(newclient);
CLNT_RELEASE(newclient); CLNT_RELEASE(newclient);
newclient = NULL; newclient = NULL;
td->td_ucred = oldcred; td->td_ucred = oldcred;
goto out; goto out;
} }
} }
if (rc->rc_ddp && newclient != NULL) {
int optval = 1;
(void)so_setsockopt(so, IPPROTO_TCP, TCP_USE_DDP,
&optval, sizeof(optval));
}
rmacklemUnsubmitted
Not Done
Inline Actions

Normally the clnt_rc.c (reconnect layer) would
do a CLSET_TCP_DDP and the so_setsockopt()
would be done for CLSET_TCP_DDP in clnt_vc.c
and ignored in clnt_dg.c.

I've never been much of an object oriented guy,
but the Sun folk loved these layers.

rmacklem: Normally the clnt_rc.c (reconnect layer) would do a CLSET_TCP_DDP and the so_setsockopt() would…
if (newclient != NULL && rc->rc_reconcall != NULL) if (newclient != NULL && rc->rc_reconcall != NULL)
(*rc->rc_reconcall)(newclient, rc->rc_reconarg, (*rc->rc_reconcall)(newclient, rc->rc_reconarg,
rc->rc_ucred); rc->rc_ucred);
} }
td->td_ucred = oldcred; td->td_ucred = oldcred;
if (!newclient) { if (!newclient) {
soclose(so); soclose(so);
▲ Show 20 Lines • Show All 292 Lines • ▼ Show 20 Lines case CLSET_TLSCERTNAME:
rc->rc_tlscertname = mem_alloc(slen); rc->rc_tlscertname = mem_alloc(slen);
strlcpy(rc->rc_tlscertname, info, slen); strlcpy(rc->rc_tlscertname, info, slen);
break; break;
case CLSET_RECONUPCALL: case CLSET_RECONUPCALL:
upcp = (struct rpc_reconupcall *)info; upcp = (struct rpc_reconupcall *)info;
rc->rc_reconcall = upcp->call; rc->rc_reconcall = upcp->call;
rc->rc_reconarg = upcp->arg; rc->rc_reconarg = upcp->arg;
break;
case CLSET_DDP:
rc->rc_ddp = true;
break; break;
default: default:
return (FALSE); return (FALSE);
} }
return (TRUE); return (TRUE);
} }
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines
View Options

sys/amd64/include/param.h

Show All 36 Lines
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/pcpu.h> #include <sys/pcpu.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/socketvar.h> #include <sys/socketvar.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <netinet/tcp.h>
#include <rpc/rpc.h> #include <rpc/rpc.h>
#include <rpc/rpc_com.h> #include <rpc/rpc_com.h>
#include <rpc/krpc.h> #include <rpc/krpc.h>
#include <rpc/rpcsec_tls.h> #include <rpc/rpcsec_tls.h>
static enum clnt_stat clnt_reconnect_call(CLIENT *, struct rpc_callextra *, static enum clnt_stat clnt_reconnect_call(CLIENT *, struct rpc_callextra *,
rpcproc_t, struct mbuf *, struct mbuf **, struct timeval); rpcproc_t, struct mbuf *, struct mbuf **, struct timeval);
static void clnt_reconnect_geterr(CLIENT *, struct rpc_err *); static void clnt_reconnect_geterr(CLIENT *, struct rpc_err *);
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Linesclnt_reconnect_create(
rc->rc_retries = INT_MAX; rc->rc_retries = INT_MAX;
rc->rc_privport = FALSE; rc->rc_privport = FALSE;
rc->rc_waitchan = "rpcrecv"; rc->rc_waitchan = "rpcrecv";
rc->rc_intr = 0; rc->rc_intr = 0;
rc->rc_connecting = FALSE; rc->rc_connecting = FALSE;
rc->rc_closed = FALSE; rc->rc_closed = FALSE;
rc->rc_ucred = crdup(curthread->td_ucred); rc->rc_ucred = crdup(curthread->td_ucred);
rc->rc_client = NULL; rc->rc_client = NULL;
rc->rc_ddp = false;
rc->rc_tls = false; rc->rc_tls = false;
rc->rc_tlscertname = NULL; rc->rc_tlscertname = NULL;
rc->rc_reconcall = NULL; rc->rc_reconcall = NULL;
rc->rc_reconarg = NULL; rc->rc_reconarg = NULL;
cl->cl_refs = 1; cl->cl_refs = 1;
cl->cl_ops = &clnt_reconnect_ops; cl->cl_ops = &clnt_reconnect_ops;
cl->cl_private = (caddr_t)(void *)rc; cl->cl_private = (caddr_t)(void *)rc;
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Lines if (rc->rc_tls && newclient != NULL) {
rpc_createerr.cf_error.re_errno = 0; rpc_createerr.cf_error.re_errno = 0;
CLNT_CLOSE(newclient); CLNT_CLOSE(newclient);
CLNT_RELEASE(newclient); CLNT_RELEASE(newclient);
newclient = NULL; newclient = NULL;
td->td_ucred = oldcred; td->td_ucred = oldcred;
goto out; goto out;
} }
} }
if (rc->rc_ddp && newclient != NULL) {
int optval = 1;
(void)so_setsockopt(so, IPPROTO_TCP, TCP_USE_DDP,
&optval, sizeof(optval));
}
rmacklemUnsubmitted
Not Done
Inline Actions

Normally the clnt_rc.c (reconnect layer) would
do a CLSET_TCP_DDP and the so_setsockopt()
would be done for CLSET_TCP_DDP in clnt_vc.c
and ignored in clnt_dg.c.

I've never been much of an object oriented guy,
but the Sun folk loved these layers.

rmacklem: Normally the clnt_rc.c (reconnect layer) would do a CLSET_TCP_DDP and the so_setsockopt() would…
if (newclient != NULL && rc->rc_reconcall != NULL) if (newclient != NULL && rc->rc_reconcall != NULL)
(*rc->rc_reconcall)(newclient, rc->rc_reconarg, (*rc->rc_reconcall)(newclient, rc->rc_reconarg,
rc->rc_ucred); rc->rc_ucred);
} }
td->td_ucred = oldcred; td->td_ucred = oldcred;
if (!newclient) { if (!newclient) {
soclose(so); soclose(so);
▲ Show 20 Lines • Show All 292 Lines • ▼ Show 20 Lines case CLSET_TLSCERTNAME:
rc->rc_tlscertname = mem_alloc(slen); rc->rc_tlscertname = mem_alloc(slen);
strlcpy(rc->rc_tlscertname, info, slen); strlcpy(rc->rc_tlscertname, info, slen);
break; break;
case CLSET_RECONUPCALL: case CLSET_RECONUPCALL:
upcp = (struct rpc_reconupcall *)info; upcp = (struct rpc_reconupcall *)info;
rc->rc_reconcall = upcp->call; rc->rc_reconcall = upcp->call;
rc->rc_reconarg = upcp->arg; rc->rc_reconarg = upcp->arg;
break;
case CLSET_DDP:
rc->rc_ddp = true;
break; break;
default: default:
return (FALSE); return (FALSE);
} }
return (TRUE); return (TRUE);
} }
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines
View Options

sys/arm/arm/minidump_machdep.c

Show All 36 Lines
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/pcpu.h> #include <sys/pcpu.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/socketvar.h> #include <sys/socketvar.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <netinet/tcp.h>
#include <rpc/rpc.h> #include <rpc/rpc.h>
#include <rpc/rpc_com.h> #include <rpc/rpc_com.h>
#include <rpc/krpc.h> #include <rpc/krpc.h>
#include <rpc/rpcsec_tls.h> #include <rpc/rpcsec_tls.h>
static enum clnt_stat clnt_reconnect_call(CLIENT *, struct rpc_callextra *, static enum clnt_stat clnt_reconnect_call(CLIENT *, struct rpc_callextra *,
rpcproc_t, struct mbuf *, struct mbuf **, struct timeval); rpcproc_t, struct mbuf *, struct mbuf **, struct timeval);
static void clnt_reconnect_geterr(CLIENT *, struct rpc_err *); static void clnt_reconnect_geterr(CLIENT *, struct rpc_err *);
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Linesclnt_reconnect_create(
rc->rc_retries = INT_MAX; rc->rc_retries = INT_MAX;
rc->rc_privport = FALSE; rc->rc_privport = FALSE;
rc->rc_waitchan = "rpcrecv"; rc->rc_waitchan = "rpcrecv";
rc->rc_intr = 0; rc->rc_intr = 0;
rc->rc_connecting = FALSE; rc->rc_connecting = FALSE;
rc->rc_closed = FALSE; rc->rc_closed = FALSE;
rc->rc_ucred = crdup(curthread->td_ucred); rc->rc_ucred = crdup(curthread->td_ucred);
rc->rc_client = NULL; rc->rc_client = NULL;
rc->rc_ddp = false;
rc->rc_tls = false; rc->rc_tls = false;
rc->rc_tlscertname = NULL; rc->rc_tlscertname = NULL;
rc->rc_reconcall = NULL; rc->rc_reconcall = NULL;
rc->rc_reconarg = NULL; rc->rc_reconarg = NULL;
cl->cl_refs = 1; cl->cl_refs = 1;
cl->cl_ops = &clnt_reconnect_ops; cl->cl_ops = &clnt_reconnect_ops;
cl->cl_private = (caddr_t)(void *)rc; cl->cl_private = (caddr_t)(void *)rc;
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Lines if (rc->rc_tls && newclient != NULL) {
rpc_createerr.cf_error.re_errno = 0; rpc_createerr.cf_error.re_errno = 0;
CLNT_CLOSE(newclient); CLNT_CLOSE(newclient);
CLNT_RELEASE(newclient); CLNT_RELEASE(newclient);
newclient = NULL; newclient = NULL;
td->td_ucred = oldcred; td->td_ucred = oldcred;
goto out; goto out;
} }
} }
if (rc->rc_ddp && newclient != NULL) {
int optval = 1;
(void)so_setsockopt(so, IPPROTO_TCP, TCP_USE_DDP,
&optval, sizeof(optval));
}
rmacklemUnsubmitted
Not Done
Inline Actions

Normally the clnt_rc.c (reconnect layer) would
do a CLSET_TCP_DDP and the so_setsockopt()
would be done for CLSET_TCP_DDP in clnt_vc.c
and ignored in clnt_dg.c.

I've never been much of an object oriented guy,
but the Sun folk loved these layers.

rmacklem: Normally the clnt_rc.c (reconnect layer) would do a CLSET_TCP_DDP and the so_setsockopt() would…
if (newclient != NULL && rc->rc_reconcall != NULL) if (newclient != NULL && rc->rc_reconcall != NULL)
(*rc->rc_reconcall)(newclient, rc->rc_reconarg, (*rc->rc_reconcall)(newclient, rc->rc_reconarg,
rc->rc_ucred); rc->rc_ucred);
} }
td->td_ucred = oldcred; td->td_ucred = oldcred;
if (!newclient) { if (!newclient) {
soclose(so); soclose(so);
▲ Show 20 Lines • Show All 292 Lines • ▼ Show 20 Lines case CLSET_TLSCERTNAME:
rc->rc_tlscertname = mem_alloc(slen); rc->rc_tlscertname = mem_alloc(slen);
strlcpy(rc->rc_tlscertname, info, slen); strlcpy(rc->rc_tlscertname, info, slen);
break; break;
case CLSET_RECONUPCALL: case CLSET_RECONUPCALL:
upcp = (struct rpc_reconupcall *)info; upcp = (struct rpc_reconupcall *)info;
rc->rc_reconcall = upcp->call; rc->rc_reconcall = upcp->call;
rc->rc_reconarg = upcp->arg; rc->rc_reconarg = upcp->arg;
break;
case CLSET_DDP:
rc->rc_ddp = true;
break; break;
default: default:
return (FALSE); return (FALSE);
} }
return (TRUE); return (TRUE);
} }
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines
View Options

sys/arm/include/param.h

Show All 36 Lines
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/pcpu.h> #include <sys/pcpu.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/socketvar.h> #include <sys/socketvar.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <netinet/tcp.h>
#include <rpc/rpc.h> #include <rpc/rpc.h>
#include <rpc/rpc_com.h> #include <rpc/rpc_com.h>
#include <rpc/krpc.h> #include <rpc/krpc.h>
#include <rpc/rpcsec_tls.h> #include <rpc/rpcsec_tls.h>
static enum clnt_stat clnt_reconnect_call(CLIENT *, struct rpc_callextra *, static enum clnt_stat clnt_reconnect_call(CLIENT *, struct rpc_callextra *,
rpcproc_t, struct mbuf *, struct mbuf **, struct timeval); rpcproc_t, struct mbuf *, struct mbuf **, struct timeval);
static void clnt_reconnect_geterr(CLIENT *, struct rpc_err *); static void clnt_reconnect_geterr(CLIENT *, struct rpc_err *);
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Linesclnt_reconnect_create(
rc->rc_retries = INT_MAX; rc->rc_retries = INT_MAX;
rc->rc_privport = FALSE; rc->rc_privport = FALSE;
rc->rc_waitchan = "rpcrecv"; rc->rc_waitchan = "rpcrecv";
rc->rc_intr = 0; rc->rc_intr = 0;
rc->rc_connecting = FALSE; rc->rc_connecting = FALSE;
rc->rc_closed = FALSE; rc->rc_closed = FALSE;
rc->rc_ucred = crdup(curthread->td_ucred); rc->rc_ucred = crdup(curthread->td_ucred);
rc->rc_client = NULL; rc->rc_client = NULL;
rc->rc_ddp = false;
rc->rc_tls = false; rc->rc_tls = false;
rc->rc_tlscertname = NULL; rc->rc_tlscertname = NULL;
rc->rc_reconcall = NULL; rc->rc_reconcall = NULL;
rc->rc_reconarg = NULL; rc->rc_reconarg = NULL;
cl->cl_refs = 1; cl->cl_refs = 1;
cl->cl_ops = &clnt_reconnect_ops; cl->cl_ops = &clnt_reconnect_ops;
cl->cl_private = (caddr_t)(void *)rc; cl->cl_private = (caddr_t)(void *)rc;
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Lines if (rc->rc_tls && newclient != NULL) {
rpc_createerr.cf_error.re_errno = 0; rpc_createerr.cf_error.re_errno = 0;
CLNT_CLOSE(newclient); CLNT_CLOSE(newclient);
CLNT_RELEASE(newclient); CLNT_RELEASE(newclient);
newclient = NULL; newclient = NULL;
td->td_ucred = oldcred; td->td_ucred = oldcred;
goto out; goto out;
} }
} }
if (rc->rc_ddp && newclient != NULL) {
int optval = 1;
(void)so_setsockopt(so, IPPROTO_TCP, TCP_USE_DDP,
&optval, sizeof(optval));
}
rmacklemUnsubmitted
Not Done
Inline Actions

Normally the clnt_rc.c (reconnect layer) would
do a CLSET_TCP_DDP and the so_setsockopt()
would be done for CLSET_TCP_DDP in clnt_vc.c
and ignored in clnt_dg.c.

I've never been much of an object oriented guy,
but the Sun folk loved these layers.

rmacklem: Normally the clnt_rc.c (reconnect layer) would do a CLSET_TCP_DDP and the so_setsockopt() would…
if (newclient != NULL && rc->rc_reconcall != NULL) if (newclient != NULL && rc->rc_reconcall != NULL)
(*rc->rc_reconcall)(newclient, rc->rc_reconarg, (*rc->rc_reconcall)(newclient, rc->rc_reconarg,
rc->rc_ucred); rc->rc_ucred);
} }
td->td_ucred = oldcred; td->td_ucred = oldcred;
if (!newclient) { if (!newclient) {
soclose(so); soclose(so);
▲ Show 20 Lines • Show All 292 Lines • ▼ Show 20 Lines case CLSET_TLSCERTNAME:
rc->rc_tlscertname = mem_alloc(slen); rc->rc_tlscertname = mem_alloc(slen);
strlcpy(rc->rc_tlscertname, info, slen); strlcpy(rc->rc_tlscertname, info, slen);
break; break;
case CLSET_RECONUPCALL: case CLSET_RECONUPCALL:
upcp = (struct rpc_reconupcall *)info; upcp = (struct rpc_reconupcall *)info;
rc->rc_reconcall = upcp->call; rc->rc_reconcall = upcp->call;
rc->rc_reconarg = upcp->arg; rc->rc_reconarg = upcp->arg;
break;
case CLSET_DDP:
rc->rc_ddp = true;
break; break;
default: default:
return (FALSE); return (FALSE);
} }
return (TRUE); return (TRUE);
} }
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines
View Options

sys/arm64/include/param.h

Loading...
View Options

sys/i386/include/param.h

Loading...
View Options

sys/powerpc/include/param.h

Loading...
View Options

sys/riscv/include/param.h

Loading...
View Options

sys/sys/param.h

Loading...
View Options

usr.bin/systat/sysput.c

Loading...