Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933407Ab2HPVe1 (ORCPT ); Thu, 16 Aug 2012 17:34:27 -0400 Received: from audible.transient.net ([216.254.12.79]:52631 "HELO audible.transient.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S933379Ab2HPVeZ (ORCPT ); Thu, 16 Aug 2012 17:34:25 -0400 Date: Thu, 16 Aug 2012 21:34:24 +0000 From: Jamie Heilman To: "J. Bruce Fields" Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: v3.5 nfsd4 regression; utime sometimes takes 40+ seconds to return Message-ID: <20120816213423.GB4282@cucamonga.audible.transient.net> Mail-Followup-To: "J. Bruce Fields" , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org References: <20120815061115.GC32347@cucamonga.audible.transient.net> <20120815135854.GI32347@cucamonga.audible.transient.net> <20120815150251.GB16057@fieldses.org> <20120816201838.GA4282@cucamonga.audible.transient.net> <20120816204208.GE4385@fieldses.org> <20120816210916.GA6108@fieldses.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120816210916.GA6108@fieldses.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3223 Lines: 75 J. Bruce Fields wrote: > On Thu, Aug 16, 2012 at 04:42:08PM -0400, J. Bruce Fields wrote: > > Hm, weird. In the good case the cb_recall's done with auth_unix, in the > > bad case with auth_null. OK, that should be enough to go on.... > > > > Thanks for digging into this! > > This should fix it--could you confirm? Yep, looks like that fixes it. > commit e950bebdac1f17121f972728489cdba43734d56d > Author: J. Bruce Fields > Date: Thu Aug 16 17:01:21 2012 -0400 > > nfsd4: fix security flavor of NFSv4.0 callback > > Commit d5497fc693a446ce9100fcf4117c3f795ddfd0d2 "nfsd4: move rq_flavor > into svc_cred" forgot to remove cl_flavor from the client, leaving two > places (cl_flavor and cl_cred.cr_flavor) for the flavor to be stored. > After that patch, the latter was the one that was updated, but the > former was the one that the callback used. > > Symptoms were a long delay on utime(). This is because the utime() > generated a setattr which recalled a delegation, but the cb_recall was > ignored by the client because it had the wrong security flavor. > > Cc: stable@vger.kernel.org > Reported-by: Jamie Heilman > Signed-off-by: J. Bruce Fields > > diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c > index cbaf4f8..4c7bd35 100644 > --- a/fs/nfsd/nfs4callback.c > +++ b/fs/nfsd/nfs4callback.c > @@ -651,12 +651,12 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c > > if (clp->cl_minorversion == 0) { > if (!clp->cl_cred.cr_principal && > - (clp->cl_flavor >= RPC_AUTH_GSS_KRB5)) > + (clp->cl_cred.cr_flavor >= RPC_AUTH_GSS_KRB5)) > return -EINVAL; > args.client_name = clp->cl_cred.cr_principal; > args.prognumber = conn->cb_prog, > args.protocol = XPRT_TRANSPORT_TCP; > - args.authflavor = clp->cl_flavor; > + args.authflavor = clp->cl_cred.cr_flavor; > clp->cl_cb_ident = conn->cb_ident; > } else { > if (!conn->cb_xprt) > diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h > index 167d7d8..9db0bb5 100644 > --- a/fs/nfsd/state.h > +++ b/fs/nfsd/state.h > @@ -231,7 +231,6 @@ struct nfs4_client { > nfs4_verifier cl_verifier; /* generated by client */ > time_t cl_time; /* time of last lease renewal */ > struct sockaddr_storage cl_addr; /* client ipaddress */ > - u32 cl_flavor; /* setclientid pseudoflavor */ > struct svc_cred cl_cred; /* setclientid principal */ > clientid_t cl_clientid; /* generated by server */ > nfs4_verifier cl_confirm; /* generated by server */ > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- Jamie Heilman http://audible.transient.net/~jamie/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/