Commit 2426ddfd authored by Chuck Lever's avatar Chuck Lever
Browse files

svcrdma: Remove svcrdma_cm_event() trace point 



Clean up. This trace point is no longer needed because the RDMA/core
CMA code has an equivalent trace point that was added by commit
ed999f82 ("RDMA/cma: Add trace points in RDMA Connection
Manager").

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent b20dfc3f

include/trace/events/rpcrdma.h

+0 −28
Original line number Diff line number Diff line
@@ -1813,34 +1813,6 @@ TRACE_EVENT(svcrdma_post_rw, 
DEFINE_SENDCOMP_EVENT(read);

DEFINE_SENDCOMP_EVENT(write);



TRACE_EVENT(svcrdma_cm_event,

	TP_PROTO(

		const struct rdma_cm_event *event,

		const struct sockaddr *sap

	),



	TP_ARGS(event, sap),



	TP_STRUCT__entry(

		__field(unsigned int, event)

		__field(int, status)

		__array(__u8, addr, INET6_ADDRSTRLEN + 10)

	),



	TP_fast_assign(

		__entry->event = event->event;

		__entry->status = event->status;

		snprintf(__entry->addr, sizeof(__entry->addr) - 1,

			 "%pISpc", sap);

	),



	TP_printk("addr=%s event=%s (%u/%d)",

		__entry->addr,

		rdma_show_cm_event(__entry->event),

		__entry->event, __entry->status

	)

);



TRACE_EVENT(svcrdma_qp_error,

	TP_PROTO(

		const struct ib_event *event,

net/sunrpc/xprtrdma/svc_rdma_transport.c

+0 −7
Original line number Diff line number Diff line
@@ -241,10 +241,6 @@ static void handle_connect_req(struct rdma_cm_id *new_cma_id, 
static int rdma_listen_handler(struct rdma_cm_id *cma_id,

			       struct rdma_cm_event *event)

{

	struct sockaddr *sap = (struct sockaddr *)&cma_id->route.addr.src_addr;



	trace_svcrdma_cm_event(event, sap);



	switch (event->event) {

	case RDMA_CM_EVENT_CONNECT_REQUEST:

		dprintk("svcrdma: Connect request on cma_id=%p, xprt = %p, "
@@ -266,12 +262,9 @@ static int rdma_listen_handler(struct rdma_cm_id *cma_id, 
static int rdma_cma_handler(struct rdma_cm_id *cma_id,

			    struct rdma_cm_event *event)

{

	struct sockaddr *sap = (struct sockaddr *)&cma_id->route.addr.dst_addr;

	struct svcxprt_rdma *rdma = cma_id->context;

	struct svc_xprt *xprt = &rdma->sc_xprt;



	trace_svcrdma_cm_event(event, sap);



	switch (event->event) {

	case RDMA_CM_EVENT_ESTABLISHED:

		/* Accept complete */

CRA Git | Maintained and supported by SUSTech CRA and CCSE