NFS v4.2 callbacks
Subsystems (2)
cover NFS v4.2 callbacks
From: Bryan Schumaker <[email protected]>
The labeled NFS patch series adds in support for NFS v4.2 but does not change the callback code.
Questions and comments are appreciated!
~ Bryan
Bryan Schumaker (2):
NFS: Make callbacks minor version generic
NFS: Add in v4.2 callback operation
fs/nfs/callback.h | 3 +++ fs/nfs/callback_proc.c | 3 ++- fs/nfs/callback_xdr.c | 45 ++++++++++++++++++++++++++++++++++++--------- fs/nfs/internal.h | 2 +- fs/nfs/nfs4client.c | 6 +++--- 5 files changed, 45 insertions(+), 14 deletions(-)
Signature · 1 line
1.8.3
PATCH 1/2 NFS: Make callbacks minor version generic
From: Bryan Schumaker <[email protected]>
I found a few places that hardcode the minor version number rather than making it dependent on the protocol the callback came in over. This patch makes it easier to add new minor versions in the future.
--- fs/nfs/callback.h | 1 + fs/nfs/callback_proc.c | 3 ++- fs/nfs/callback_xdr.c | 16 ++++++++-------- fs/nfs/internal.h | 2 +- fs/nfs/nfs4client.c | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-)
fs/nfs/callback.h +1 -0
@@ -39,6 +39,7 @@ struct cb_process_state {__be32 drc_status;struct nfs_client *clp;u32 slotid; +u32 minorversion;struct net *net; };
fs/nfs/callback_proc.c +2 -1
@@ -406,7 +406,8 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args,int i;__be32 status =htonl (NFS4ERR_BADSESSION ); - clp =nfs4_find_client_sessionid (cps->net, args->csa_addr, &args->csa_sessionid); + clp =nfs4_find_client_sessionid (cps->net, args->csa_addr, + &args->csa_sessionid, cps->minorversion);if (clp ==NULL ) goto out;
fs/nfs/callback_xdr.c +8 -8
@@ -166,8 +166,8 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compoundif (unlikely (p ==NULL ))return htonl (NFS4ERR_RESOURCE ); hdr->minorversion =ntohl (*p++); -/* Check minor version is zero or one or two. */ -if (hdr->minorversion <=2 ) { +/* Check for minor version support */ +if (hdr->minorversion <=NFS4_MAX_MINOR_VERSION ) { hdr->cb_ident =ntohl (*p++);/* ignored by v4.1 and v4.2 */ }else { pr_warn_ratelimited("NFS: %s: NFSv4 server callback with "
@@ -801,8 +801,7 @@ preprocess_nfs4_op(unsigned int op_nr, struct callback_op **op)return htonl (NFS_OK ); } -static __be32 process_op (uint32_t minorversion,int nop, -struct svc_rqst *rqstp, +static __be32 process_op (int nop,struct svc_rqst *rqstp,struct xdr_stream *xdr_in,void *argp,struct xdr_stream *xdr_out,void *resp,struct cb_process_state *cps)
@@ -819,9 +818,9 @@ static __be32 process_op(uint32_t minorversion, int nop,return status;dprintk ("%s: minorversion=%d nop=%d op_nr=%u\n" , - __func__, minorversion, nop, op_nr); + __func__, cps->minorversion, nop, op_nr); - status = minorversion ?preprocess_nfs41_op (nop, op_nr, &op) : + status = cps->minorversion ?preprocess_nfs41_op (nop, op_nr, &op) :preprocess_nfs4_op (op_nr, &op);if (status ==htonl (NFS4ERR_OP_ILLEGAL )) op_nr =OP_CB_ILLEGAL ;
@@ -885,14 +884,15 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *rreturn rpc_drop_reply; } + cps.minorversion = hdr_arg.minorversion; hdr_res.taglen = hdr_arg.taglen; hdr_res.tag = hdr_arg.tag;if (encode_compound_hdr_res (&xdr_out, &hdr_res) !=0 )return rpc_system_err;while (status ==0 && nops != hdr_arg.nops) { - status =process_op (hdr_arg.minorversion, nops, rqstp, - &xdr_in, argp, &xdr_out, resp, &cps); + status =process_op (nops, rqstp, &xdr_in, + argp, &xdr_out, resp, &cps); nops++; }
fs/nfs/internal.h +1 -1
@@ -165,7 +165,7 @@ extern void nfs_free_client(struct nfs_client *);extern struct nfs_client *nfs4_find_client_ident (struct net *,int );extern struct nfs_client *nfs4_find_client_sessionid (struct net *,const struct sockaddr *, -struct nfs4_sessionid *); +struct nfs4_sessionid *,u32 );extern struct nfs_server *nfs_create_server (struct nfs_mount_info *,struct nfs_subversion *); extern struct nfs_server *nfs4_create_server(
fs/nfs/nfs4client.c +3 -3
@@ -567,14 +567,14 @@ static bool nfs4_cb_match_client(const struct sockaddr *addr,*/ struct nfs_client *nfs4_find_client_sessionid (struct net *net,const struct sockaddr *addr, -struct nfs4_sessionid *sid) +struct nfs4_sessionid *sid,u32 minorversion) {struct nfs_client *clp;struct nfs_net *nn =net_generic (net, nfs_net_id);spin_lock (&nn->nfs_client_lock);list_for_each_entry (clp, &nn->nfs_client_list, cl_share_link) { -if (nfs4_cb_match_client (addr, clp,1 ) == false) +if (nfs4_cb_match_client (addr, clp, minorversion) == false)continue ;if (!nfs4_has_session (clp))
@@ -597,7 +597,7 @@ nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr,struct nfs_client *nfs4_find_client_sessionid (struct net *net,const struct sockaddr *addr, -struct nfs4_sessionid *sid) +struct nfs4_sessionid *sid,u32 minorversion) {return NULL ; }
Signature · 1 line
1.8.3
PATCH 2/2 NFS: Add in v4.2 callback operation
In reply to [email protected]From: Bryan Schumaker <[email protected]>
NFS v4.2 adds a CB_OFFLOAD operation used by COPY and WRITE_PLUS. Since neither of these operations have been implemented yet, simply return NFS4ERR_NOTSUPP.
--- fs/nfs/callback.h | 2 ++ fs/nfs/callback_xdr.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-)
fs/nfs/callback.h +2 -0
@@ -32,6 +32,8 @@ enum nfs4_callback_opnum {OP_CB_WANTS_CANCELLED =12 ,OP_CB_NOTIFY_LOCK =13 ,OP_CB_NOTIFY_DEVICEID =14 , +/* Callback operations new to NFSv4.2 */ +OP_CB_OFFLOAD =15 , OP_CB_ILLEGAL = 10044, };
fs/nfs/callback_xdr.c +29 -2
@@ -786,6 +786,26 @@ static void nfs4_cb_free_slot(struct cb_process_state *cps) }#endif /* CONFIG_NFS_V4_1 */ +#ifdef CONFIG_NFS_V4_2 +static __be32 +preprocess_nfs42_op (int nop,unsigned int op_nr,struct callback_op **op) +{ +__be32 status =preprocess_nfs41_op (nop, op_nr, op); +if (status !=htonl (NFS4ERR_OP_ILLEGAL )) +return status; + +if (op_nr ==OP_CB_OFFLOAD ) +return htonl (NFS4ERR_NOTSUPP ); +return htonl (NFS4ERR_OP_ILLEGAL ); +} +#else /* CONFIG_NFS_V4_2 */ +static __be32 +preprocess_nfs42_op (int nop,unsigned int op_nr,struct callback_op **op) +{ +return htonl (NFS4ERR_MINOR_VERS_MISMATCH ); +} +#endif /* CONFIG_NFS_V4_2 */ +static __be32 preprocess_nfs4_op (unsigned int op_nr,struct callback_op **op) {
@@ -820,8 +840,15 @@ static __be32 process_op(int nop, struct svc_rqst *rqstp,dprintk ("%s: minorversion=%d nop=%d op_nr=%u\n" , __func__, cps->minorversion, nop, op_nr); - status = cps->minorversion ?preprocess_nfs41_op (nop, op_nr, &op) : -preprocess_nfs4_op (op_nr, &op); +if (cps->minorversion ==0 ) + status =preprocess_nfs4_op (op_nr, &op); +else if (cps->minorversion ==1 ) + status =preprocess_nfs41_op (nop, op_nr, &op); +else if (cps->minorversion ==2 ) + status =preprocess_nfs42_op (nop, op_nr, &op); +else + status =htonl (NFS4ERR_MINOR_VERS_MISMATCH ); +if (status ==htonl (NFS4ERR_OP_ILLEGAL )) op_nr =OP_CB_ILLEGAL ;if (status)
Signature · 1 line
1.8.3