hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

svcrdma: Rename svcrdma_encode trace points in send routines 

These trace points are misnamed:

	trace_svcrdma_encode_wseg
	trace_svcrdma_encode_write
	trace_svcrdma_encode_reply
	trace_svcrdma_encode_rseg
	trace_svcrdma_encode_read
	trace_svcrdma_encode_pzr

Because they actually trace posting on the Send Queue. Let's rename
them so that I can add trace points in the chunk list encoders that
actually do trace chunk list encoding events.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2020-03-02 15:02:20 -05:00
parent db9602e404
commit a406c563e8
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/trace/events/rpcrdma.h
View File

@ -1479,7 +1479,9 @@ DECLARE_EVENT_CLASS(svcrdma_segment_event,
DEFINE_SEGMENT_EVENT(decode_wseg); DEFINE_SEGMENT_EVENT(decode_wseg);
DEFINE_SEGMENT_EVENT(encode_rseg); DEFINE_SEGMENT_EVENT(encode_rseg);
DEFINE_SEGMENT_EVENT(send_rseg);
DEFINE_SEGMENT_EVENT(encode_wseg); DEFINE_SEGMENT_EVENT(encode_wseg);
DEFINE_SEGMENT_EVENT(send_wseg);
DECLARE_EVENT_CLASS(svcrdma_chunk_event, DECLARE_EVENT_CLASS(svcrdma_chunk_event,
TP_PROTO( TP_PROTO(
@ -1502,17 +1504,19 @@ DECLARE_EVENT_CLASS(svcrdma_chunk_event,
); );
#define DEFINE_CHUNK_EVENT(name) \ #define DEFINE_CHUNK_EVENT(name) \
DEFINE_EVENT(svcrdma_chunk_event, svcrdma_encode_##name,\ DEFINE_EVENT(svcrdma_chunk_event, svcrdma_##name, \
TP_PROTO( \ TP_PROTO( \
u32 length \ u32 length \
), \ ), \
TP_ARGS(length)) TP_ARGS(length))
DEFINE_CHUNK_EVENT(pzr); DEFINE_CHUNK_EVENT(send_pzr);
DEFINE_CHUNK_EVENT(write); DEFINE_CHUNK_EVENT(encode_write_chunk);
DEFINE_CHUNK_EVENT(reply); DEFINE_CHUNK_EVENT(send_write_chunk);
DEFINE_CHUNK_EVENT(encode_read_chunk);
DEFINE_CHUNK_EVENT(send_reply_chunk);
TRACE_EVENT(svcrdma_encode_read, TRACE_EVENT(svcrdma_send_read_chunk,
TP_PROTO( TP_PROTO(
u32 length, u32 length,
u32 position u32 position

13
net/sunrpc/xprtrdma/svc_rdma_rw.c
View File

@ -439,7 +439,8 @@ svc_rdma_build_writes(struct svc_rdma_write_info *info,
if (ret < 0) if (ret < 0)
goto out_initerr; goto out_initerr;
trace_svcrdma_encode_wseg(seg_handle, write_len, seg_offset); trace_svcrdma_send_wseg(seg_handle, write_len, seg_offset);
list_add(&ctxt->rw_list, &cc->cc_rwctxts); list_add(&ctxt->rw_list, &cc->cc_rwctxts);
cc->cc_sqecount += ret; cc->cc_sqecount += ret;
if (write_len == seg_length - info->wi_seg_off) { if (write_len == seg_length - info->wi_seg_off) {
@ -534,7 +535,7 @@ int svc_rdma_send_write_chunk(struct svcxprt_rdma *rdma, __be32 *wr_ch,
if (ret < 0) if (ret < 0)
goto out_err; goto out_err;
trace_svcrdma_encode_write(xdr->page_len); trace_svcrdma_send_write_chunk(xdr->page_len);
return length; return length;
out_err: out_err:
@ -594,7 +595,7 @@ int svc_rdma_send_reply_chunk(struct svcxprt_rdma *rdma,
if (ret < 0) if (ret < 0)
goto out_err; goto out_err;
trace_svcrdma_encode_reply(consumed); trace_svcrdma_send_reply_chunk(consumed);
return consumed; return consumed;
out_err: out_err:
@ -697,7 +698,7 @@ static int svc_rdma_build_read_chunk(struct svc_rqst *rqstp,
if (ret < 0) if (ret < 0)
break; break;
trace_svcrdma_encode_rseg(rs_handle, rs_length, rs_offset); trace_svcrdma_send_rseg(rs_handle, rs_length, rs_offset);
info->ri_chunklen += rs_length; info->ri_chunklen += rs_length;
} }
@ -728,7 +729,7 @@ static int svc_rdma_build_normal_read_chunk(struct svc_rqst *rqstp,
if (ret < 0) if (ret < 0)
goto out; goto out;
trace_svcrdma_encode_read(info->ri_chunklen, info->ri_position); trace_svcrdma_send_read_chunk(info->ri_chunklen, info->ri_position);
head->rc_hdr_count = 0; head->rc_hdr_count = 0;
@ -784,7 +785,7 @@ static int svc_rdma_build_pz_read_chunk(struct svc_rqst *rqstp,
if (ret < 0) if (ret < 0)
goto out; goto out;
trace_svcrdma_encode_pzr(info->ri_chunklen); trace_svcrdma_send_pzr(info->ri_chunklen);
head->rc_arg.len += info->ri_chunklen; head->rc_arg.len += info->ri_chunklen;
head->rc_arg.buflen += info->ri_chunklen; head->rc_arg.buflen += info->ri_chunklen;