Skip to contentSkip to conversation

Updates to nfs41 client backchannel for 2.6.31

PATCH In review Ricardo Labiaga 4 participants 26 messages Jun 12, 2009 – Jun 15, 2009 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover Updates to nfs41 client backchannel for 2.6.31

Trond,

Here's a set of patches that address the comments received so far on the "nfs41 client backchannel for 2.6.31" series. We'll squash these into Benny's tree, but I wanted to first submit them as stand alone patches for your review.

Benny,

Each patch indicates the patch it should in turn be squased with. Note that patch 10 simply backs out the changes of the original patch. We'll also need to manually move the removal of the 'xprt_free_bc_request' export symbol into the correct patch through git-rebase. We can do that next week during bakeathon.

[PATCH 01/14] SQUASHME: Type check arguments of nfs_callback_up [PATCH 02/14] SQUASHME: Update copyright notice and explain page allocation [PATCH 03/14] SQUASHME: Update Copyright notice and fix formatting [PATCH 04/14] SQUASHME: rpc_count_iostats incorrectly exits early [PATCH 05/14] SQUASHME: Convert rpc_reply_expected() to inline function [PATCH 06/14] SQUASHME: Remove unnecessary BUG_ON()
[PATCH 07/14] SQUASHME: Rename variable
[PATCH 08/14] SQUASHME: Removal of ugly #ifdefs
[PATCH 09/14] SQUASHME: nfs41: sunrpc: Add RPC direction back into the XDR buffer [PATCH 10/14] SQUASHME: nfs41: sunrpc: Don't skip past the RPC call direction [PATCH 11/14] SQUASHME: Moves embedded #ifdefs into #ifdef function blocks [PATCH 12/14] SQUASHME: Removes bc_svc_process() declaration
[PATCH 13/14] SQUASHME: Move bc_svc_process() declaration to correct patch [PATCH 14/14] SQUASHME: Update copyright

Thanks,

- ricardo

#1 lore raw

PATCH 1/14 SQUASHME: Type check arguments of nfs_callback_up

[squash with: nfs41: minorversion support for nfs4_{init, destroy}_callback

---
 fs/nfs/callback.c |    5 +----
 fs/nfs/callback.h |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)
fs/nfs/callback.c +1 -4
index 972e38b..4395c96 100644
@@ -214,7 +214,7 @@ out:
 /*
  * Bring up the callback thread if it is not already up.
  */
-int nfs_callback_up(u32 minorversion, void *args)
+int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
 {
 	struct svc_serv *serv = NULL;
 	struct svc_rqst *rqstp;
@@ -222,9 +222,6 @@ int nfs_callback_up(u32 minorversion, void *args)
 	struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
 	char svc_name[12];
 	int ret = 0;
-#if defined(CONFIG_NFS_V4_1)
-	struct rpc_xprt *xprt = (struct rpc_xprt *)args;
-#endif /* CONFIG_NFS_V4_1 */
 
 	mutex_lock(&nfs_callback_mutex);
 	if (cb_info->users++ || cb_info->task != NULL) {
fs/nfs/callback.h +1 -1
index 4bd0daf..07baa82 100644
@@ -112,7 +112,7 @@ extern __be32 nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getat
 extern __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy);
 
 #ifdef CONFIG_NFS_V4
-extern int nfs_callback_up(u32 minorversion, void *args);
+extern int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt);
 extern void nfs_callback_down(int minorversion);
 #endif /* CONFIG_NFS_V4 */
 
Signature · 1 line
1.5.4.3
#2 lore raw

PATCH 2/14 SQUASHME: Update copyright notice and explain page allocation

[squash with: nfs41: New backchannel helper routines]

---
 net/sunrpc/backchannel_rqst.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
net/sunrpc/backchannel_rqst.c +10 -1
index 8f177a5..5a7d342 100644
@@ -1,8 +1,9 @@
 /******************************************************************************
 
 (c) 2007 Network Appliance, Inc.  All Rights Reserved.
+(c) 2009 NetApp.  All Rights Reserved.
 
-Network Appliance provides this source code under the GPL v2 License.
+NetApp provides this source code under the GPL v2 License.
 The GPL v2 license is available at
 http://opensource.org/licenses/gpl-license.php.
 
@@ -75,6 +76,14 @@ static void xprt_free_allocation(struct rpc_rqst *req)
  * incoming callback request.  It's up to the higher levels in the
  * stack to enforce that the maximum number of session slots is not
  * being exceeded.
+ *
+ * Some callback arguments can be large.  For example, a pNFS server
+ * using multiple deviceids.  The list can be unbound, but the client
+ * has the ability to tell the server the maximum size of the callback
+ * requests.  Each deviceID is 16 bytes, so allocate one page
+ * for the arguments to have enough room to receive a number of these
+ * deviceIDs.  The NFS client indicates to the pNFS server that its
+ * callback requests can be up to 4096 bytes in size.
  */
 int xprt_setup_backchannel(struct rpc_xprt *xprt, unsigned int min_reqs)
 {
Signature · 1 line
1.5.4.3
#3 lore raw

PATCH 3/14 SQUASHME: Update Copyright notice and fix formatting

[squash with: nfs41: New include/linux/sunrpc/bc_xprt.h]

---
 include/linux/sunrpc/bc_xprt.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
include/linux/sunrpc/bc_xprt.h +5 -3
index 3016c00..6508f0d 100644
@@ -1,8 +1,8 @@
 /******************************************************************************
 
-(c) 2008 Network Appliance, Inc.  All Rights Reserved.
+(c) 2008 NetApp.  All Rights Reserved.
 
-Network Appliance provides this source code under the GPL v2 License.
+NetApp provides this source code under the GPL v2 License.
 The GPL v2 license is available at
 http://opensource.org/licenses/gpl-license.php.
 
@@ -41,7 +41,9 @@ int bc_send(struct rpc_rqst *req);
 #else /* CONFIG_NFS_V4_1 */
 static inline int xprt_setup_backchannel(struct rpc_xprt *xprt,
 					 unsigned int min_reqs)
-{ return 0; }
+{
+	return 0;
+}
 #endif /* CONFIG_NFS_V4_1 */
 #endif /* _LINUX_SUNRPC_BC_XPRT_H */
 
Signature · 1 line
1.5.4.3
#4 lore raw

PATCH 4/14 SQUASHME: rpc_count_iostats incorrectly exits early

It's incorrectly taking an early exit if the tk_client has metrics.

[squash with: nfs41: Add backchannel processing support to RPC state machine]

---
 net/sunrpc/stats.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
net/sunrpc/stats.c +1 -1
index c1517e2..1b4e679 100644
@@ -145,7 +145,7 @@ void rpc_count_iostats(struct rpc_task *task)
 	struct rpc_iostats *op_metrics;
 	long rtt, execute, queue;
 
-	if (!task->tk_client || task->tk_client->cl_metrics || !req)
+	if (!task->tk_client || !task->tk_client->cl_metrics || !req)
 		return;
 
 	stats = task->tk_client->cl_metrics;
Signature · 1 line
1.5.4.3
#5 lore raw

PATCH 5/14 SQUASHME: Convert rpc_reply_expected() to inline function

[squash with: nfs41: Add backchannel processing support to RPC state machine]

---
 net/sunrpc/sunrpc.h |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
net/sunrpc/sunrpc.h +6 -4
index f753d51..045f175 100644
@@ -21,15 +21,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ******************************************************************************/
 
 /*
- * Functions and macros used internally by RPC
+ * Functions used internally by RPC
  */
 
 #ifndef _NET_SUNRPC_SUNRPC_H
 #define _NET_SUNRPC_SUNRPC_H
 
-#define rpc_reply_expected(task) \
-	(((task)->tk_msg.rpc_proc != NULL) && \
-	((task)->tk_msg.rpc_proc->p_decode != NULL))
+static inline int rpc_reply_expected(struct rpc_task *task)
+{
+	return (task->tk_msg.rpc_proc != NULL) &&
+		(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,
Signature · 1 line
1.5.4.3
#6 lore raw

PATCH 6/14 SQUASHME: Remove unnecessary BUG_ON()

It was useful during early development, no longer necessary.

[squash with: nfs41: Add backchannel processing support to RPC state machine]

---
 net/sunrpc/xprt.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
net/sunrpc/xprt.c +0 -1
index 2b189af..a8c6e8c 100644
@@ -1004,7 +1004,6 @@ void xprt_release(struct rpc_task *task)
 	struct rpc_rqst	*req;
 	int prealloc;
 
-	BUG_ON(atomic_read(&task->tk_count) < 0);
 	if (!(req = task->tk_rqstp))
 		return;
 	prealloc = bc_prealloc(req);	/* Preallocated backchannel request? */
Signature · 1 line
1.5.4.3
#7 lore raw

PATCH 7/14 SQUASHME: Rename variable

[squash with: nfs41: Add backchannel processing support to RPC state machine]

---
 net/sunrpc/xprt.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
net/sunrpc/xprt.c +6 -3
index a8c6e8c..23c623b 100644
@@ -1002,11 +1002,14 @@ void xprt_release(struct rpc_task *task)
 {
 	struct rpc_xprt	*xprt;
 	struct rpc_rqst	*req;
-	int prealloc;
+	int is_bc_request;
 
 	if (!(req = task->tk_rqstp))
 		return;
-	prealloc = bc_prealloc(req);	/* Preallocated backchannel request? */
+
+	/* Preallocated backchannel request? */
+	is_bc_request = bc_prealloc(req);
+
 	xprt = req->rq_xprt;
 	rpc_count_iostats(task);
 	spin_lock_bh(&xprt->transport_lock);
@@ -1030,7 +1033,7 @@ void xprt_release(struct rpc_task *task)
 	 * Early exit if this is a backchannel preallocated request.
 	 * There is no need to have it added to the RPC slot list.
 	 */
-	if (prealloc)
+	if (is_bc_request)
 		return;
 
 	memset(req, 0, sizeof(*req));	/* mark unused */
Signature · 1 line
1.5.4.3
#8 lore raw

PATCH 8/14 SQUASHME: Removal of ugly #ifdefs

[squash with: nfs41: Implement NFSv4.1 callback service process]

---
 fs/nfs/callback.c |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)
fs/nfs/callback.c +35 -15
index 4395c96..116424e 100644
@@ -209,6 +209,39 @@ out:
 	dprintk("--> %s return %p\n", __func__, rqstp);
 	return rqstp;
 }
+
+static inline void nfs_callback_svc_setup(u32 minorversion,
+		struct svc_serv *serv, struct rpc_xprt *xprt,
+		struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
+{
+	if (minorversion) {
+		*rqstpp = nfs41_callback_up(serv, xprt);
+		*callback_svc = nfs41_callback_svc;
+	} else {
+		*rqstpp = nfs4_callback_up(serv);
+		*callback_svc = nfs4_callback_svc;
+	}
+}
+
+static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
+		struct nfs_callback_data *cb_info)
+{
+	if (minorversion)
+		xprt->bc_serv = cb_info->serv;
+}
+#else
+static inline void nfs_callback_svc_setup(u32 minorversion,
+		struct svc_serv *serv, struct rpc_xprt *xprt,
+		struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
+{
+	*rqstpp = nfs4_callback_up(serv);
+	*callback_svc = nfs4_callback_svc;
+}
+
+static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
+		struct nfs_callback_data *cb_info)
+{
+}
 #endif /* CONFIG_NFS_V4_1 */
 
 /*
@@ -225,10 +258,7 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
 
 	mutex_lock(&nfs_callback_mutex);
 	if (cb_info->users++ || cb_info->task != NULL) {
-#if defined(CONFIG_NFS_V4_1)
-		if (minorversion)
-			xprt->bc_serv = cb_info->serv;
-#endif /* CONFIG_NFS_V4_1 */
+		nfs_callback_bc_serv(minorversion, xprt, cb_info);
 		goto out;
 	}
 	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, NULL);
