The branch main has been updated by mav:
URL:
https://cgit.FreeBSD.org/src/commit/?id=272c4a4dc5fbe3d82d735c5b9a3b6faab052808b
commit 272c4a4dc5fbe3d82d735c5b9a3b6faab052808b
Author: Alexander Motin <m...@freebsd.org>
AuthorDate: 2021-09-14 18:14:30 +0000
Commit: Alexander Motin <m...@freebsd.org>
CommitDate: 2021-09-14 18:18:03 +0000
Allow setting NFS server scope and owner.
By default NFS server reports as scope and owner major the host UUID
value and zero for owner minor. It works good in case of standalone
server. But in case of CARP-based HA cluster failover the values
should remain persistent, otherwise some clients like VMware ESXi
get confused by the change and fail to reconnect automatically.
The patch makes server scope, major owner and minor owner values
configurable via sysctls. If not set (by default) the host UUID
value is still used.
Reviewed by: rmacklem
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D31952
---
sys/fs/nfsserver/nfs_nfsdserv.c | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c
index 85834f7796f7..4394d3033fce 100644
--- a/sys/fs/nfsserver/nfs_nfsdserv.c
+++ b/sys/fs/nfsserver/nfs_nfsdserv.c
@@ -82,6 +82,15 @@ static bool nfsrv_openaccess = true;
SYSCTL_BOOL(_vfs_nfsd, OID_AUTO, v4openaccess, CTLFLAG_RW,
&nfsrv_openaccess, 0,
"Enable Linux style NFSv4 Open access check");
+static char nfsrv_scope[NFSV4_OPAQUELIMIT];
+SYSCTL_STRING(_vfs_nfsd, OID_AUTO, scope, CTLFLAG_RWTUN,
+ &nfsrv_scope, NFSV4_OPAQUELIMIT, "Server scope");
+static char nfsrv_owner_major[NFSV4_OPAQUELIMIT];
+SYSCTL_STRING(_vfs_nfsd, OID_AUTO, owner_major, CTLFLAG_RWTUN,
+ &nfsrv_owner_major, NFSV4_OPAQUELIMIT, "Server owner major");
+static uint64_t nfsrv_owner_minor;
+SYSCTL_U64(_vfs_nfsd, OID_AUTO, owner_minor, CTLFLAG_RWTUN,
+ &nfsrv_owner_minor, 0, "Server owner minor");
/*
* This list defines the GSS mechanisms supported.
@@ -4253,7 +4262,6 @@ nfsrvd_exchangeid(struct nfsrv_descript *nd, __unused int
isdgram,
nfsquad_t clientid, confirm;
uint8_t *verf;
uint32_t sp4type, v41flags;
- uint64_t owner_minor;
struct timespec verstime;
#ifdef INET
struct sockaddr_in *sin, *rin;
@@ -4262,6 +4270,7 @@ nfsrvd_exchangeid(struct nfsrv_descript *nd, __unused int
isdgram,
struct sockaddr_in6 *sin6, *rin6;
#endif
struct thread *p = curthread;
+ char *s;
if ((nd->nd_repstat = nfsd_checkrootexp(nd)) != 0)
goto nfsmout;
@@ -4376,12 +4385,17 @@ nfsrvd_exchangeid(struct nfsrv_descript *nd, __unused
int isdgram,
*tl++ = txdr_unsigned(confirm.lval[0]); /* SequenceID */
*tl++ = txdr_unsigned(v41flags); /* Exch flags */
*tl++ = txdr_unsigned(NFSV4EXCH_SP4NONE); /* No SSV */
- owner_minor = 0; /* Owner */
- txdr_hyper(owner_minor, tl); /* Minor */
- (void)nfsm_strtom(nd, nd->nd_cred->cr_prison->pr_hostuuid,
- strlen(nd->nd_cred->cr_prison->pr_hostuuid)); /* Major */
- (void)nfsm_strtom(nd, nd->nd_cred->cr_prison->pr_hostuuid,
- strlen(nd->nd_cred->cr_prison->pr_hostuuid)); /* Scope */
+ txdr_hyper(nfsrv_owner_minor, tl); /* Owner Minor */
+ if (nfsrv_owner_major[0] != 0)
+ s = nfsrv_owner_major;
+ else
+ s = nd->nd_cred->cr_prison->pr_hostuuid;
+ nfsm_strtom(nd, s, strlen(s)); /* Owner Major */
+ if (nfsrv_scope[0] != 0)
+ s = nfsrv_scope;
+ else
+ s = nd->nd_cred->cr_prison->pr_hostuuid;
+ nfsm_strtom(nd, s, strlen(s) ); /* Scope */
NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED);
*tl = txdr_unsigned(1);
(void)nfsm_strtom(nd, "freebsd.org", strlen("freebsd.org"));
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
