nfs41: implement cb_recall_slot
Subsystems (2)
PATCH 6/7 nfs41: implement cb_recall_slot
Resend with fix to compile without CONFIG_NFS_V4_1.
Sorry 'bout that Trond.
-->Andy
PATCH 6/7 nfs41: implement cb_recall_slot
From: Andy Adamson <[email protected]>
Drain the fore channel and reset the max_slots to the new value.
--- fs/nfs/callback.h | 8 ++++++++ fs/nfs/callback_proc.c | 32 ++++++++++++++++++++++++++++++++ fs/nfs/callback_xdr.c | 22 +++++++++++++++++++++- fs/nfs/nfs4_fs.h | 2 ++ fs/nfs/nfs4state.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/nfs_fs_sb.h | 2 ++ 6 files changed, 109 insertions(+), 1 deletions(-)
fs/nfs/callback.h +8 -0
@@ -119,6 +119,14 @@ struct cb_recallanyargs { };extern unsigned nfs4_callback_recallany (struct cb_recallanyargs *args,void *dummy); + +struct cb_recallslotargs { +struct sockaddr *crsa_addr; +uint32_t crsa_target_max_slots; +}; +extern unsigned nfs4_callback_recallslot (struct cb_recallslotargs *args, +void *dummy); +#endif /* CONFIG_NFS_V4_1 */ extern __be32 nfs4_callback_getattr (struct cb_getattrargs *args,struct cb_getattrres *res);
fs/nfs/callback_proc.c +32 -0
@@ -297,4 +297,36 @@ out:dprintk ("%s: exit with status = %d\n" , __func__,ntohl (status)); return status; } + +/* Reduce the fore channel's max_slots to the target value */ +unsigned nfs4_callback_recallslot (struct cb_recallslotargs *args,void *dummy) +{ +struct nfs_client *clp; +struct nfs4_slot_table *fc_tbl; +int status; + + status =htonl (NFS4ERR_OP_NOT_IN_SESSION ); + clp =nfs_find_client (args->crsa_addr,4 ); +if (clp ==NULL ) + goto out; + +dprintk ("NFS: CB_RECALL_SLOT request from %s target max slots %d\n" , +rpc_peeraddr2str (clp->cl_rpcclient,RPC_DISPLAY_ADDR ), + args->crsa_target_max_slots); + + fc_tbl = &clp->cl_session->fc_slot_table; + + status =htonl (NFS4ERR_BAD_HIGH_SLOT ); +if (args->crsa_target_max_slots >= fc_tbl->max_slots || + args->crsa_target_max_slots <1 ) + goto out; + + fc_tbl->target_max_slots = args->crsa_target_max_slots; +nfs41_handle_recall_slot (clp); + status =htonl (NFS4_OK ); +nfs_put_client (clp);/* balance nfs_find_client */ +out: +dprintk ("%s: exit with status = %d\n" , __func__,ntohl (status)); +return status; +}#endif /* CONFIG_NFS_V4_1 */
fs/nfs/callback_xdr.c +21 -1
@@ -24,6 +24,7 @@#define CB_OP_SEQUENCE_RES_MAXSZ (CB_OP_HDR_RES_MAXSZ + \ 4 + 1 + 3)#define CB_OP_RECALLANY_RES_MAXSZ (CB_OP_HDR_RES_MAXSZ) +#define CB_OP_RECALLSLOT_RES_MAXSZ (CB_OP_HDR_RES_MAXSZ)#endif /* CONFIG_NFS_V4_1 */ #define NFSDBG_FACILITY NFSDBG_CALLBACK
@@ -349,6 +350,20 @@ static unsigned decode_recallany_args(struct svc_rqst *rqstp, return 0; } +static unsigned decode_recallslot_args (struct svc_rqst *rqstp, +struct xdr_stream *xdr, +struct cb_recallslotargs *args) +{ +__be32 *p; + + args->crsa_addr =svc_addr (rqstp); + p =read_buf (xdr,4 ); +if (unlikely (p ==NULL )) +return htonl (NFS4ERR_BADXDR ); + args->crsa_target_max_slots =ntohl (*p++); +return 0 ; +} +#endif /* CONFIG_NFS_V4_1 */ static __be32 encode_string (struct xdr_stream *xdr,unsigned int len,const char *str)
@@ -557,6 +572,7 @@ preprocess_nfs41_op(int nop, unsigned int op_nr, struct callback_op **op)case OP_CB_RECALL :case OP_CB_SEQUENCE :case OP_CB_RECALL_ANY : +case OP_CB_RECALL_SLOT : *op = &callback_ops[op_nr];break ;
@@ -565,7 +581,6 @@ preprocess_nfs41_op(int nop, unsigned int op_nr, struct callback_op **op)case OP_CB_NOTIFY :case OP_CB_PUSH_DELEG :case OP_CB_RECALLABLE_OBJ_AVAIL : -case OP_CB_RECALL_SLOT :case OP_CB_WANTS_CANCELLED :case OP_CB_NOTIFY_LOCK :return htonl (NFS4ERR_NOTSUPP );
@@ -734,6 +749,11 @@ static struct callback_op callback_ops[] = { .decode_args = (callback_decode_arg_t)decode_recallany_args, .res_maxsize = CB_OP_RECALLANY_RES_MAXSZ, }, + [OP_CB_RECALL_SLOT] = { + .process_op = (callback_process_op_t)nfs4_callback_recallslot, + .decode_args = (callback_decode_arg_t)decode_recallslot_args, + .res_maxsize = CB_OP_RECALLSLOT_RES_MAXSZ, + },#endif /* CONFIG_NFS_V4_1 */ };
fs/nfs/nfs4_fs.h +2 -0
@@ -46,6 +46,7 @@ enum nfs4_client_state {NFS4CLNT_DELEGRETURN ,NFS4CLNT_SESSION_RESET ,NFS4CLNT_SESSION_DRAINING , + NFS4CLNT_RECALL_SLOT, };/*
@@ -278,6 +279,7 @@ extern void nfs4_schedule_state_recovery(struct nfs_client *);extern void nfs4_schedule_state_manager (struct nfs_client *);extern int nfs4_state_mark_reclaim_nograce (struct nfs_client *clp,struct nfs4_state *state);extern void nfs41_handle_sequence_flag_errors (struct nfs_client *clp,u32 flags); +extern void nfs41_handle_recall_slot (struct nfs_client *clp);extern void nfs4_put_lock_state (struct nfs4_lock_state *lsp);extern int nfs4_set_lock_state (struct nfs4_state *state,struct file_lock *fl);extern void nfs4_copy_stateid (nfs4_stateid *,struct nfs4_state *,fl_owner_t );
fs/nfs/nfs4state.c +44 -0
65 lines not on this page · raw message
include/linux/nfs_fs_sb.h +2 -0
@@ -193,6 +193,8 @@ struct nfs4_slot_table {int max_slots;/* # slots in table */ int highest_used_slotid;/* sent to server on each SEQ. * op for dynamic resizing */ +int target_max_slots;/* Set by CB_RECALL_SLOT as +* the new max_slots */ };static inline int slot_idx (struct nfs4_slot_table *tbl,struct nfs4_slot *sp)
Signature · 1 line
1.6.6
Quoted 5 lines · On Wed, 2010-01-20 at 16:06 -0500, [email protected] wrote:
Resend with fix to compile without
CONFIG_NFS_V4_1.Sorry 'bout that Trond.
-->Andy
No problem. However I did hit a conflict between your patchset and one of Mike's. The conflicting patches were
commit 8f4a598ccfa936dc850323859af8f52bb1ef15c1 nfs41: back channel drc minimal implementation
and
commit f93f599e8f6f8c26a99beb8324b15bc8c5f3663a nfs41: Process callback's referring call list
Could you please both check that I fixed it up correctly in the nfsv41-for-next branch?
Cheers
Trond
Quoted 13 lines · Trond Myklebust
Quoted 5 lines · On Wed, 2010-01-20 at 16:06 -0500, [email protected] wrote:
Resend with fix to compile without
CONFIG_NFS_V4_1.Sorry 'bout that Trond.
-->Andy
No problem. However I did hit a conflict between your patchset and one of Mike's. The conflicting patches were
commit
8f4a598ccfa936dc850323859af8f52bb1ef15c1nfs41: back channel drc minimal implementation
Quoted 8 lines
and
commit
f93f599e8f6f8c26a99beb8324b15bc8c5f3663anfs41: Process callback's referring call listCould you please both check that I fixed it up correctly in the nfsv41-for-next branch?
Looks correct to me.
-->Andy
Quoted 3 lines
Cheers
Trond