@@ -239,17 +269,7 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
 
 	/* FIXME: either 4.0 or 4.1 callback service can be up at a time
 	 * need to monitor and control them both */
-	if (!minorversion) {
-		rqstp = nfs4_callback_up(serv);
-		callback_svc = nfs4_callback_svc;
-	} else {
-#if defined(CONFIG_NFS_V4_1)
-		rqstp = nfs41_callback_up(serv, xprt);
-		callback_svc = nfs41_callback_svc;
-#else  /* CONFIG_NFS_V4_1 */
-		BUG();
-#endif /* CONFIG_NFS_V4_1 */
-	}
+	nfs_callback_svc_setup(minorversion, serv, xprt, &rqstp, &callback_svc);
 
 	if (IS_ERR(rqstp)) {
 		ret = PTR_ERR(rqstp);
Signature · 1 line
1.5.4.3
#9 lore raw

PATCH 9/14 SQUASHME: nfs41: sunrpc: Add RPC direction back into the XDR buffer

[squash with: nfs41: Skip past the RPC call direction]

An earlier nfs41/sunrpc patch incorrectly assumed that all transports will read the RPC direction and route callbacks or replies to the processing routines. This is only currently implemented for TCP, so rpc_verify_header() needs to continue verifying that it is processing an RPC_REPLY.

Reading and storing the RPC direction is a three step process.

1. xs_tcp_read_calldir() reads the RPC direction, but it will not store it in the XDR buffer since the 'struct rpc_rqst' is not yet available.

2. The 'struct rpc_rqst' is obtained during the TCP_RCV_COPY_DATA state. This state need not necessarily be preceeded by the TCP_RCV_READ_CALLDIR. For example, we may be reading a continuation packet to a large reply. Therefore, we can't simply obtain the 'struct rpc_rqst' during the TCP_RCV_READ_CALLDIR state and assume it's available during TCP_RCV_COPY_DATA.

This patch adds a new TCP_RCV_READ_CALLDIR flag to indicate the need to read the RPC direction. It then uses TCP_RCV_COPY_CALLDIR to indicate the RPC direction needs to be saved after the 'struct rpc_rqst' has been allocated.

3. The 'struct rpc_rqst' is obtained by the xs_tcp_read_data() helper functions. xs_tcp_read_common() then saves the RPC direction in the XDR buffer if TCP_RCV_COPY_CALLDIR is set. This will happen when we're reading the data immediately after the direction was read. xs_tcp_read_common() then clears this flag.

---
 net/sunrpc/xprtsock.c |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)
