knfsd: add RDMA debug class to rpc_debug bitfield

Add a bit to the rpc_debug bit field for RDMA transport debug messages and sysctl definitions for configuration and statistics files in /proc/sys/sunrpc/svc_rdma.

Signed-off-by Tom Tucker <[email protected]>

---

 include/linux/sunrpc/debug.h |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

include/linux/sunrpc/debug.h +15 -1

index fc3a5dd..9bf7381 100644
@@ -24,6 +24,7 @@ #define RPCDBG_SVCSOCK		0x0100
 #define RPCDBG_SVCDSP		0x0200
 #define RPCDBG_MISC		0x0400
 #define RPCDBG_CACHE		0x0800
+#define RPCDBG_RDMA		0x1000
 #define RPCDBG_ALL		0x7fff
 
 #ifdef __KERNEL__

@@ -93,6 +94,20 @@ enum {
 	CTL_RDMA_MAXINLINEWRITE,
 	CTL_RDMA_WRITEPADDING,
 	CTL_RDMA_MEMREG,
+	CTL_SVCRDMA,
+	CTL_RDMA_MAX_REQUESTS,
+	CTL_RDMA_MAX_REQ_SIZE,
+	CTL_RDMA_ORD,
+	CTL_RDMA_READ_THROTTLE,
+	CTL_RDMA_STAT_RECV,
+	CTL_RDMA_STAT_READ,
+	CTL_RDMA_STAT_WRITE,
+	CTL_RDMA_STAT_SQ_STARVE,
+	CTL_RDMA_STAT_RQ_STARVE,
+	CTL_RDMA_STAT_RQ_POLL,
+	CTL_RDMA_STAT_RQ_PROD,
+	CTL_RDMA_STAT_SQ_POLL,
+	CTL_RDMA_STAT_SQ_PROD
 };
 
 #endif /* _LINUX_SUNRPC_DEBUG_H_ */
 
 
-------------------------------------------------------------------------

This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs

Hi Tom-

On the client side, I added a generic debug flag for transports, not a specific flag for sockets. Would you consider doing the same here?

Quoted 45 lines · Tom Tucker

Add a bit to the rpc_debug bit field for RDMA transport debug messages and sysctl definitions for configuration and statistics files in /proc/sys/sunrpc/svc_rdma.

Signed-off-by Tom Tucker <[email protected]>

---

 include/linux/sunrpc/debug.h |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

include/linux/sunrpc/debug.h +15 -0

index fc3a5dd..9bf7381 100644
@@ -24,6 +24,7 @@ #define RPCDBG_SVCSOCK		0x0100
 #define RPCDBG_SVCDSP		0x0200
 #define RPCDBG_MISC		0x0400
 #define RPCDBG_CACHE		0x0800
+#define RPCDBG_RDMA		0x1000
 #define RPCDBG_ALL		0x7fff
 
 #ifdef __KERNEL__

@@ -93,6 +94,20 @@ enum {
 	CTL_RDMA_MAXINLINEWRITE,
 	CTL_RDMA_WRITEPADDING,
 	CTL_RDMA_MEMREG,
+	CTL_SVCRDMA,
+	CTL_RDMA_MAX_REQUESTS,
+	CTL_RDMA_MAX_REQ_SIZE,
+	CTL_RDMA_ORD,
+	CTL_RDMA_READ_THROTTLE,
+	CTL_RDMA_STAT_RECV,
+	CTL_RDMA_STAT_READ,
+	CTL_RDMA_STAT_WRITE,
+	CTL_RDMA_STAT_SQ_STARVE,
+	CTL_RDMA_STAT_RQ_STARVE,
+	CTL_RDMA_STAT_RQ_POLL,
+	CTL_RDMA_STAT_RQ_PROD,
+	CTL_RDMA_STAT_SQ_POLL,
+	CTL_RDMA_STAT_SQ_PROD
 };
 
 #endif /* _LINUX_SUNRPC_DEBUG_H_ */

Quoted 8 lines

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs

Add a bit to the rpc_debug bit field for RDMA transport debug messages and sysctl definitions for configuration and statistics files in /proc/sys/sunrpc/svc_rdma.

Signed-off-by Tom Tucker <[email protected]>

---

 include/linux/sunrpc/debug.h |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

include/linux/sunrpc/debug.h +0 -0

index fc3a5dd..9bf7381 100644

include/linux/sunrpc/debug.h +7 -0

 #ifdef __KERNEL__

