LinuxLists.cc - 4.1 patches

2010-09-30 16:19:28

Subject: 4.1 patches

I've been working on fixing the server's sessions to bring the sessions
and trunking requirements up to spec.

I'm still implementing and debugging the patches that do that, but
the following patches do some initial cleanup (amd minor bugfixes) that
I found along the way, so I'm probably ready to queue these up for
2.6.37 absent any objections.

They also add a list of connections associated with each session, though
that's not yet used for anything important. (I do use it to enforce the
requirement that DESTROY_SESSION be sent over a connection already
associated with that session. As has been pointed out on the ietf list,
the basis for that requirement is a little murky, so I may back out that
last patch--for now it at least gives me an easy way to check (using a
pynfs41 DESTROY_SESSION test) that the list of connections is correct).)

--b.

2010-09-30 21:33:31

by Benny Halevy

[permalink] [raw]

Subject: Re: [PATCH 15/16] nfsd4: add new connections to session

On 2010-09-30 18:19, J. Bruce Fields wrote:
> As long as we're not implementing any session security, we should just
> automatically add any new connections that come along to the list of
> sessions associated with the session.

Doesn't the client need to send BIND_CONN_TO_SESSION?

18.34. Operation 41: BIND_CONN_TO_SESSION - Associate Connection with Session:

BIND_CONN_TO_SESSION is used to associate additional connections with
a session. It MUST be used on the connection being associated with
the session.

Also, with these patches, can we set SEQ4_STATUS_CB_PATH_DOWN if there's
no backchannel?

Benny

>
> Signed-off-by: J. Bruce Fields <[email protected]>
> ---
> fs/nfsd/nfs4state.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
> 1 files changed, 47 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 3b4d74c..596702e 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -658,13 +658,18 @@ static struct nfsd4_conn *alloc_conn(struct svc_rqst *rqstp)
> return conn;
> }
>
> +static void __nfsd4_hash_conn(struct nfsd4_conn *conn, struct nfsd4_session *ses)
> +{
> + conn->cn_session = ses;
> + list_add(&conn->cn_persession, &ses->se_conns);
> +}
> +
> static void nfsd4_hash_conn(struct nfsd4_conn *conn, struct nfsd4_session *ses)
> {
> struct nfs4_client *clp = ses->se_client;
>
> spin_lock(&clp->cl_lock);
> - conn->cn_session = ses;
> - list_add(&conn->cn_persession, &ses->se_conns);
> + __nfsd4_hash_conn(conn, ses);
> spin_unlock(&clp->cl_lock);
> }
>
> @@ -1612,6 +1617,44 @@ out:
> return status;
> }
>
> +static struct nfsd4_conn *__nfsd4_find_conn(struct svc_rqst *r, struct nfsd4_session *s)
> +{
> + struct nfsd4_conn *c;
> +
> + list_for_each_entry(c, &s->se_conns, cn_persession) {
> + if (c->cn_xprt == r->rq_xprt) {
> + return c;
> + }
> + }
> + return NULL;
> +}
> +
> +static void nfsd4_sequence_check_conn(struct svc_rqst *rqstp, struct nfsd4_session *ses)
> +{
> + struct nfs4_client *clp = ses->se_client;
> + struct nfsd4_conn *c, *new = NULL;
> +
> + spin_lock(&clp->cl_lock);
> + c = __nfsd4_find_conn(rqstp, ses);
> + spin_unlock(&clp->cl_lock);
> + if (c)
> + return;
> +
> + new = alloc_conn(rqstp);
> +
> + spin_lock(&clp->cl_lock);
> + c = __nfsd4_find_conn(rqstp, ses);
> + if (c) {
> + spin_unlock(&clp->cl_lock);
> + free_conn(new);
> + return;
> + }
> + __nfsd4_hash_conn(new, ses);
> + spin_unlock(&clp->cl_lock);
> + nfsd4_register_conn(new);
> + return;
> +}
> +
> __be32
> nfsd4_sequence(struct svc_rqst *rqstp,
> struct nfsd4_compound_state *cstate,
> @@ -1656,6 +1699,8 @@ nfsd4_sequence(struct svc_rqst *rqstp,
> if (status)
> goto out;
>
> + nfsd4_sequence_check_conn(rqstp, session);
> +
> /* Success! bump slot seqid */
> slot->sl_inuse = true;
> slot->sl_seqid = seq->seqid;

2010-09-30 16:19:40

Subject: 4.1 patches

Subject: Re: [PATCH 15/16] nfsd4: add new connections to session

Subject: [PATCH 09/16] nfsd4: fix alloc_init_session return type

Subject: [PATCH 10/16] nfsd4: clean up session allocation

Subject: [PATCH 16/16] nfsd4: enforce DESTROY_SESSION connection requirement

Subject: [PATCH 15/16] nfsd4: add new connections to session

Subject: [PATCH 03/16] nfsd4: rename nfs4_rpc_args->nfsd4_cb_args

Subject: Re: [PATCH 15/16] nfsd4: add new connections to session

Subject: Re: [PATCH 11/16] nfsd4: keep per-session list of connections

Subject: [PATCH 13/16] nfsd4: use callbacks on svc_xprt_deletion

Subject: [PATCH 04/16] nfsd4: generic callback code

Subject: [PATCH 06/16] nfsd4: remove separate cb_args struct

Subject: Re: [PATCH 11/16] nfsd4: keep per-session list of connections

Subject: [PATCH 07/16] nfsd4: Move callback setup to callback queue

Subject: [PATCH 02/16] nfsd4: combine nfs4_rpc_args and nfsd4_cb_sequence

Subject: [PATCH 12/16] nfsd: provide callbacks on svc_xprt deletion

Subject: [PATCH 05/16] nfsd4: use generic callback code in null case

Subject: [PATCH 01/16] nfsd4: minor variable renaming (cb -> conn)

Subject: [PATCH 08/16] nfsd4: fix alloc_init_session BUILD_BUG_ON()

Subject: [PATCH 11/16] nfsd4: keep per-session list of connections

Subject: [PATCH 14/16] nfsd4: refactor connection allocation