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

Commit 8f39fce8 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge tag 'nfs-rdma-for-4.16-1' of git://git.linux-nfs.org/projects/anna/linux-nfs 

NFS-over-RDMA client updates for Linux 4.16

New features:
- xprtrdma tracepoints

Bugfixes and cleanups:
- Fix memory leak if rpcrdma_buffer_create() fails
- Fix allocating extra rpcrdma_reps for the backchannel
- Remove various unused and redundant variables and lock cycles
- Fix IPv6 support in xprt_rdma_set_port()
- Fix memory leak by calling buf_free for callback replies
- Fix "bytes registered" accounting
- Fix kernel-doc comments
- SUNRPC tracepoint cleanups for consistent information
- Optimizations for __rpc_execute()
parents 0be283f6 21ead9ff

include/linux/sunrpc/xprtrdma.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ enum rpcrdma_memreg { 
	RPCRDMA_MEMWINDOWS,

	RPCRDMA_MEMWINDOWS_ASYNC,

	RPCRDMA_MTHCAFMR,

	RPCRDMA_FRMR,

	RPCRDMA_FRWR,

	RPCRDMA_ALLPHYSICAL,

	RPCRDMA_LAST

};

include/trace/events/rdma.h

0 → 100644
+129 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2017 Oracle.  All rights reserved.

 */



/*

 * enum ib_event_type, from include/rdma/ib_verbs.h

 */



#define IB_EVENT_LIST				\

	ib_event(CQ_ERR)			\

	ib_event(QP_FATAL)			\

	ib_event(QP_REQ_ERR)			\

	ib_event(QP_ACCESS_ERR)			\

	ib_event(COMM_EST)			\

	ib_event(SQ_DRAINED)			\

	ib_event(PATH_MIG)			\

	ib_event(PATH_MIG_ERR)			\

	ib_event(DEVICE_FATAL)			\

	ib_event(PORT_ACTIVE)			\

	ib_event(PORT_ERR)			\

	ib_event(LID_CHANGE)			\

	ib_event(PKEY_CHANGE)			\

	ib_event(SM_CHANGE)			\

	ib_event(SRQ_ERR)			\

	ib_event(SRQ_LIMIT_REACHED)		\

	ib_event(QP_LAST_WQE_REACHED)		\

	ib_event(CLIENT_REREGISTER)		\

	ib_event(GID_CHANGE)			\

	ib_event_end(WQ_FATAL)



#undef ib_event

#undef ib_event_end



#define ib_event(x)		TRACE_DEFINE_ENUM(IB_EVENT_##x);

#define ib_event_end(x)		TRACE_DEFINE_ENUM(IB_EVENT_##x);



IB_EVENT_LIST



#undef ib_event

#undef ib_event_end



#define ib_event(x)		{ IB_EVENT_##x, #x },

#define ib_event_end(x)		{ IB_EVENT_##x, #x }



#define rdma_show_ib_event(x) \

		__print_symbolic(x, IB_EVENT_LIST)



/*

 * enum ib_wc_status type, from include/rdma/ib_verbs.h

 */

#define IB_WC_STATUS_LIST			\

	ib_wc_status(SUCCESS)			\

	ib_wc_status(LOC_LEN_ERR)		\

	ib_wc_status(LOC_QP_OP_ERR)		\

	ib_wc_status(LOC_EEC_OP_ERR)		\

	ib_wc_status(LOC_PROT_ERR)		\

	ib_wc_status(WR_FLUSH_ERR)		\

	ib_wc_status(MW_BIND_ERR)		\

	ib_wc_status(BAD_RESP_ERR)		\

	ib_wc_status(LOC_ACCESS_ERR)		\

	ib_wc_status(REM_INV_REQ_ERR)		\

	ib_wc_status(REM_ACCESS_ERR)		\

	ib_wc_status(REM_OP_ERR)		\

	ib_wc_status(RETRY_EXC_ERR)		\

	ib_wc_status(RNR_RETRY_EXC_ERR)		\

	ib_wc_status(LOC_RDD_VIOL_ERR)		\

	ib_wc_status(REM_INV_RD_REQ_ERR)	\

	ib_wc_status(REM_ABORT_ERR)		\

	ib_wc_status(INV_EECN_ERR)		\

	ib_wc_status(INV_EEC_STATE_ERR)		\

	ib_wc_status(FATAL_ERR)			\

	ib_wc_status(RESP_TIMEOUT_ERR)		\

	ib_wc_status_end(GENERAL_ERR)



