Date: Wed, 5 Aug 2009 22:33:21 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 167054 for review Message-ID: <200908052233.n75MXL15021282@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=167054 Change 167054 by zec@zec_tpx32 on 2009/08/05 22:33:04 Back out socreate_vnet(), and merge in Rick Macklem's proposed kludge for sneaking in mount's creds as temporary td's creds when calling __rpc_nconf2socket. Having all this in place, NFS TCP sockets will be properly reconnected in the mount's vnet, even if this would be triggered by a FS operation from another jail / vnet. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#32 edit .. //depot/projects/vimage-commit2/src/sys/rpc/clnt_rc.c#9 edit .. //depot/projects/vimage-commit2/src/sys/rpc/rpc_generic.c#7 edit .. //depot/projects/vimage-commit2/src/sys/sys/socketvar.h#10 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#32 (text+ko) ==== @@ -342,24 +342,6 @@ socreate(int dom, struct socket **aso, int type, int proto, struct ucred *cred, struct thread *td) { - -#ifndef VIMAGE - return (socreate_vnet(dom, aso, type, proto, cred, td, NULL)); -#else - return (socreate_vnet(dom, aso, type, proto, cred, td, - CRED_TO_VNET(cred))); -#endif -} - -/* - * socreate_vnet returns a socket with a ref count of 1 in a vnet possibly - * different from CRED_TO_VNET(cred). The socket should be closed with - * soclose(). - */ -int -socreate_vnet(int dom, struct socket **aso, int type, int proto, - struct ucred *cred, struct thread *td, struct vnet *vnet) -{ struct protosw *prp; struct socket *so; int error; @@ -378,7 +360,7 @@ if (prp->pr_type != type) return (EPROTOTYPE); - so = soalloc(vnet); + so = soalloc(CRED_TO_VNET(cred)); if (so == NULL) return (ENOBUFS); ==== //depot/projects/vimage-commit2/src/sys/rpc/clnt_rc.c#9 (text+ko) ==== @@ -175,15 +175,16 @@ rc->rc_connecting = TRUE; mtx_unlock(&rc->rc_lock); + oldcred = td->td_ucred; + td->td_ucred = rc->rc_ucred; so = __rpc_nconf2socket(rc->rc_nconf); if (!so) { stat = rpc_createerr.cf_stat = RPC_TLIERROR; rpc_createerr.cf_error.re_errno = 0; + td->td_ucred = oldcred; goto out; } - oldcred = td->td_ucred; - td->td_ucred = rc->rc_ucred; if (rc->rc_privport) bindresvport(so, NULL); ==== //depot/projects/vimage-commit2/src/sys/rpc/rpc_generic.c#7 (text+ko) ==== @@ -258,13 +258,8 @@ return 0; so = NULL; -#ifndef VIMAGE error = socreate(si.si_af, &so, si.si_socktype, si.si_proto, curthread->td_ucred, curthread); -#else - error = socreate_vnet(si.si_af, &so, si.si_socktype, si.si_proto, - curthread->td_ucred, curthread, vnet0); -#endif if (error) return NULL; ==== //depot/projects/vimage-commit2/src/sys/sys/socketvar.h#10 (text+ko) ==== @@ -329,8 +329,6 @@ int socow_setup(struct mbuf *m0, struct uio *uio); int socreate(int dom, struct socket **aso, int type, int proto, struct ucred *cred, struct thread *td); -int socreate_vnet(int dom, struct socket **aso, int type, int proto, - struct ucred *cred, struct thread *td, struct vnet *vnet); int sodisconnect(struct socket *so); struct sockaddr *sodupsockaddr(const struct sockaddr *sa, int mflags); void sofree(struct socket *so);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908052233.n75MXL15021282>