Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cfc7e60 authored by Rahul Iyer's avatar Rahul Iyer Committed by J. Bruce Fields
Browse files

nfsd41: sunrpc: Added rpc server-side backchannel handling 



When the call direction is a reply, copy the xid and call direction into the
req->rq_private_buf.head[0].iov_base otherwise rpc_verify_header returns
rpc_garbage.

Signed-off-by: default avatarRahul Iyer <iyer@netapp.com>
Signed-off-by: default avatarMike Sager <sager@netapp.com>
Signed-off-by: default avatarMarc Eshel <eshel@almaden.ibm.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarRicardo Labiaga <Ricardo.Labiaga@netapp.com>
Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[get rid of CONFIG_NFSD_V4_1]
[sunrpc: refactoring of svc_tcp_recvfrom]
[nfsd41: sunrpc: create common send routine for the fore and the back channels]
[nfsd41: sunrpc: Use free_page() to free server backchannel pages]
[nfsd41: sunrpc: Document server backchannel locking]
[nfsd41: sunrpc: remove bc_connect_worker()]
[nfsd41: sunrpc: Define xprt_server_backchannel()[
[nfsd41: sunrpc: remove bc_close and bc_init_auto_disconnect dummy functions]
[nfsd41: sunrpc: eliminate unneeded switch statement in xs_setup_tcp()]
[nfsd41: sunrpc: Don't auto close the server backchannel connection]
[nfsd41: sunrpc: Remove unused functions]
Signed-off-by: default avatarAlexandros Batsakis <batsakis@netapp.com>
Signed-off-by: default avatarRicardo Labiaga <Ricardo.Labiaga@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[nfsd41: change bc_sock to bc_xprt]
[nfsd41: sunrpc: move struct rpc_buffer def into a common header file]
[nfsd41: sunrpc: use rpc_sleep in bc_send_request so not to block on mutex]
[removed cosmetic changes]
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[sunrpc: add new xprt class for nfsv4.1 backchannel]
[sunrpc: v2.1 change handling of auto_close and init_auto_disconnect operations for the nfsv4.1 backchannel]
Signed-off-by: default avatarAlexandros Batsakis <batsakis@netapp.com>
[reverted more cosmetic leftovers]
[got rid of xprt_server_backchannel]
[separated "nfsd41: sunrpc: add new xprt class for nfsv4.1 backchannel"]
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Cc: Trond Myklebust <trond.myklebust@netapp.com>
[sunrpc: change idle timeout value for the backchannel]
Signed-off-by: default avatarAlexandros Batsakis <batsakis@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Acked-by: default avatarTrond Myklebust <trond.myklebust@netapp.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 6951867b

include/linux/sunrpc/svc_xprt.h

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ struct svc_xprt { 
	size_t			xpt_locallen;	/* length of address */

	struct sockaddr_storage	xpt_remote;	/* remote peer's address */

	size_t			xpt_remotelen;	/* length of address */

	struct rpc_wait_queue	xpt_bc_pending;	/* backchannel wait queue */

};



int	svc_reg_xprt_class(struct svc_xprt_class *);

include/linux/sunrpc/svcsock.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ struct svc_sock { 
	/* private TCP part */

	u32			sk_reclen;	/* length of record */

	u32			sk_tcplen;	/* current read length */

	struct rpc_xprt		*sk_bc_xprt;	/* NFSv4.1 backchannel xprt */

};



/*

include/linux/sunrpc/xprt.h

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ struct rpc_xprt { 
	spinlock_t		reserve_lock;	/* lock slot table */

	u32			xid;		/* Next XID value to use */

	struct rpc_task *	snd_task;	/* Task blocked in send */

	struct svc_xprt		*bc_xprt;	/* NFSv4.1 backchannel */

#if defined(CONFIG_NFS_V4_1)

	struct svc_serv		*bc_serv;       /* The RPC service which will */

						/* process the callback */

net/sunrpc/sunrpc.h

+4 −0
Original line number Diff line number Diff line
@@ -43,5 +43,9 @@ static inline int rpc_reply_expected(struct rpc_task *task) 
		(task->tk_msg.rpc_proc->p_decode != NULL);

}



int svc_send_common(struct socket *sock, struct xdr_buf *xdr,

		    struct page *headpage, unsigned long headoffset,

		    struct page *tailpage, unsigned long tailoffset);



#endif /* _NET_SUNRPC_SUNRPC_H */

net/sunrpc/svc_xprt.c

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ void svc_xprt_init(struct svc_xprt_class *xcl, struct svc_xprt *xprt, 
	mutex_init(&xprt->xpt_mutex);

	spin_lock_init(&xprt->xpt_lock);

	set_bit(XPT_BUSY, &xprt->xpt_flags);

	rpc_init_wait_queue(&xprt->xpt_bc_pending, "xpt_bc_pending");

}

EXPORT_SYMBOL_GPL(svc_xprt_init);
@@ -810,6 +811,7 @@ int svc_send(struct svc_rqst *rqstp) 
	else

		len = xprt->xpt_ops->xpo_sendto(rqstp);

	mutex_unlock(&xprt->xpt_mutex);

	rpc_wake_up(&xprt->xpt_bc_pending);

	svc_xprt_release(rqstp);



	if (len == -ECONNREFUSED || len == -ENOTCONN || len == -EAGAIN)