@@ -93,6 +94,20 @@ enum {
 	CTL_RDMA_MAXINLINEWRITE,
 	CTL_RDMA_WRITEPADDING,
 	CTL_RDMA_MEMREG,
+	CTL_SVCRDMA,
+	CTL_RDMA_MAX_REQUESTS,
+	CTL_RDMA_MAX_REQ_SIZE,
+	CTL_RDMA_ORD,
+	CTL_RDMA_READ_THROTTLE,
+	CTL_RDMA_STAT_RECV,
+	CTL_RDMA_STAT_READ,

Quoted 16 lines · Tom Tucker

Add a bit to the rpc_debug bit field for RDMA transport debug messages and sysctl definitions for configuration and statistics files in /proc/sys/sunrpc/svc_rdma.

Signed-off-by Tom Tucker <[email protected]>

---

 include/linux/sunrpc/debug.h |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

include/linux/sunrpc/debug.h +0 -0

index fc3a5dd..9bf7381 100644

include/linux/sunrpc/debug.h #define RPCDBG_SVCSOCK 0x0100 · line 28

Quoted 5 lines

include/linux/sunrpc/debug.h +1 -0

@@ -24,6 +24,7 @@ #define RPCDBG_SVCSOCK  0x0100
 #define RPCDBG_SVCDSP  0x0200
 #define RPCDBG_MISC  0x0400
 #define RPCDBG_CACHE  0x0800
+#define RPCDBG_RDMA  0x1000
 #define RPCDBG_ALL  0x7fff

Fine. Did you update the rpc_debug program in nfs-utils, which also knows about these debug bits?

Quoted 21 lines

include/linux/sunrpc/debug.h +14 -0

 #ifdef __KERNEL__

@@ -93,6 +94,20 @@ enum {
 CTL_RDMA_MAXINLINEWRITE,
 CTL_RDMA_WRITEPADDING,
 CTL_RDMA_MEMREG,
+ CTL_SVCRDMA,
+ CTL_RDMA_MAX_REQUESTS,
+ CTL_RDMA_MAX_REQ_SIZE,
+ CTL_RDMA_ORD,
+ CTL_RDMA_READ_THROTTLE,
+ CTL_RDMA_STAT_RECV,
+ CTL_RDMA_STAT_READ,
+ CTL_RDMA_STAT_WRITE,
+ CTL_RDMA_STAT_SQ_STARVE,
+ CTL_RDMA_STAT_RQ_STARVE,
+ CTL_RDMA_STAT_RQ_POLL,
+ CTL_RDMA_STAT_RQ_PROD,
+ CTL_RDMA_STAT_SQ_POLL,
+ CTL_RDMA_STAT_SQ_PROD
 };
 

include/linux/sunrpc/debug.h enum { · line 113

Quoted 1 line

include/linux/sunrpc/debug.h +0 -0

 #endif /* _LINUX_SUNRPC_DEBUG_H_ */

This is fine, but one tiny nit: you have the makings of two patches here. This hunk belongs with the patch that uses the new defines and registers the sysctls.

Greg.

BTW, Chuck Lever also pointed out that we should probably have a generic RPCDBG_XPRT debug flag instead of RPCDBG_RDMA.

I think he's right. I think
this should be part of the transport patchset that you're working on. Do you agree?

In any case I'm happy to do whatever is necessary in the transport patchset, but I'd appreciate Neil's guidance on which approach he'd prefer before I go in with the scalpel. Neil?

Quoted 3 lines · On Monday May 21, [email protected] wrote:

In any case I'm happy to do whatever is necessary in the transport patchset, but I'd appreciate Neil's guidance on which approach he'd prefer before I go in with the scalpel. Neil?

I cannot immediately see the value in having different debug bits for the socket transport code and the RDMA transport code. The key question is "When would you want to see the debugging from one, but not from the other", and I cannot see when that would be. Almost certainly if you are testing one transport, you will not be using the other, so it will not contribute any noise.

So I suspect we should simply
#define RPCDBG_FACILITY RPCDBG_SVCSOCK

in any server-RDMA specific files, and see how we go.

Quoted 11 lines · Neil Brown

Quoted 3 lines · On Monday May 21, [email protected] wrote:

In any case I'm happy to do whatever is necessary in the transport patchset, but I'd appreciate Neil's guidance on which approach he'd prefer before I go in with the scalpel. Neil?

I cannot immediately see the value in having different debug bits for the socket transport code and the RDMA transport code. The key question is "When would you want to see the debugging from one, but not from the other", and I cannot see when that would be. Almost certainly if you are testing one transport, you will not be using the other, so it will not contribute any noise.

That's how I did it in the client transport switch. One bit enables debug messages for all transports.

Quoted 2 lines

So I suspect we should simply
#define RPCDBG_FACILITY RPCDBG_SVCSOCK

That's expedient, but I suggest you rename the flag to something less specific to sockets.

Quoted 11 lines · Chuck Lever

Quoted 10 lines · Neil Brown

Quoted 3 lines · On Monday May 21, [email protected] wrote:

In any case I'm happy to do whatever is necessary in the transport patchset, but I'd appreciate Neil's guidance on which approach he'd prefer before I go in with the scalpel. Neil?

I cannot immediately see the value in having different debug bits for the socket transport code and the RDMA transport code. The key question is "When would you want to see the debugging from one, but not from the other", and I cannot see when that would be. Almost certainly if you are testing one transport, you will not be using the other, so it will not contribute any noise.

Quoted 5 lines

That's how I did it in the client transport switch. One bit enables debug messages for all transports.

Quoted 2 lines

So I suspect we should simply
#define RPCDBG_FACILITY RPCDBG_SVCSOCK

That's expedient, but I suggest you rename the flag to something less specific to sockets.

Aah, I see now. That's very easy. How's this?

Rename RPCDBG_SVCSOCK to RPCDBG_SVCXPRT to reflect its new more generic nature.

Signed-off-by Greg Banks <[email protected]>

---

 include/linux/sunrpc/debug.h |    2 +-
 net/sunrpc/svcsock.c         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux/include/linux/sunrpc/debug.h
===================================================================

include/linux/sunrpc/debug.h +1 -1

@@ -20,7 +20,7 @@
 #define RPCDBG_PMAP		0x0020
 #define RPCDBG_SCHED		0x0040
 #define RPCDBG_TRANS		0x0080
-#define RPCDBG_SVCSOCK		0x0100
+#define RPCDBG_SVCXPRT		0x0100
 #define RPCDBG_SVCDSP		0x0200
 #define RPCDBG_MISC		0x0400
 #define RPCDBG_CACHE		0x0800

Index: linux/net/sunrpc/svcsock.c
===================================================================

net/sunrpc/svcsock.c +1 -1

@@ -73,7 +73,7 @@
  *
  */
 
-#define RPCDBG_FACILITY	RPCDBG_SVCSOCK
+#define RPCDBG_FACILITY	RPCDBG_SVCXPRT
 
 
 static struct svc_sock *svc_setup_socket(struct svc_serv *, struct socket *,

Greg.