#undef ib_wc_status

#undef ib_wc_status_end



#define ib_wc_status(x)		TRACE_DEFINE_ENUM(IB_WC_##x);

#define ib_wc_status_end(x)	TRACE_DEFINE_ENUM(IB_WC_##x);



IB_WC_STATUS_LIST



#undef ib_wc_status

#undef ib_wc_status_end



#define ib_wc_status(x)		{ IB_WC_##x, #x },

#define ib_wc_status_end(x)	{ IB_WC_##x, #x }



#define rdma_show_wc_status(x) \

		__print_symbolic(x, IB_WC_STATUS_LIST)



/*

 * enum rdma_cm_event_type, from include/rdma/rdma_cm.h

 */

#define RDMA_CM_EVENT_LIST			\

	rdma_cm_event(ADDR_RESOLVED)		\

	rdma_cm_event(ADDR_ERROR)		\

	rdma_cm_event(ROUTE_RESOLVED)		\

	rdma_cm_event(ROUTE_ERROR)		\

	rdma_cm_event(CONNECT_REQUEST)		\

	rdma_cm_event(CONNECT_RESPONSE)		\

	rdma_cm_event(CONNECT_ERROR)		\

	rdma_cm_event(UNREACHABLE)		\

	rdma_cm_event(REJECTED)			\

	rdma_cm_event(ESTABLISHED)		\

	rdma_cm_event(DISCONNECTED)		\

	rdma_cm_event(DEVICE_REMOVAL)		\

	rdma_cm_event(MULTICAST_JOIN)		\

	rdma_cm_event(MULTICAST_ERROR)		\

	rdma_cm_event(ADDR_CHANGE)		\

	rdma_cm_event_end(TIMEWAIT_EXIT)



#undef rdma_cm_event

#undef rdma_cm_event_end



#define rdma_cm_event(x)	TRACE_DEFINE_ENUM(RDMA_CM_EVENT_##x);

#define rdma_cm_event_end(x)	TRACE_DEFINE_ENUM(RDMA_CM_EVENT_##x);



RDMA_CM_EVENT_LIST



#undef rdma_cm_event

#undef rdma_cm_event_end



#define rdma_cm_event(x)	{ RDMA_CM_EVENT_##x, #x },

#define rdma_cm_event_end(x)	{ RDMA_CM_EVENT_##x, #x }



#define rdma_show_cm_event(x) \

		__print_symbolic(x, RDMA_CM_EVENT_LIST)

include/trace/events/rpcrdma.h

0 → 100644
+890 −0

File added.

Preview size limit exceeded, changes collapsed.

include/trace/events/sunrpc.h

+6 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ DECLARE_EVENT_CLASS(rpc_task_status, 
		__entry->status = task->tk_status;

	),



	TP_printk("task:%u@%u, status %d",

	TP_printk("task:%u@%u status=%d",

		__entry->task_id, __entry->client_id,

		__entry->status)

);
@@ -66,7 +66,7 @@ TRACE_EVENT(rpc_connect_status, 
		__entry->status = status;

	),



	TP_printk("task:%u@%u, status %d",

	TP_printk("task:%u@%u status=%d",

		__entry->task_id, __entry->client_id,

		__entry->status)

);
@@ -390,6 +390,10 @@ DECLARE_EVENT_CLASS(rpc_xprt_event, 
			__entry->status)

);



DEFINE_EVENT(rpc_xprt_event, xprt_timer,

	TP_PROTO(struct rpc_xprt *xprt, __be32 xid, int status),

	TP_ARGS(xprt, xid, status));



DEFINE_EVENT(rpc_xprt_event, xprt_lookup_rqst,

	TP_PROTO(struct rpc_xprt *xprt, __be32 xid, int status),

	TP_ARGS(xprt, xid, status));

net/sunrpc/sched.c

+12 −14

File changed.

Preview size limit exceeded, changes collapsed.