d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsd: Enable the NFSD_VNET vnet front end macros

Browse Source 
Several commits have added front end macros for the vnet
macros to the NFS server, krpc and kgssapi.  These macros
are now null, but this patch changes them to front end
the vnet macros.

With this commit, many global variables in the code become
vnet'd, so that nfsd(8), nfsuserd(8), rpc.tlsservd(8) and
gssd(8) can run in a vnet prison, once enabled.
To run the NFS server in a vnet prison still requires a
couple of patches (in D37741 and D38371) that allow mountd(8)
to export file systems from within a vnet prison.  Once
these are committed to main, a small patch to kern_jail.c
allowing "allow.nfsd" without VNET_NFSD defined will allow
the NFS server to run in a vnet prison.

One area that still needs to be settled is cleanup when a
prison is removed.  Without this, everything should work
except there will be a leak of malloc'd data and mutex locks
when a vnet prison is removed.

MFC after:	3 months
This commit is contained in:
Rick Macklem 2023-02-18 14:59:36 -08:00
parent 79748cec1f
commit ed03776ca7
8 changed files with 34 additions and 39 deletions

2
sys/fs/nfs/nfs_commonport.c

@ -899,7 +899,7 @@ nfs_vnetinit(const void *unused __unused)
mtx_init(&NFSD_VNET(nfsrv_nfsuserdsock).nr_mtx, "nfsuserd",
NULL, MTX_DEF);
}
SYSINIT(nfs_vnetinit, SI_SUB_VNET_DONE, SI_ORDER_ANY,
VNET_SYSINIT(nfs_vnetinit, SI_SUB_VNET_DONE, SI_ORDER_ANY,
nfs_vnetinit, NULL);
extern int (*nfsd_call_nfscommon)(struct thread *, struct nfssvc_args *);

22
sys/fs/nfs/nfsport.h

@ -181,19 +181,19 @@
*/
#define NFSMUTEX_T struct mtx
/* Define the NFSD_VNET macros similar to !VIMAGE. */
#define NFSD_VNET_NAME(n) n
#define NFSD_VNET_DECLARE(t, n) extern t n
#define NFSD_VNET_DEFINE(t, n) t n
#define NFSD_VNET_DEFINE_STATIC(t, n) static t n
#define NFSD_VNET(n) (n)
/* Just define the NFSD_VNETxxx() macros as VNETxxx() macros. */
#define NFSD_VNET_NAME(n) VNET_NAME(n)
#define NFSD_VNET_DECLARE(t, n) VNET_DECLARE(t, n)
#define NFSD_VNET_DEFINE(t, n) VNET_DEFINE(t, n)
#define NFSD_VNET_DEFINE_STATIC(t, n) VNET_DEFINE_STATIC(t, n)
#define NFSD_VNET(n) VNET(n)
#define CTLFLAG_NFSD_VNET 0
#define CTLFLAG_NFSD_VNET CTLFLAG_VNET
#define NFSD_CURVNET_SET(n)
#define NFSD_CURVNET_SET_QUIET(n)
#define NFSD_CURVNET_RESTORE()
#define NFSD_TD_TO_VNET(n) NULL
#define NFSD_CURVNET_SET(n) CURVNET_SET(n)
#define NFSD_CURVNET_SET_QUIET(n) CURVNET_SET_QUIET(n)
#define NFSD_CURVNET_RESTORE() CURVNET_RESTORE()
#define NFSD_TD_TO_VNET(n) TD_TO_VNET(n)
#endif /* _KERNEL */

4
sys/fs/nfsserver/nfs_fha_new.c

@ -62,8 +62,8 @@ SYSCTL_DECL(_vfs_nfsd);
extern int newnfs_nfsv3_procid[];
SYSINIT(nfs_fhanew, SI_SUB_VNET_DONE, SI_ORDER_ANY, fhanew_init, NULL);
SYSUNINIT(nfs_fhanew, SI_SUB_VNET_DONE, SI_ORDER_ANY, fhanew_uninit, NULL);
VNET_SYSINIT(nfs_fhanew, SI_SUB_VNET_DONE, SI_ORDER_ANY, fhanew_init, NULL);
VNET_SYSUNINIT(nfs_fhanew, SI_SUB_VNET_DONE, SI_ORDER_ANY, fhanew_uninit, NULL);
static void
fhanew_init(void *foo)

2
sys/fs/nfsserver/nfs_nfsdport.c

@ -7103,7 +7103,7 @@ nfsrv_vnetinit(const void *unused __unused)
nfsd_mntinit();
}
SYSINIT(nfsrv_vnetinit, SI_SUB_VNET_DONE, SI_ORDER_ANY,
VNET_SYSINIT(nfsrv_vnetinit, SI_SUB_VNET_DONE, SI_ORDER_ANY,
nfsrv_vnetinit, NULL);
/*

19
sys/kgssapi/gssapi_impl.h

@ -55,17 +55,16 @@ struct kgss_mech {
LIST_HEAD(kgss_mech_list, kgss_mech);
/* Macros for VIMAGE. */
/* Define the KGSS_VNET macros similar to !VIMAGE. */
#define KGSS_VNET_NAME(n) n
#define KGSS_VNET_DECLARE(t, n) extern t n
#define KGSS_VNET_DEFINE(t, n) t n
#define KGSS_VNET_DEFINE_STATIC(t, n) static t n
#define KGSS_VNET(n) (n)
/* Just define the KGSS_VNETxxx() macros as VNETxxx() macros. */
#define KGSS_VNET_DEFINE(t, n) VNET_DEFINE(t, n)
#define KGSS_VNET_DEFINE_STATIC(t, n) VNET_DEFINE_STATIC(t, n)
#define KGSS_VNET_DECLARE(t, n) VNET_DECLARE(t, n)
#define KGSS_VNET(n) VNET(n)
#define KGSS_CURVNET_SET(n)
#define KGSS_CURVNET_SET_QUIET(n)
#define KGSS_CURVNET_RESTORE()
#define KGSS_TD_TO_VNET(n) NULL
#define KGSS_CURVNET_SET(n) CURVNET_SET(n)
#define KGSS_CURVNET_SET_QUIET(n) CURVNET_SET_QUIET(n)
#define KGSS_CURVNET_RESTORE() CURVNET_RESTORE()
#define KGSS_TD_TO_VNET(n) TD_TO_VNET(n)
extern struct mtx kgss_gssd_lock;
extern struct kgss_mech_list kgss_mechs;

2
sys/rpc/rpcsec_gss/svc_rpcsec_gss.c

@ -219,7 +219,7 @@ svc_rpc_gss_init(void *arg)
sx_init(&svc_rpc_gss_lock, "gsslock");
}
}
SYSINIT(svc_rpc_gss_init, SI_SUB_VNET_DONE, SI_ORDER_ANY,
VNET_SYSINIT(svc_rpc_gss_init, SI_SUB_VNET_DONE, SI_ORDER_ANY,
svc_rpc_gss_init, NULL);
bool_t

20
sys/rpc/rpcsec_tls.h

@ -90,19 +90,15 @@ bool rpctls_getinfo(u_int *maxlen, bool rpctlscd_run,
#define RPCTLS_REFNO_HANDSHAKE 0xFFFFFFFFFFFFFFFFULL
/* Macros for VIMAGE. */
/* Define the KRPC_VNET macros similar to !VIMAGE. */
#define KRPC_VNET_NAME(n) n
#define KRPC_VNET_DECLARE(t, n) extern t n
#define KRPC_VNET_DEFINE(t, n) t n
#define KRPC_VNET_DEFINE_STATIC(t, n) static t n
#define KRPC_VNET(n) (n)
/* Just define the KRPC_VNETxxx() macros as VNETxxx() macros. */
#define KRPC_VNET_DEFINE(t, n) VNET_DEFINE(t, n)
#define KRPC_VNET_DEFINE_STATIC(t, n) VNET_DEFINE_STATIC(t, n)
#define KRPC_VNET(n) VNET(n)
#define CTLFLAG_KRPC_VNET 0
#define KRPC_CURVNET_SET(n)
#define KRPC_CURVNET_SET_QUIET(n)
#define KRPC_CURVNET_RESTORE()
#define KRPC_TD_TO_VNET(n) NULL
#define KRPC_CURVNET_SET(n) CURVNET_SET(n)
#define KRPC_CURVNET_SET_QUIET(n) CURVNET_SET_QUIET(n)
#define KRPC_CURVNET_RESTORE() CURVNET_RESTORE()
#define KRPC_TD_TO_VNET(n) TD_TO_VNET(n)
#endif /* _KERNEL */

2
sys/rpc/rpcsec_tls/rpctls_impl.c

@ -106,7 +106,7 @@ rpctls_vnetinit(const void *unused __unused)
for (i = 0; i < RPCTLS_SRV_MAXNPROCS; i++)
KRPC_VNET(rpctls_server_busy)[i] = false;
}
SYSINIT(rpctls_vnetinit, SI_SUB_VNET_DONE, SI_ORDER_ANY,
VNET_SYSINIT(rpctls_vnetinit, SI_SUB_VNET_DONE, SI_ORDER_ANY,
rpctls_vnetinit, NULL);
int