Skip to content

Commit e1648eb

Browse files
chuckleverTrond Myklebust
authored andcommitted
xprtrdma: Remove the RPC/RDMA QP event handler
Clean up: The handler only recorded a trace event. If indeed no action is needed by the RPC/RDMA consumer, then the event can be ignored. Signed-off-by: Chuck Lever <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
1 parent 83189d1 commit e1648eb

File tree

2 files changed

+0
-50
lines changed

2 files changed

+0
-50
lines changed

include/trace/events/rpcrdma.h

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -577,38 +577,6 @@ TRACE_EVENT(xprtrdma_op_set_cto,
577577
)
578578
);
579579

580-
TRACE_EVENT(xprtrdma_qp_event,
581-
TP_PROTO(
582-
const struct rpcrdma_ep *ep,
583-
const struct ib_event *event
584-
),
585-
586-
TP_ARGS(ep, event),
587-
588-
TP_STRUCT__entry(
589-
__field(unsigned long, event)
590-
__string(name, event->device->name)
591-
__array(unsigned char, srcaddr, sizeof(struct sockaddr_in6))
592-
__array(unsigned char, dstaddr, sizeof(struct sockaddr_in6))
593-
),
594-
595-
TP_fast_assign(
596-
const struct rdma_cm_id *id = ep->re_id;
597-
598-
__entry->event = event->event;
599-
__assign_str(name, event->device->name);
600-
memcpy(__entry->srcaddr, &id->route.addr.src_addr,
601-
sizeof(struct sockaddr_in6));
602-
memcpy(__entry->dstaddr, &id->route.addr.dst_addr,
603-
sizeof(struct sockaddr_in6));
604-
),
605-
606-
TP_printk("%pISpc -> %pISpc device=%s %s (%lu)",
607-
__entry->srcaddr, __entry->dstaddr, __get_str(name),
608-
rdma_show_ib_event(__entry->event), __entry->event
609-
)
610-
);
611-
612580
/**
613581
** Call events
614582
**/

net/sunrpc/xprtrdma/verbs.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,22 +120,6 @@ static void rpcrdma_xprt_drain(struct rpcrdma_xprt *r_xprt)
120120
rpcrdma_ep_put(ep);
121121
}
122122

123-
/**
124-
* rpcrdma_qp_event_handler - Handle one QP event (error notification)
125-
* @event: details of the event
126-
* @context: ep that owns QP where event occurred
127-
*
128-
* Called from the RDMA provider (device driver) possibly in an interrupt
129-
* context. The QP is always destroyed before the ID, so the ID will be
130-
* reliably available when this handler is invoked.
131-
*/
132-
static void rpcrdma_qp_event_handler(struct ib_event *event, void *context)
133-
{
134-
struct rpcrdma_ep *ep = context;
135-
136-
trace_xprtrdma_qp_event(ep, event);
137-
}
138-
139123
/* Ensure xprt_force_disconnect() is invoked exactly once when a
140124
* connection is closed or lost. (The important thing is it needs
141125
* to be invoked "at least" once).
@@ -431,8 +415,6 @@ static int rpcrdma_ep_create(struct rpcrdma_xprt *r_xprt)
431415

432416
r_xprt->rx_buf.rb_max_requests = cpu_to_be32(ep->re_max_requests);
433417

434-
ep->re_attr.event_handler = rpcrdma_qp_event_handler;
435-
ep->re_attr.qp_context = ep;
436418
ep->re_attr.srq = NULL;
437419
ep->re_attr.cap.max_inline_data = 0;
438420
ep->re_attr.sq_sig_type = IB_SIGNAL_REQ_WR;

0 commit comments

Comments
 (0)