net/sunrpc/xprtsock.c +25 -6
index 8ec2600..fe57ebd 100644
@@ -275,12 +275,13 @@ struct sock_xprt {
 #define TCP_RCV_COPY_FRAGHDR	(1UL << 1)
 #define TCP_RCV_COPY_XID	(1UL << 2)
 #define TCP_RCV_COPY_DATA	(1UL << 3)
-#define TCP_RCV_COPY_CALLDIR	(1UL << 4)
+#define TCP_RCV_READ_CALLDIR	(1UL << 4)
+#define TCP_RCV_COPY_CALLDIR	(1UL << 5)
 
 /*
  * TCP RPC flags
  */
-#define TCP_RPC_REPLY		(1UL << 5)
+#define TCP_RPC_REPLY		(1UL << 6)
 
 static inline struct sockaddr *xs_addr(struct rpc_xprt *xprt)
 {
@@ -1002,7 +1003,7 @@ static inline void xs_tcp_read_xid(struct sock_xprt *transport, struct xdr_skb_r
 	if (used != len)
 		return;
 	transport->tcp_flags &= ~TCP_RCV_COPY_XID;
-	transport->tcp_flags |= TCP_RCV_COPY_CALLDIR;
+	transport->tcp_flags |= TCP_RCV_READ_CALLDIR;
 	transport->tcp_copied = 4;
 	dprintk("RPC:       reading %s XID %08x\n",
 			(transport->tcp_flags & TCP_RPC_REPLY) ? "reply for"
@@ -1031,9 +1032,13 @@ static inline void xs_tcp_read_calldir(struct sock_xprt *transport,
 	transport->tcp_offset += used;
 	if (used != len)
 		return;
-	transport->tcp_flags &= ~TCP_RCV_COPY_CALLDIR;
+	transport->tcp_flags &= ~TCP_RCV_READ_CALLDIR;
+	transport->tcp_flags |= TCP_RCV_COPY_CALLDIR;
 	transport->tcp_flags |= TCP_RCV_COPY_DATA;
-	transport->tcp_copied += 4;
+	/*
+	 * We don't yet have the XDR buffer, so we will write the calldir
+	 * out after we get the buffer from the 'struct rpc_rqst'
+	 */
 	if (ntohl(calldir) == RPC_REPLY)
 		transport->tcp_flags |= TCP_RPC_REPLY;
 	else
@@ -1055,6 +1060,20 @@ static inline void xs_tcp_read_common(struct rpc_xprt *xprt,
 	ssize_t r;
 
 	rcvbuf = &req->rq_private_buf;
+
+	if (transport->tcp_flags & TCP_RCV_COPY_CALLDIR) {
+		/*
+		 * Save the RPC direction in the XDR buffer
+		 */
+		__be32	calldir = transport->tcp_flags & TCP_RPC_REPLY ?
+					htonl(RPC_REPLY) : 0;
+
+		memcpy(rcvbuf->head[0].iov_base + transport->tcp_copied,
+			&calldir, sizeof(calldir));
+		transport->tcp_copied += sizeof(calldir);
+		transport->tcp_flags &= ~TCP_RCV_COPY_CALLDIR;
+	}
+
 	len = desc->count;
 	if (len > transport->tcp_reclen - transport->tcp_offset) {
 		struct xdr_skb_reader my_desc;
@@ -1258,7 +1277,7 @@ static int xs_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, uns
 			continue;
 		}
 		/* Read in the call/reply flag */
-		if (transport->tcp_flags & TCP_RCV_COPY_CALLDIR) {
+		if (transport->tcp_flags & TCP_RCV_READ_CALLDIR) {
 			xs_tcp_read_calldir(transport, &desc);
 			continue;
 		}
Signature · 1 line
1.5.4.3
#10 lore raw

PATCH 10/14 SQUASHME: nfs41: sunrpc: Don't skip past the RPC call direction

[squash with: nfs41: Skippast the RPC call direction]

xs_tcp_read_data() has been modified to include the RPC call direction in the XDR buffer. We need to read the direction during the header verification.

---
 net/sunrpc/clnt.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
net/sunrpc/clnt.c +6 -6
index e7fffd2..d5a85a9 100644
@@ -1507,12 +1507,12 @@ rpc_verify_header(struct rpc_task *task)
 	if ((len -= 3) < 0)
 		goto out_overflow;
 
-	/*
-	 * Skip the XID and call direction.
-	 * The underlying transport has read the XID and RPC call direction
-	 * to determine this is an RPC reply.
-	 */
-	p += 2;
+	p += 1; /* skip XID */
+	if ((n = ntohl(*p++)) != RPC_REPLY) {
+		dprintk("RPC: %5u %s: not an RPC reply: %x\n",
+			task->tk_pid, __func__, n);
+		goto out_garbage;
+	}
 
 	if ((n = ntohl(*p++)) != RPC_MSG_ACCEPTED) {
 		if (--len < 0)
Signature · 1 line
1.5.4.3
#11 lore raw

PATCH 11/14 SQUASHME: Moves embedded #ifdefs into #ifdef function blocks

[squash with: nfs41: New xs_tcp_read_data()]

---
 net/sunrpc/xprtsock.c |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
net/sunrpc/xprtsock.c +18 -10
index fe57ebd..c6f24c0 100644
@@ -1207,6 +1207,23 @@ static inline int xs_tcp_read_callback(struct rpc_xprt *xprt,
 
 	return 0;
 }
+
+static inline int _xs_tcp_read_data(struct rpc_xprt *xprt,
+					struct xdr_skb_reader *desc)
+{
+	struct sock_xprt *transport =
+				container_of(xprt, struct sock_xprt, xprt);
+
+	return (transport->tcp_flags & TCP_RPC_REPLY) ?
+		xs_tcp_read_reply(xprt, desc) :
+		xs_tcp_read_callback(xprt, desc);
+}
+#else
+static inline int _xs_tcp_read_data(struct rpc_xprt *xprt,
+					struct xdr_skb_reader *desc)
+{
+	return xs_tcp_read_reply(xprt, desc);
+}
 #endif /* CONFIG_NFS_V4_1 */
 
 /*
@@ -1218,17 +1235,8 @@ static void xs_tcp_read_data(struct rpc_xprt *xprt,
 {
 	struct sock_xprt *transport =
 				container_of(xprt, struct sock_xprt, xprt);
-	int status;
-
-#if defined(CONFIG_NFS_V4_1)
-	status = (transport->tcp_flags & TCP_RPC_REPLY) ?
-		xs_tcp_read_reply(xprt, desc) :
-		xs_tcp_read_callback(xprt, desc);
-#else
-	status = xs_tcp_read_reply(xprt, desc);
-#endif /* CONFIG_NFS_V4_1 */
 
-	if (status == 0)
+	if (_xs_tcp_read_data(xprt, desc) == 0)
 		xs_tcp_check_fraghdr(transport);
 	else {
 		/*
Signature · 1 line
1.5.4.3
#12 lore raw

PATCH 12/14 SQUASHME: Removes bc_svc_process() declaration

[squash with: nfs41: Implement Nfsv4.1 callback service process]

---
 include/linux/sunrpc/svc.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
include/linux/sunrpc/svc.h +0 -2
index 52e8cb0..b8234f2 100644
@@ -418,8 +418,6 @@ int		   svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);
 int		   svc_pool_stats_open(struct svc_serv *serv, struct file *file);
 void		   svc_destroy(struct svc_serv *);
 int		   svc_process(struct svc_rqst *);
-int		   bc_svc_process(struct svc_serv *, struct rpc_rqst *,
-			struct svc_rqst *);
 int		   svc_register(const struct svc_serv *, const int,
 				const unsigned short, const unsigned short);
 
Signature · 1 line
1.5.4.3
#13 lore raw

PATCH 13/14 SQUASHME: Move bc_svc_process() declaration to correct patch

[squash with: nfs41: Backchannel bc_svc_process()]

---
 include/linux/sunrpc/svc.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
include/linux/sunrpc/svc.h +2 -0
index b8234f2..52e8cb0 100644
@@ -418,6 +418,8 @@ int		   svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);
 int		   svc_pool_stats_open(struct svc_serv *serv, struct file *file);
 void		   svc_destroy(struct svc_serv *);
 int		   svc_process(struct svc_rqst *);
+int		   bc_svc_process(struct svc_serv *, struct rpc_rqst *,
+			struct svc_rqst *);
 int		   svc_register(const struct svc_serv *, const int,
 				const unsigned short, const unsigned short);
 
Signature · 1 line
1.5.4.3
#14 lore raw

PATCH 14/14 SQUASHME: Update copyright

[squash with: nfs41: Backhannel callback service helper routines]

---
 net/sunrpc/bc_svc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
net/sunrpc/bc_svc.c +2 -1
index b13f51d..13f214f 100644
@@ -1,8 +1,9 @@
 /******************************************************************************
 
 (c) 2007 Network Appliance, Inc.  All Rights Reserved.
+(c) 2009 NetApp.  All Rights Reserved.
 
-Network Appliance provides this source code under the GPL v2 License.
+NetApp provides this source code under the GPL v2 License.
 The GPL v2 license is available at
 http://opensource.org/licenses/gpl-license.php.
 
Signature · 1 line
1.5.4.3
#15 lore raw

Re: [PATCH 11/14] SQUASHME: Moves embedded #ifdefs into #ifdef function blocks

In reply to Ricardo Labiaga
Quoted 23 lines · Ricardo Labiaga

[squash with: nfs41: New xs_tcp_read_data()]

---
 net/sunrpc/xprtsock.c |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
net/sunrpc/xprtsock.c +8 -0
index fe57ebd..c6f24c0 100644
@@ -1207,6 +1207,23 @@ static inline int xs_tcp_read_callback(struct rpc_xprt *xprt,
 
 	return 0;
 }
+
+static inline int _xs_tcp_read_data(struct rpc_xprt *xprt,
+					struct xdr_skb_reader *desc)
+{
+	struct sock_xprt *transport =
+				container_of(xprt, struct sock_xprt, xprt);
+
+	return (transport->tcp_flags & TCP_RPC_REPLY) ?

net/sunrpc/xprtsock.c static inline int xs_tcp_read_callback(struct rpc_xprt *xprt, · line 1227

Quoted 10 lines
net/sunrpc/xprtsock.c +9 -0
+		xs_tcp_read_reply(xprt, desc) :
+		xs_tcp_read_callback(xprt, desc);
+}
+#else
+static inline int _xs_tcp_read_data(struct rpc_xprt *xprt,
+					struct xdr_skb_reader *desc)
+{
+	return xs_tcp_read_reply(xprt, desc);
+}
 #endif /* CONFIG_NFS_V4_1 */

Again, I'd be inclined to avoid duplicating code. If we want still to use an #ifdef (and in this case we might as well just always check the tcp_flags) the I'd suggest to code this as follows:

static inline int _xs_tcp_read_data(struct rpc_xprt *xprt,
struct xdr_skb_reader *desc)
{

#ifdef /* CONFIG_NFS_V4_1 */
	struct sock_xprt *transport =
				container_of(xprt, struct sock_xprt, xprt);

	if (!(transport->tcp_flags & TCP_RPC_REPLY))
		return xs_tcp_read_callback(xprt, desc);

#ifdef /* CONFIG_NFS_V4_1 */

	return xs_tcp_read_reply(xprt, desc);
}

Benny

Quoted 21 lines
net/sunrpc/xprtsock.c +1 -10
 /*
@@ -1218,17 +1235,8 @@ static void xs_tcp_read_data(struct rpc_xprt *xprt,
 {
 	struct sock_xprt *transport =
 				container_of(xprt, struct sock_xprt, xprt);
-	int status;
-
-#if defined(CONFIG_NFS_V4_1)
-	status = (transport->tcp_flags & TCP_RPC_REPLY) ?
-		xs_tcp_read_reply(xprt, desc) :
-		xs_tcp_read_callback(xprt, desc);
-#else
-	status = xs_tcp_read_reply(xprt, desc);
-#endif /* CONFIG_NFS_V4_1 */
 
-	if (status == 0)
+	if (_xs_tcp_read_data(xprt, desc) == 0)
 		xs_tcp_check_fraghdr(transport);
 	else {
 		/*
#16 lore raw

Re: [PATCH 11/14] SQUASHME: Moves embedded #ifdefs into #ifdef function blocks

Quoted 72 lines · Benny Halevy
Quoted 23 lines · Ricardo Labiaga

[squash with: nfs41: New xs_tcp_read_data()]

---
 net/sunrpc/xprtsock.c |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
net/sunrpc/xprtsock.c +8 -0
index fe57ebd..c6f24c0 100644
@@ -1207,6 +1207,23 @@ static inline int xs_tcp_read_callback(struct rpc_xprt *xprt,
 
 	return 0;
 }
+
+static inline int _xs_tcp_read_data(struct rpc_xprt *xprt,
+					struct xdr_skb_reader *desc)
+{
+	struct sock_xprt *transport =
+				container_of(xprt, struct sock_xprt, xprt);
+
+	return (transport->tcp_flags & TCP_RPC_REPLY) ?

net/sunrpc/xprtsock.c static inline int xs_tcp_read_callback(struct rpc_xprt *xprt, · line 1227

Quoted 10 lines
net/sunrpc/xprtsock.c +9 -0
+		xs_tcp_read_reply(xprt, desc) :
+		xs_tcp_read_callback(xprt, desc);
+}
+#else
+static inline int _xs_tcp_read_data(struct rpc_xprt *xprt,
+					struct xdr_skb_reader *desc)
+{
+	return xs_tcp_read_reply(xprt, desc);
+}
 #endif /* CONFIG_NFS_V4_1 */

Again, I'd be inclined to avoid duplicating code. If we want still to use an #ifdef (and in this case we might as well just always check the tcp_flags) the I'd suggest to code this as follows:

static inline int _xs_tcp_read_data(struct rpc_xprt *xprt,
struct xdr_skb_reader *desc)
{

#ifdef /* CONFIG_NFS_V4_1 */
	struct sock_xprt *transport =
				container_of(xprt, struct sock_xprt, xprt);

	if (!(transport->tcp_flags & TCP_RPC_REPLY))
		return xs_tcp_read_callback(xprt, desc);

#ifdef /* CONFIG_NFS_V4_1 */

	return xs_tcp_read_reply(xprt, desc);
}

Benny

Quoted 16 lines
net/sunrpc/xprtsock.c +0 -9
 /*
@@ -1218,17 +1235,8 @@ static void xs_tcp_read_data(struct rpc_xprt *xprt,
 {
 	struct sock_xprt *transport =
 				container_of(xprt, struct sock_xprt, xprt);
-	int status;
-
-#if defined(CONFIG_NFS_V4_1)
-	status = (transport->tcp_flags & TCP_RPC_REPLY) ?
-		xs_tcp_read_reply(xprt, desc) :
-		xs_tcp_read_callback(xprt, desc);
-#else
-	status = xs_tcp_read_reply(xprt, desc);
-#endif /* CONFIG_NFS_V4_1 */
 
Quoted 6 lines

net/sunrpc/xprtsock.c static void xs_tcp_read_data(struct rpc_xprt *xprt, · line 1242

Quoted 5 lines
net/sunrpc/xprtsock.c +1 -1
-	if (status == 0)
+	if (_xs_tcp_read_data(xprt, desc) == 0)
 		xs_tcp_check_fraghdr(transport);
 	else {
 		/*

NO! Just put the bits that are v4.1 specific in a function (make said function empty in the !v4.1 case, and call it from the common code.

Signature · 6 lines
Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com
#17 lore raw

Re: [PATCH 10/14] SQUASHME: nfs41: sunrpc: Don't skip past the RPC call direction

In reply to Ricardo Labiaga
Quoted 23 lines · Ricardo Labiaga

[squash with: nfs41: Skippast the RPC call direction]

xs_tcp_read_data() has been modified to include the RPC call direction in the XDR buffer. We need to read the direction during the header verification.

---
 net/sunrpc/clnt.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
net/sunrpc/clnt.c +0 -5
index e7fffd2..d5a85a9 100644
@@ -1507,12 +1507,12 @@ rpc_verify_header(struct rpc_task *task)
 	if ((len -= 3) < 0)
 		goto out_overflow;
 
-	/*
-	 * Skip the XID and call direction.
-	 * The underlying transport has read the XID and RPC call direction
-	 * to determine this is an RPC reply.
-	 */

net/sunrpc/clnt.c rpc_verify_header(struct rpc_task *task) · line 1518

Quoted 10 lines
net/sunrpc/clnt.c +6 -1
-	p += 2;
+	p += 1; /* skip XID */
+	if ((n = ntohl(*p++)) != RPC_REPLY) {
+		dprintk("RPC: %5u %s: not an RPC reply: %x\n",
+			task->tk_pid, __func__, n);
+		goto out_garbage;
+	}
 
 	if ((n = ntohl(*p++)) != RPC_MSG_ACCEPTED) {
 		if (--len < 0)

BTW, for bisectability reasons it looks like this patch needs to
be part of the previous patch:
"[PATCH 09/14] SQUASHME: nfs41: sunrpc: Add RPC direction back into the XDR buffer" Otherwise it introduces a bug that this patch fixes.
(just a nit, not that it matters much if both are to be squashed
into the same patch eventually)

Benny

#18 lore raw

RE: [PATCH 10/14] SQUASHME: nfs41: sunrpc: Don't skip past the RPC call direction

Quoted 6 lines

-----Original Message-----
From: Benny Halevy [mailto:[email protected]]
Sent: Sunday, June 14, 2009 7:35 AM
To: Labiaga, Ricardo
Cc: Myklebust, Trond; [email protected]; [email protected]
Subject: Re: [PATCH 10/14] SQUASHME: nfs41: sunrpc: Don't skip past

the

Quoted 3 lines

RPC call direction

On Jun. 12, 2009, 1:54 -0400, Ricardo Labiaga

<[email protected]>

Quoted 4 lines
Quoted 3 lines · wrote:

[squash with: nfs41: Skippast the RPC call direction]

xs_tcp_read_data() has been modified to include the RPC call

direction

Quoted 17 lines

in the

Quoted 1 line

XDR buffer. We need to read the direction during the header

verification.

Quoted 14 lines
---
 net/sunrpc/clnt.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
net/sunrpc/clnt.c +0 -0
index e7fffd2..d5a85a9 100644
@@ -1507,12 +1507,12 @@ rpc_verify_header(struct rpc_task *task)
 	if ((len -= 3) < 0)
 		goto out_overflow;
 
Quoted 3 lines

net/sunrpc/clnt.c rpc_verify_header(struct rpc_task *task)

Quoted 3 lines
net/sunrpc/clnt.c +0 -3
-	/*
-	 * Skip the XID and call direction.
-	 * The underlying transport has read the XID and RPC call

direction

Quoted 10 lines
Quoted 10 lines
net/sunrpc/clnt.c +6 -3
-	 * to determine this is an RPC reply.
-	 */
-	p += 2;
+	p += 1; /* skip XID */
+	if ((n = ntohl(*p++)) != RPC_REPLY) {
+		dprintk("RPC: %5u %s: not an RPC reply: %x\n",
+			task->tk_pid, __func__, n);
+		goto out_garbage;
+	}
 
Quoted 6 lines

net/sunrpc/clnt.c rpc_verify_header(struct rpc_task *task) · line 1518

Quoted 2 lines
net/sunrpc/clnt.c +0 -0
 	if ((n = ntohl(*p++)) != RPC_MSG_ACCEPTED) {
 		if (--len < 0)

BTW, for bisectability reasons it looks like this patch needs to be part of the previous patch:
"[PATCH 09/14] SQUASHME: nfs41: sunrpc: Add RPC direction back into

the

Quoted 5 lines

XDR buffer"
Otherwise it introduces a bug that this patch fixes. (just a nit, not that it matters much if both are to be squashed into the same patch eventually)

This patch obliterates the patch that introduced this functionality completely. It removes the changes made by the original patch " nfs41:
Skip past the RPC call direction" line by line. The reason it's a separate patch is because it makes the original patch disappear - we'll never submit it. I was intending to simply remove the initial patch (and this one) using git-rebase this week at bakeathon.

- ricardo

Quoted 1 line

Benny

#19 lore raw

Re: [PATCH 09/14] SQUASHME: nfs41: sunrpc: Add RPC direction back into the XDR buffer

In reply to Ricardo Labiaga
Quoted 84 lines · Ricardo Labiaga

[squash with: nfs41: Skip past the RPC call direction]

An earlier nfs41/sunrpc patch incorrectly assumed that all transports will read the RPC direction and route callbacks or replies to the processing routines. This is only currently implemented for TCP, so rpc_verify_header() needs to continue verifying that it is processing an RPC_REPLY.

Reading and storing the RPC direction is a three step process.

1. xs_tcp_read_calldir() reads the RPC direction, but it will not store it in the XDR buffer since the 'struct rpc_rqst' is not yet available.

2. The 'struct rpc_rqst' is obtained during the TCP_RCV_COPY_DATA state. This state need not necessarily be preceeded by the TCP_RCV_READ_CALLDIR. For example, we may be reading a continuation packet to a large reply. Therefore, we can't simply obtain the 'struct rpc_rqst' during the TCP_RCV_READ_CALLDIR state and assume it's available during TCP_RCV_COPY_DATA.

This patch adds a new TCP_RCV_READ_CALLDIR flag to indicate the need to read the RPC direction. It then uses TCP_RCV_COPY_CALLDIR to indicate the RPC direction needs to be saved after the 'struct rpc_rqst' has been allocated.

3. The 'struct rpc_rqst' is obtained by the xs_tcp_read_data() helper functions. xs_tcp_read_common() then saves the RPC direction in the XDR buffer if TCP_RCV_COPY_CALLDIR is set. This will happen when we're reading the data immediately after the direction was read. xs_tcp_read_common() then clears this flag.

---
 net/sunrpc/xprtsock.c |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)
net/sunrpc/xprtsock.c +12 -5
index 8ec2600..fe57ebd 100644
@@ -275,12 +275,13 @@ struct sock_xprt {
 #define TCP_RCV_COPY_FRAGHDR	(1UL << 1)
 #define TCP_RCV_COPY_XID	(1UL << 2)
 #define TCP_RCV_COPY_DATA	(1UL << 3)
-#define TCP_RCV_COPY_CALLDIR	(1UL << 4)
+#define TCP_RCV_READ_CALLDIR	(1UL << 4)
+#define TCP_RCV_COPY_CALLDIR	(1UL << 5)
 
 /*
  * TCP RPC flags
  */
-#define TCP_RPC_REPLY		(1UL << 5)
+#define TCP_RPC_REPLY		(1UL << 6)
 
 static inline struct sockaddr *xs_addr(struct rpc_xprt *xprt)
 {
@@ -1002,7 +1003,7 @@ static inline void xs_tcp_read_xid(struct sock_xprt *transport, struct xdr_skb_r
 	if (used != len)
 		return;
 	transport->tcp_flags &= ~TCP_RCV_COPY_XID;
-	transport->tcp_flags |= TCP_RCV_COPY_CALLDIR;
+	transport->tcp_flags |= TCP_RCV_READ_CALLDIR;
 	transport->tcp_copied = 4;
 	dprintk("RPC:       reading %s XID %08x\n",
 			(transport->tcp_flags & TCP_RPC_REPLY) ? "reply for"
@@ -1031,9 +1032,13 @@ static inline void xs_tcp_read_calldir(struct sock_xprt *transport,
 	transport->tcp_offset += used;
 	if (used != len)
 		return;
-	transport->tcp_flags &= ~TCP_RCV_COPY_CALLDIR;
+	transport->tcp_flags &= ~TCP_RCV_READ_CALLDIR;
+	transport->tcp_flags |= TCP_RCV_COPY_CALLDIR;
 	transport->tcp_flags |= TCP_RCV_COPY_DATA;
-	transport->tcp_copied += 4;
+	/*
+	 * We don't yet have the XDR buffer, so we will write the calldir
+	 * out after we get the buffer from the 'struct rpc_rqst'
+	 */
 	if (ntohl(calldir) == RPC_REPLY)
 		transport->tcp_flags |= TCP_RPC_REPLY;
 	else
@@ -1055,6 +1060,20 @@ static inline void xs_tcp_read_common(struct rpc_xprt *xprt,
 	ssize_t r;
 
 	rcvbuf = &req->rq_private_buf;
+
+	if (transport->tcp_flags & TCP_RCV_COPY_CALLDIR) {

net/sunrpc/xprtsock.c static inline void xs_tcp_read_common(struct rpc_xprt *xprt, · line 1074

Quoted 10 lines
net/sunrpc/xprtsock.c +10 -0
+		/*
+		 * Save the RPC direction in the XDR buffer
+		 */
+		__be32	calldir = transport->tcp_flags & TCP_RPC_REPLY ?
+					htonl(RPC_REPLY) : 0;
+
+		memcpy(rcvbuf->head[0].iov_base + transport->tcp_copied,
+			&calldir, sizeof(calldir));
+		transport->tcp_copied += sizeof(calldir);
+		transport->tcp_flags &= ~TCP_RCV_COPY_CALLDIR;

Can this be done in xs_tcp_read_calldir()?

Benny

Quoted 14 lines
net/sunrpc/xprtsock.c +3 -1
+	}
+
 	len = desc->count;
 	if (len > transport->tcp_reclen - transport->tcp_offset) {
 		struct xdr_skb_reader my_desc;
@@ -1258,7 +1277,7 @@ static int xs_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, uns
 			continue;
 		}
 		/* Read in the call/reply flag */
-		if (transport->tcp_flags & TCP_RCV_COPY_CALLDIR) {
+		if (transport->tcp_flags & TCP_RCV_READ_CALLDIR) {
 			xs_tcp_read_calldir(transport, &desc);
 			continue;
 		}
#20 lore raw

RE: [PATCH 09/14] SQUASHME: nfs41: sunrpc: Add RPC direction back into the XDR buffer

Quoted 6 lines

-----Original Message-----
From: Benny Halevy [mailto:[email protected]]
Sent: Friday, June 12, 2009 7:22 AM
To: Labiaga, Ricardo
Cc: Myklebust, Trond; [email protected]; [email protected]
Subject: Re: [PATCH 09/14] SQUASHME: nfs41: sunrpc: Add RPC direction

back

Quoted 3 lines

into the XDR buffer

On Jun. 12, 2009, 1:54 -0400, Ricardo Labiaga

<[email protected]>

Quoted 4 lines
Quoted 3 lines · wrote:

[squash with: nfs41: Skip past the RPC call direction]

An earlier nfs41/sunrpc patch incorrectly assumed that all

transports

Quoted 2 lines

will

Quoted 1 line

read the RPC direction and route callbacks or replies to the

processing

Quoted 7 lines
Quoted 1 line

routines. This is only currently implemented for TCP, so

rpc_verify_header()

Quoted 5 lines

needs to continue verifying that it is processing an RPC_REPLY.

Reading and storing the RPC direction is a three step process.

1. xs_tcp_read_calldir() reads the RPC direction, but it will not

store

Quoted 4 lines

it

Quoted 3 lines

in the XDR buffer since the 'struct rpc_rqst' is not yet available.

2. The 'struct rpc_rqst' is obtained during the TCP_RCV_COPY_DATA

state.

Quoted 3 lines
Quoted 1 line

This state need not necessarily be preceeded by the

TCP_RCV_READ_CALLDIR.

Quoted 1 line

For example, we may be reading a continuation packet to a large

reply.

Quoted 5 lines
Quoted 2 lines

Therefore, we can't simply obtain the 'struct rpc_rqst' during the TCP_RCV_READ_CALLDIR state and assume it's available during

TCP_RCV_COPY_DATA.

Quoted 2 lines

This patch adds a new TCP_RCV_READ_CALLDIR flag to indicate the need

to

Quoted 1 line
Quoted 1 line

read the RPC direction. It then uses TCP_RCV_COPY_CALLDIR to

indicate

Quoted 5 lines

the

Quoted 1 line

RPC direction needs to be saved after the 'struct rpc_rqst' has been

allocated.

Quoted 2 lines

3. The 'struct rpc_rqst' is obtained by the xs_tcp_read_data()

helper

Quoted 1 line
Quoted 1 line

functions. xs_tcp_read_common() then saves the RPC direction in the

XDR

Quoted 3 lines
Quoted 1 line

buffer if TCP_RCV_COPY_CALLDIR is set. This will happen when we're

reading

Quoted 1 line

the data immediately after the direction was read.

xs_tcp_read_common()

Quoted 29 lines

net/sunrpc/xprtsock.c static inline void xs_tcp_read_xid(struct

Quoted 28 lines

then clears this flag.

---
 net/sunrpc/xprtsock.c |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)
net/sunrpc/xprtsock.c +3 -2
index 8ec2600..fe57ebd 100644
@@ -275,12 +275,13 @@ struct sock_xprt {
 #define TCP_RCV_COPY_FRAGHDR	(1UL << 1)
 #define TCP_RCV_COPY_XID	(1UL << 2)
 #define TCP_RCV_COPY_DATA	(1UL << 3)
-#define TCP_RCV_COPY_CALLDIR	(1UL << 4)
+#define TCP_RCV_READ_CALLDIR	(1UL << 4)
+#define TCP_RCV_COPY_CALLDIR	(1UL << 5)
 
 /*
  * TCP RPC flags
  */
-#define TCP_RPC_REPLY		(1UL << 5)
+#define TCP_RPC_REPLY		(1UL << 6)
 
 static inline struct sockaddr *xs_addr(struct rpc_xprt *xprt)
 {
@@ -1002,7 +1003,7 @@ static inline void xs_tcp_read_xid(struct

sock_xprt *transport, struct xdr_skb_r

Quoted 8 lines

net/sunrpc/xprtsock.c static inline void xs_tcp_read_xid(struct sock_xprt *transport, struct xdr_skb_r

Quoted 8 lines
net/sunrpc/xprtsock.c +1 -1
 	if (used != len)
 		return;
 	transport->tcp_flags &= ~TCP_RCV_COPY_XID;
-	transport->tcp_flags |= TCP_RCV_COPY_CALLDIR;
+	transport->tcp_flags |= TCP_RCV_READ_CALLDIR;
 	transport->tcp_copied = 4;
 	dprintk("RPC:       reading %s XID %08x\n",
 			(transport->tcp_flags & TCP_RPC_REPLY) ? "reply

for"

Quoted 12 lines

net/sunrpc/xprtsock.c static inline void xs_tcp_read_calldir(struct

Quoted 1 line
net/sunrpc/xprtsock.c +0 -0
@@ -1031,9 +1032,13 @@ static inline void xs_tcp_read_calldir(struct

sock_xprt *transport,

net/sunrpc/xprtsock.c static inline void xs_tcp_read_calldir(struct sock_xprt *transport,

Quoted 10 lines
net/sunrpc/xprtsock.c +4 -2
 	transport->tcp_offset += used;
 	if (used != len)
 		return;
-	transport->tcp_flags &= ~TCP_RCV_COPY_CALLDIR;
+	transport->tcp_flags &= ~TCP_RCV_READ_CALLDIR;
+	transport->tcp_flags |= TCP_RCV_COPY_CALLDIR;
 	transport->tcp_flags |= TCP_RCV_COPY_DATA;
-	transport->tcp_copied += 4;
+	/*
+	 * We don't yet have the XDR buffer, so we will write the

calldir

Quoted 9 lines

net/sunrpc/xprtsock.c static inline void xs_tcp_read_common(struct

Quoted 6 lines
net/sunrpc/xprtsock.c +2 -0
+	 * out after we get the buffer from the 'struct rpc_rqst'
+	 */
 	if (ntohl(calldir) == RPC_REPLY)
 		transport->tcp_flags |= TCP_RPC_REPLY;
 	else
@@ -1055,6 +1060,20 @@ static inline void xs_tcp_read_common(struct

rpc_xprt *xprt,

Quoted 2 lines
net/sunrpc/xprtsock.c +0 -0
 	ssize_t r;
 
Quoted 16 lines

net/sunrpc/xprtsock.c static inline void xs_tcp_read_common(struct rpc_xprt *xprt, · line 1074

Quoted 13 lines
net/sunrpc/xprtsock.c +12 -0
 	rcvbuf = &req->rq_private_buf;
+
+	if (transport->tcp_flags & TCP_RCV_COPY_CALLDIR) {
+		/*
+		 * Save the RPC direction in the XDR buffer
+		 */
+		__be32	calldir = transport->tcp_flags & TCP_RPC_REPLY ?
+					htonl(RPC_REPLY) : 0;
+
+		memcpy(rcvbuf->head[0].iov_base + transport->tcp_copied,
+			&calldir, sizeof(calldir));
+		transport->tcp_copied += sizeof(calldir);
+		transport->tcp_flags &= ~TCP_RCV_COPY_CALLDIR;

Can this be done in xs_tcp_read_calldir()?

No, because we don't yet have the XDR buffer. The XDR buffer is in the 'struct rpc_rqst' which we can only obtain after we read the RPC direction. This because we need to see if we get it from the list of pending replies, or from the list of preallocated callback buffers. We can not search for this in xs_tcp_read_calldir() because we also need to obtain it for RPC continuation fragments that will not have the RPC call direction bit set.

I played with another version of the patch that created a new state for allocation of the rpc_rqst buffer, but ran into problems. I'll work some more on that version of the patch in the next few weeks, but I'd like to get the submitted version in right now.

- ricardo

Quoted 17 lines

Benny

net/sunrpc/xprtsock.c static int xs_tcp_data_recv(read_descriptor_t

Quoted 6 lines
net/sunrpc/xprtsock.c +2 -0
+	}
+
 	len = desc->count;
 	if (len > transport->tcp_reclen - transport->tcp_offset) {
 		struct xdr_skb_reader my_desc;
@@ -1258,7 +1277,7 @@ static int xs_tcp_data_recv(read_descriptor_t

*rd_desc, struct sk_buff *skb, uns

Quoted 8 lines
net/sunrpc/xprtsock.c +1 -1
 			continue;
 		}
 		/* Read in the call/reply flag */
-		if (transport->tcp_flags & TCP_RCV_COPY_CALLDIR) {
+		if (transport->tcp_flags & TCP_RCV_READ_CALLDIR) {
 			xs_tcp_read_calldir(transport, &desc);
 			continue;
 		}
#21 lore raw

Re: [PATCH 08/14] SQUASHME: Removal of ugly #ifdefs

In reply to Ricardo Labiaga
Quoted 39 lines · Ricardo Labiaga

[squash with: nfs41: Implement NFSv4.1 callback service process]

---
 fs/nfs/callback.c |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)
fs/nfs/callback.c +24 -0
index 4395c96..116424e 100644
@@ -209,6 +209,39 @@ out:
 	dprintk("--> %s return %p\n", __func__, rqstp);
 	return rqstp;
 }
+
+static inline void nfs_callback_svc_setup(u32 minorversion,
+		struct svc_serv *serv, struct rpc_xprt *xprt,
+		struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
+{
+	if (minorversion) {
+		*rqstpp = nfs41_callback_up(serv, xprt);
+		*callback_svc = nfs41_callback_svc;
+	} else {
+		*rqstpp = nfs4_callback_up(serv);
+		*callback_svc = nfs4_callback_svc;
+	}
+}
+
+static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
+		struct nfs_callback_data *cb_info)
+{
+	if (minorversion)
+		xprt->bc_serv = cb_info->serv;
+}
+#else
+static inline void nfs_callback_svc_setup(u32 minorversion,
+		struct svc_serv *serv, struct rpc_xprt *xprt,
+		struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))

fs/nfs/callback.c out: · line 245

Quoted 10 lines
fs/nfs/callback.c +9 -0
+{
+	*rqstpp = nfs4_callback_up(serv);
+	*callback_svc = nfs4_callback_svc;
+}
+
+static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
+		struct nfs_callback_data *cb_info)
+{
+}
 #endif /* CONFIG_NFS_V4_1 */

Although this removes the ungly #ifdefs from inside nfs_callback_up it just introduces them elsewhere and what's worse, it adds code duplication which is even more unreadable and harder to maintain.

How about something along these line?

static inline void nfs_callback_svc_setup(u32 minorversion,
struct svc_serv *serv, struct rpc_xprt *xprt, struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
{

#ifdef CONFIG_NFS_V4_1
	if (minorversion) {
		*rqstpp = nfs41_callback_up(serv, xprt);
		*callback_svc = nfs41_callback_svc;
		return;
	}
#endif /* CONFIG_NFS_V4_1 */
	*rqstpp = nfs4_callback_up(serv);
	*callback_svc = nfs4_callback_svc;
}

static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
struct nfs_callback_data *cb_info)
{

#ifdef CONFIG_NFS_V4_1
	if (minorversion)
		xprt->bc_serv = cb_info->serv;

#endif /* CONFIG_NFS_V4_1 */
}

Benny

Quoted 33 lines
fs/nfs/callback.c +2 -15
 /*
@@ -225,10 +258,7 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
 
 	mutex_lock(&nfs_callback_mutex);
 	if (cb_info->users++ || cb_info->task != NULL) {
-#if defined(CONFIG_NFS_V4_1)
-		if (minorversion)
-			xprt->bc_serv = cb_info->serv;
-#endif /* CONFIG_NFS_V4_1 */
+		nfs_callback_bc_serv(minorversion, xprt, cb_info);
 		goto out;
 	}
 	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, NULL);
@@ -239,17 +269,7 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
 
 	/* FIXME: either 4.0 or 4.1 callback service can be up at a time
 	 * need to monitor and control them both */
-	if (!minorversion) {
-		rqstp = nfs4_callback_up(serv);
-		callback_svc = nfs4_callback_svc;
-	} else {
-#if defined(CONFIG_NFS_V4_1)
-		rqstp = nfs41_callback_up(serv, xprt);
-		callback_svc = nfs41_callback_svc;
-#else  /* CONFIG_NFS_V4_1 */
-		BUG();
-#endif /* CONFIG_NFS_V4_1 */
-	}
+	nfs_callback_svc_setup(minorversion, serv, xprt, &rqstp, &callback_svc);
 
 	if (IS_ERR(rqstp)) {
 		ret = PTR_ERR(rqstp);
#22 lore raw

Re: [PATCH 08/14] SQUASHME: Removal of ugly #ifdefs

Quoted 61 lines · Benny Halevy
Quoted 39 lines · Ricardo Labiaga

[squash with: nfs41: Implement NFSv4.1 callback service process]

---
 fs/nfs/callback.c |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)
fs/nfs/callback.c +24 -0
index 4395c96..116424e 100644
@@ -209,6 +209,39 @@ out:
 	dprintk("--> %s return %p\n", __func__, rqstp);
 	return rqstp;
 }
+
+static inline void nfs_callback_svc_setup(u32 minorversion,
+		struct svc_serv *serv, struct rpc_xprt *xprt,
+		struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
+{
+	if (minorversion) {
+		*rqstpp = nfs41_callback_up(serv, xprt);
+		*callback_svc = nfs41_callback_svc;
+	} else {
+		*rqstpp = nfs4_callback_up(serv);
+		*callback_svc = nfs4_callback_svc;
+	}
+}
+
+static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
+		struct nfs_callback_data *cb_info)
+{
+	if (minorversion)
+		xprt->bc_serv = cb_info->serv;
+}
+#else
+static inline void nfs_callback_svc_setup(u32 minorversion,
+		struct svc_serv *serv, struct rpc_xprt *xprt,
+		struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))

fs/nfs/callback.c out: · line 245

Quoted 10 lines
fs/nfs/callback.c +9 -0
+{
+	*rqstpp = nfs4_callback_up(serv);
+	*callback_svc = nfs4_callback_svc;
+}
+
+static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
+		struct nfs_callback_data *cb_info)
+{
+}
 #endif /* CONFIG_NFS_V4_1 */

Although this removes the ungly #ifdefs from inside nfs_callback_up it just introduces them elsewhere and what's worse, it adds code duplication which is even more unreadable and harder to maintain.

How about something along these line?

static inline void nfs_callback_svc_setup(u32 minorversion,
struct svc_serv *serv, struct rpc_xprt *xprt, struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
{

Quoted 7 lines
#ifdef CONFIG_NFS_V4_1
	if (minorversion) {
		*rqstpp = nfs41_callback_up(serv, xprt);
		*callback_svc = nfs41_callback_svc;
		return;
	}

#endif /* CONFIG_NFS_V4_1 */\

NACK.... That's _exactly_ the kind of unreadable nonsense I _DON'T_ want to see....

Quoted 53 lines
	*rqstpp = nfs4_callback_up(serv);
	*callback_svc = nfs4_callback_svc;
}

static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
struct nfs_callback_data *cb_info)
{

#ifdef CONFIG_NFS_V4_1
	if (minorversion)
		xprt->bc_serv = cb_info->serv;

#endif /* CONFIG_NFS_V4_1 */
}

Benny

Quoted 23 lines
fs/nfs/callback.c +1 -9
 /*
@@ -225,10 +258,7 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
 
 	mutex_lock(&nfs_callback_mutex);
 	if (cb_info->users++ || cb_info->task != NULL) {
-#if defined(CONFIG_NFS_V4_1)
-		if (minorversion)
-			xprt->bc_serv = cb_info->serv;
-#endif /* CONFIG_NFS_V4_1 */
+		nfs_callback_bc_serv(minorversion, xprt, cb_info);
 		goto out;
 	}
 	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, NULL);
@@ -239,17 +269,7 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
 
 	/* FIXME: either 4.0 or 4.1 callback service can be up at a time
 	 * need to monitor and control them both */
-	if (!minorversion) {
-		rqstp = nfs4_callback_up(serv);
-		callback_svc = nfs4_callback_svc;
-	} else {
-#if defined(CONFIG_NFS_V4_1)

fs/nfs/callback.c int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt) · line 275

Quoted 10 lines
fs/nfs/callback.c +1 -6
-		rqstp = nfs41_callback_up(serv, xprt);
-		callback_svc = nfs41_callback_svc;
-#else  /* CONFIG_NFS_V4_1 */
-		BUG();
-#endif /* CONFIG_NFS_V4_1 */
-	}
+	nfs_callback_svc_setup(minorversion, serv, xprt, &rqstp, &callback_svc);
 
 	if (IS_ERR(rqstp)) {
 		ret = PTR_ERR(rqstp);

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 6 lines
Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com

A message that is not in the archive (sent off-list or not yet received): 1244998412.5298.0.camel-rJ7iovZKK19ZJLDQqaL3InhyD016LWXt@public.gmane.org

#24 lore raw

Re: [pnfs] [PATCH 08/14] SQUASHME: Removal of ugly #ifdefs

Quoted 69 lines · Trond Myklebust
Quoted 60 lines · Benny Halevy
Quoted 39 lines · Ricardo Labiaga

[squash with: nfs41: Implement NFSv4.1 callback service process]

---
 fs/nfs/callback.c |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)
fs/nfs/callback.c +24 -0
index 4395c96..116424e 100644
@@ -209,6 +209,39 @@ out:
 	dprintk("--> %s return %p\n", __func__, rqstp);
 	return rqstp;
 }
+
+static inline void nfs_callback_svc_setup(u32 minorversion,
+		struct svc_serv *serv, struct rpc_xprt *xprt,
+		struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
+{
+	if (minorversion) {
+		*rqstpp = nfs41_callback_up(serv, xprt);
+		*callback_svc = nfs41_callback_svc;
+	} else {
+		*rqstpp = nfs4_callback_up(serv);
+		*callback_svc = nfs4_callback_svc;
+	}
+}
+
+static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
+		struct nfs_callback_data *cb_info)
+{
+	if (minorversion)
+		xprt->bc_serv = cb_info->serv;
+}
+#else
+static inline void nfs_callback_svc_setup(u32 minorversion,
+		struct svc_serv *serv, struct rpc_xprt *xprt,
+		struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))

fs/nfs/callback.c out: · line 245

Quoted 10 lines
fs/nfs/callback.c +9 -0
+{
+	*rqstpp = nfs4_callback_up(serv);
+	*callback_svc = nfs4_callback_svc;
+}
+
+static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
+		struct nfs_callback_data *cb_info)
+{
+}
 #endif /* CONFIG_NFS_V4_1 */

Although this removes the ungly #ifdefs from inside nfs_callback_up it just introduces them elsewhere and what's worse, it adds code duplication which is even more unreadable and harder to maintain.

How about something along these line?

static inline void nfs_callback_svc_setup(u32 minorversion,
struct svc_serv *serv, struct rpc_xprt *xprt, struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
{

Quoted 7 lines
#ifdef CONFIG_NFS_V4_1
	if (minorversion) {
		*rqstpp = nfs41_callback_up(serv, xprt);
		*callback_svc = nfs41_callback_svc;
		return;
	}

#endif /* CONFIG_NFS_V4_1 */\

Quoted 3 lines

NACK.... That's _exactly_ the kind of unreadable nonsense I _DON'T_ want to see....

if you do somewhere global

#ifdef CONFIG_NFS_V4_1
	...
#else
	const int minorversion = 0;

#endif

Then the above if (minorversion) will be optimized out if not CONFIG_NFS_V4_1, by the compiler. (And as a bonus it still gets parsed even if not defined)

Quoted 46 lines
Quoted 46 lines
	*rqstpp = nfs4_callback_up(serv);
	*callback_svc = nfs4_callback_svc;
}

static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
struct nfs_callback_data *cb_info)
{

#ifdef CONFIG_NFS_V4_1
	if (minorversion)
		xprt->bc_serv = cb_info->serv;

#endif /* CONFIG_NFS_V4_1 */
}

Benny

Quoted 31 lines
fs/nfs/callback.c +2 -15
 /*
@@ -225,10 +258,7 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
 
 	mutex_lock(&nfs_callback_mutex);
 	if (cb_info->users++ || cb_info->task != NULL) {
-#if defined(CONFIG_NFS_V4_1)
-		if (minorversion)
-			xprt->bc_serv = cb_info->serv;
-#endif /* CONFIG_NFS_V4_1 */
+		nfs_callback_bc_serv(minorversion, xprt, cb_info);
 		goto out;
 	}
 	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, NULL);
@@ -239,17 +269,7 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
 
 	/* FIXME: either 4.0 or 4.1 callback service can be up at a time
 	 * need to monitor and control them both */
-	if (!minorversion) {
-		rqstp = nfs4_callback_up(serv);
-		callback_svc = nfs4_callback_svc;
-	} else {
-#if defined(CONFIG_NFS_V4_1)
-		rqstp = nfs41_callback_up(serv, xprt);
-		callback_svc = nfs41_callback_svc;
-#else  /* CONFIG_NFS_V4_1 */
-		BUG();
-#endif /* CONFIG_NFS_V4_1 */
-	}
+	nfs_callback_svc_setup(minorversion, serv, xprt, &rqstp, &callback_svc);
 
Quoted 7 lines
Quoted 6 lines

fs/nfs/callback.c int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt) · line 275

Quoted 2 lines
fs/nfs/callback.c +0 -0
 	if (IS_ERR(rqstp)) {
 		ret = PTR_ERR(rqstp);

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Boaz

#25 lore raw

RE: [PATCH 08/14] SQUASHME: Removal of ugly #ifdefs

In reply to Benny Halevy
Quoted 8 lines

-----Original Message-----
From: Benny Halevy [mailto:[email protected]]
Sent: Sunday, June 14, 2009 7:30 AM
To: Labiaga, Ricardo
Cc: Myklebust, Trond; [email protected]; [email protected]
Subject: Re: [PATCH 08/14] SQUASHME: Removal of ugly #ifdefs

On Jun. 12, 2009, 1:54 -0400, Ricardo Labiaga

<[email protected]>

Quoted 6 lines
Quoted 5 lines · wrote:

[squash with: nfs41: Implement NFSv4.1 callback service process]

---
 fs/nfs/callback.c |   50

+++++++++++++++++++++++++++++++++++-----------

Quoted 15 lines

----

Quoted 7 lines
 1 files changed, 35 insertions(+), 15 deletions(-)
fs/nfs/callback.c +0 -0
index 4395c96..116424e 100644

fs/nfs/callback.c out: · line 215

Quoted 7 lines
fs/nfs/callback.c +4 -0
@@ -209,6 +209,39 @@ out:
 	dprintk("--> %s return %p\n", __func__, rqstp);
 	return rqstp;
 }
+
+static inline void nfs_callback_svc_setup(u32 minorversion,
+		struct svc_serv *serv, struct rpc_xprt *xprt,
+		struct svc_rqst **rqstpp, int (**callback_svc)(void

*vrqstp))

Quoted 12 lines

fs/nfs/callback.c out:

Quoted 11 lines
fs/nfs/callback.c +11 -0
+{
+	if (minorversion) {
+		*rqstpp = nfs41_callback_up(serv, xprt);
+		*callback_svc = nfs41_callback_svc;
+	} else {
+		*rqstpp = nfs4_callback_up(serv);
+		*callback_svc = nfs4_callback_svc;
+	}
+}
+
+static inline void nfs_callback_bc_serv(u32 minorversion, struct

rpc_xprt *xprt,

Quoted 9 lines

fs/nfs/callback.c out:

Quoted 9 lines
fs/nfs/callback.c +9 -0
+		struct nfs_callback_data *cb_info)
+{
+	if (minorversion)
+		xprt->bc_serv = cb_info->serv;
+}
+#else
+static inline void nfs_callback_svc_setup(u32 minorversion,
+		struct svc_serv *serv, struct rpc_xprt *xprt,
+		struct svc_rqst **rqstpp, int (**callback_svc)(void

*vrqstp))

Quoted 7 lines

fs/nfs/callback.c out:

Quoted 6 lines
fs/nfs/callback.c +6 -0
+{
+	*rqstpp = nfs4_callback_up(serv);
+	*callback_svc = nfs4_callback_svc;
+}
+
+static inline void nfs_callback_bc_serv(u32 minorversion, struct

rpc_xprt *xprt,

Quoted 9 lines

fs/nfs/callback.c out: · line 245

Quoted 4 lines
fs/nfs/callback.c +3 -0
+		struct nfs_callback_data *cb_info)
+{
+}
 #endif /* CONFIG_NFS_V4_1 */

Although this removes the ungly #ifdefs from inside nfs_callback_up it just introduces them elsewhere and what's worse, it adds code duplication which is even more unreadable and harder to maintain.

There are two lines in common between the #ifdef and #else case.

+ *rqstpp = nfs4_callback_up(serv);
+ *callback_svc = nfs4_callback_svc;

Calling it code duplication is a bit of a stretch :-)

- ricardo

Quoted 5 lines

How about something along these line?

static inline void nfs_callback_svc_setup(u32 minorversion,
struct svc_serv *serv, struct rpc_xprt *xprt, struct svc_rqst **rqstpp, int (**callback_svc)(void

*vrqstp))

Quoted 12 lines

{

#ifdef CONFIG_NFS_V4_1
	if (minorversion) {
		*rqstpp = nfs41_callback_up(serv, xprt);
		*callback_svc = nfs41_callback_svc;
		return;
	}
#endif /* CONFIG_NFS_V4_1 */
	*rqstpp = nfs4_callback_up(serv);
	*callback_svc = nfs4_callback_svc;
}
Quoted 1 line

static inline void nfs_callback_bc_serv(u32 minorversion, struct

rpc_xprt

Quoted 46 lines

*xprt,
struct nfs_callback_data *cb_info)
{

#ifdef CONFIG_NFS_V4_1
	if (minorversion)
		xprt->bc_serv = cb_info->serv;

#endif /* CONFIG_NFS_V4_1 */
}

Benny

fs/nfs/callback.c int nfs_callback_up(u32 minorversion, struct

Quoted 3 lines
fs/nfs/callback.c +0 -0
 /*
@@ -225,10 +258,7 @@ int nfs_callback_up(u32 minorversion, struct

rpc_xprt *xprt)

fs/nfs/callback.c int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)

Quoted 11 lines
fs/nfs/callback.c +1 -4
 	mutex_lock(&nfs_callback_mutex);
 	if (cb_info->users++ || cb_info->task != NULL) {
-#if defined(CONFIG_NFS_V4_1)
-		if (minorversion)
-			xprt->bc_serv = cb_info->serv;
-#endif /* CONFIG_NFS_V4_1 */
+		nfs_callback_bc_serv(minorversion, xprt, cb_info);
 		goto out;
 	}
 	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE,

NULL);

fs/nfs/callback.c int nfs_callback_up(u32 minorversion, struct

Quoted 1 line
fs/nfs/callback.c +0 -0
@@ -239,17 +269,7 @@ int nfs_callback_up(u32 minorversion, struct

rpc_xprt *xprt)

Quoted 5 lines
fs/nfs/callback.c +0 -2
 	/* FIXME: either 4.0 or 4.1 callback service can be up at a time
 	 * need to monitor and control them both */
-	if (!minorversion) {
-		rqstp = nfs4_callback_up(serv);

fs/nfs/callback.c int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)

Quoted 10 lines
fs/nfs/callback.c +1 -9
-		callback_svc = nfs4_callback_svc;
-	} else {
-#if defined(CONFIG_NFS_V4_1)
-		rqstp = nfs41_callback_up(serv, xprt);
-		callback_svc = nfs41_callback_svc;
-#else  /* CONFIG_NFS_V4_1 */
-		BUG();
-#endif /* CONFIG_NFS_V4_1 */
-	}
+	nfs_callback_svc_setup(minorversion, serv, xprt, &rqstp,

&callback_svc);

Quoted 1 line
Quoted 5 lines

fs/nfs/callback.c int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt) · line 275

Quoted 2 lines
fs/nfs/callback.c +0 -0
 	if (IS_ERR(rqstp)) {
 		ret = PTR_ERR(rqstp);

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs"

in

Quoted 2 lines

the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#26 lore raw

RE: [PATCH 08/14] SQUASHME: Removal of ugly #ifdefs

Review

Quoted 4 lines

There are two lines in common between the #ifdef and #else case.

(quoted diff) +2 -0
+	*rqstpp = nfs4_callback_up(serv);
+	*callback_svc = nfs4_callback_svc;

In the function body...
There's also the function's header.

Quoted 2 lines

Calling it code duplication is a bit of a stretch :-)

I agree it isn't much but still any change you will make
in the future will have to bapplied on both copies and that's bad (IMO).

Benny

Quoted 2 lines

- ricardo

-----Original Message-----
From: Labiaga, Ricardo [mailto:[email protected]]
Sent: Mon 2009-06-15 18:31
To: Halevy, Benny
Cc: Myklebust, Trond; [email protected]; [email protected]
Subject: RE: [PATCH 08/14] SQUASHME: Removal of ugly #ifdefs

Quoted 8 lines

-----Original Message-----
From: Benny Halevy [mailto:[email protected]]
Sent: Sunday, June 14, 2009 7:30 AM
To: Labiaga, Ricardo
Cc: Myklebust, Trond; [email protected]; [email protected]
Subject: Re: [PATCH 08/14] SQUASHME: Removal of ugly #ifdefs

On Jun. 12, 2009, 1:54 -0400, Ricardo Labiaga

<[email protected]>

Quoted 6 lines
Quoted 5 lines · wrote:

[squash with: nfs41: Implement NFSv4.1 callback service process]

---
 fs/nfs/callback.c |   50

+++++++++++++++++++++++++++++++++++-----------

Quoted 15 lines

----

Quoted 7 lines
 1 files changed, 35 insertions(+), 15 deletions(-)
fs/nfs/callback.c +0 -0
index 4395c96..116424e 100644

fs/nfs/callback.c out: · line 215

Quoted 7 lines
fs/nfs/callback.c +4 -0
@@ -209,6 +209,39 @@ out:
 	dprintk("--> %s return %p\n", __func__, rqstp);
 	return rqstp;
 }
+
+static inline void nfs_callback_svc_setup(u32 minorversion,
+		struct svc_serv *serv, struct rpc_xprt *xprt,
+		struct svc_rqst **rqstpp, int (**callback_svc)(void

*vrqstp))

Quoted 12 lines

fs/nfs/callback.c out:

Quoted 11 lines
fs/nfs/callback.c +11 -0
+{
+	if (minorversion) {
+		*rqstpp = nfs41_callback_up(serv, xprt);
+		*callback_svc = nfs41_callback_svc;
+	} else {
+		*rqstpp = nfs4_callback_up(serv);
+		*callback_svc = nfs4_callback_svc;
+	}
+}
+
+static inline void nfs_callback_bc_serv(u32 minorversion, struct

rpc_xprt *xprt,

Quoted 9 lines

fs/nfs/callback.c out:

Quoted 9 lines
fs/nfs/callback.c +9 -0
+		struct nfs_callback_data *cb_info)
+{
+	if (minorversion)
+		xprt->bc_serv = cb_info->serv;
+}
+#else
+static inline void nfs_callback_svc_setup(u32 minorversion,
+		struct svc_serv *serv, struct rpc_xprt *xprt,
+		struct svc_rqst **rqstpp, int (**callback_svc)(void

*vrqstp))

Quoted 7 lines

fs/nfs/callback.c out:

Quoted 6 lines
fs/nfs/callback.c +6 -0
+{
+	*rqstpp = nfs4_callback_up(serv);
+	*callback_svc = nfs4_callback_svc;
+}
+
+static inline void nfs_callback_bc_serv(u32 minorversion, struct

rpc_xprt *xprt,

Quoted 9 lines

fs/nfs/callback.c out: · line 245

Quoted 4 lines
fs/nfs/callback.c +3 -0
+		struct nfs_callback_data *cb_info)
+{
+}
 #endif /* CONFIG_NFS_V4_1 */

Although this removes the ungly #ifdefs from inside nfs_callback_up it just introduces them elsewhere and what's worse, it adds code duplication which is even more unreadable and harder to maintain.

There are two lines in common between the #ifdef and #else case.

+ *rqstpp = nfs4_callback_up(serv);
+ *callback_svc = nfs4_callback_svc;

Calling it code duplication is a bit of a stretch :-)

- ricardo

Quoted 5 lines

How about something along these line?

static inline void nfs_callback_svc_setup(u32 minorversion,
struct svc_serv *serv, struct rpc_xprt *xprt, struct svc_rqst **rqstpp, int (**callback_svc)(void

*vrqstp))

Quoted 12 lines

{

#ifdef CONFIG_NFS_V4_1
	if (minorversion) {
		*rqstpp = nfs41_callback_up(serv, xprt);
		*callback_svc = nfs41_callback_svc;
		return;
	}
#endif /* CONFIG_NFS_V4_1 */
	*rqstpp = nfs4_callback_up(serv);
	*callback_svc = nfs4_callback_svc;
}
Quoted 1 line

static inline void nfs_callback_bc_serv(u32 minorversion, struct

rpc_xprt

Quoted 46 lines

*xprt,
struct nfs_callback_data *cb_info)
{

#ifdef CONFIG_NFS_V4_1
	if (minorversion)
		xprt->bc_serv = cb_info->serv;

#endif /* CONFIG_NFS_V4_1 */
}

Benny

fs/nfs/callback.c int nfs_callback_up(u32 minorversion, struct

Quoted 3 lines
fs/nfs/callback.c +0 -0
 /*
@@ -225,10 +258,7 @@ int nfs_callback_up(u32 minorversion, struct

rpc_xprt *xprt)

fs/nfs/callback.c int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)

Quoted 11 lines
fs/nfs/callback.c +1 -4
 	mutex_lock(&nfs_callback_mutex);
 	if (cb_info->users++ || cb_info->task != NULL) {
-#if defined(CONFIG_NFS_V4_1)
-		if (minorversion)
-			xprt->bc_serv = cb_info->serv;
-#endif /* CONFIG_NFS_V4_1 */
+		nfs_callback_bc_serv(minorversion, xprt, cb_info);
 		goto out;
 	}
 	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE,

NULL);

fs/nfs/callback.c int nfs_callback_up(u32 minorversion, struct

Quoted 1 line
fs/nfs/callback.c +0 -0
@@ -239,17 +269,7 @@ int nfs_callback_up(u32 minorversion, struct

rpc_xprt *xprt)

Quoted 5 lines
fs/nfs/callback.c +0 -2
 	/* FIXME: either 4.0 or 4.1 callback service can be up at a time
 	 * need to monitor and control them both */
-	if (!minorversion) {
-		rqstp = nfs4_callback_up(serv);

fs/nfs/callback.c int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)

Quoted 10 lines
fs/nfs/callback.c +1 -9
-		callback_svc = nfs4_callback_svc;
-	} else {
-#if defined(CONFIG_NFS_V4_1)
-		rqstp = nfs41_callback_up(serv, xprt);
-		callback_svc = nfs41_callback_svc;
-#else  /* CONFIG_NFS_V4_1 */
-		BUG();
-#endif /* CONFIG_NFS_V4_1 */
-	}
+	nfs_callback_svc_setup(minorversion, serv, xprt, &rqstp,

&callback_svc);

Quoted 1 line
Quoted 5 lines

fs/nfs/callback.c int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt) · line 275

Quoted 2 lines
fs/nfs/callback.c +0 -0
 	if (IS_ERR(rqstp)) {
 		ret = PTR_ERR(rqstp);

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs"

in

Quoted 2 lines

the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html