From owner-svn-src-all@FreeBSD.ORG Wed Apr 27 18:19:26 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4B98106566C; Wed, 27 Apr 2011 18:19:26 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BB4898FC12; Wed, 27 Apr 2011 18:19:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3RIJQk9083094; Wed, 27 Apr 2011 18:19:26 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3RIJQDc083089; Wed, 27 Apr 2011 18:19:26 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201104271819.p3RIJQDc083089@svn.freebsd.org> From: Rick Macklem Date: Wed, 27 Apr 2011 18:19:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r221127 - head/sys/rpc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2011 18:19:27 -0000 Author: rmacklem Date: Wed Apr 27 18:19:26 2011 New Revision: 221127 URL: http://svn.freebsd.org/changeset/base/221127 Log: This patch is believed to fix a problem in the kernel rpc for non-interruptible NFS mounts, where a kernel thread will seem to be stuck sleeping on "rpccon". The msleep() in clnt_vc_create() that was waiting to a TCP connect to complete would return ERESTART, since PCATCH was specified. Then the tsleep() in clnt_reconnect_call() would sleep for 1 second and then try again and again and... The patch changes the msleep() in clnt_vc_create() so it only sets the PCATCH flag for interruptible cases. Tested by: pho Reviewed by: jhb MFC after: 2 weeks Modified: head/sys/rpc/clnt.h head/sys/rpc/clnt_rc.c head/sys/rpc/clnt_vc.c head/sys/rpc/rpcb_clnt.c Modified: head/sys/rpc/clnt.h ============================================================================== --- head/sys/rpc/clnt.h Wed Apr 27 18:15:34 2011 (r221126) +++ head/sys/rpc/clnt.h Wed Apr 27 18:19:26 2011 (r221127) @@ -433,10 +433,11 @@ extern CLIENT *clnt_dg_create(struct soc * rpcvers_t vers; -- version number * size_t sendsz; -- buffer recv size * size_t recvsz; -- buffer send size + * int intrflag; -- is it interruptible */ extern CLIENT *clnt_vc_create(struct socket *so, struct sockaddr *svcaddr, rpcprog_t program, rpcvers_t version, - size_t sendsz, size_t recvsz); + size_t sendsz, size_t recvsz, int intrflag); /* * struct netconfig *nconf; -- network type Modified: head/sys/rpc/clnt_rc.c ============================================================================== --- head/sys/rpc/clnt_rc.c Wed Apr 27 18:15:34 2011 (r221126) +++ head/sys/rpc/clnt_rc.c Wed Apr 27 18:19:26 2011 (r221127) @@ -195,7 +195,7 @@ clnt_reconnect_connect(CLIENT *cl) else newclient = clnt_vc_create(so, (struct sockaddr *) &rc->rc_addr, rc->rc_prog, rc->rc_vers, - rc->rc_sendsz, rc->rc_recvsz); + rc->rc_sendsz, rc->rc_recvsz, rc->rc_intr); td->td_ucred = oldcred; if (!newclient) { Modified: head/sys/rpc/clnt_vc.c ============================================================================== --- head/sys/rpc/clnt_vc.c Wed Apr 27 18:15:34 2011 (r221126) +++ head/sys/rpc/clnt_vc.c Wed Apr 27 18:19:26 2011 (r221127) @@ -168,7 +168,8 @@ clnt_vc_create( const rpcprog_t prog, /* program number */ const rpcvers_t vers, /* version number */ size_t sendsz, /* buffer recv size */ - size_t recvsz) /* buffer send size */ + size_t recvsz, /* buffer send size */ + int intrflag) /* interruptible */ { CLIENT *cl; /* client handle */ struct ct_data *ct = NULL; /* client handle */ @@ -177,7 +178,7 @@ clnt_vc_create( static uint32_t disrupt; struct __rpc_sockinfo si; XDR xdrs; - int error, interrupted, one = 1; + int error, interrupted, one = 1, sleep_flag; struct sockopt sopt; if (disrupt == 0) @@ -196,10 +197,13 @@ clnt_vc_create( error = soconnect(so, raddr, curthread); SOCK_LOCK(so); interrupted = 0; + sleep_flag = PSOCK; + if (intrflag != 0) + sleep_flag |= (PCATCH | PBDRY); while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) { error = msleep(&so->so_timeo, SOCK_MTX(so), - PSOCK | PCATCH | PBDRY, "connec", 0); + sleep_flag, "connec", 0); if (error) { if (error == EINTR || error == ERESTART) interrupted = 1; Modified: head/sys/rpc/rpcb_clnt.c ============================================================================== --- head/sys/rpc/rpcb_clnt.c Wed Apr 27 18:15:34 2011 (r221126) +++ head/sys/rpc/rpcb_clnt.c Wed Apr 27 18:19:26 2011 (r221127) @@ -477,7 +477,7 @@ local_rpcb() tsize = __rpc_get_t_size(AF_LOCAL, 0, 0); client = clnt_vc_create(so, (struct sockaddr *)&sun, (rpcprog_t)RPCBPROG, - (rpcvers_t)RPCBVERS, tsize, tsize); + (rpcvers_t)RPCBVERS, tsize, tsize, 1); if (client != NULL) { /* Mark the socket to be closed in destructor */