Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
f5046b8f
Commit
f5046b8f
authored
Mar 20, 2020
by
Chuck Lever
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
svcrdma: Remove backchannel dprintk call sites
Clean up. Signed-off-by:
Chuck Lever
<
chuck.lever@oracle.com
>
parent
ea740bd5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
43 deletions
+5
-43
net/sunrpc/xprtrdma/svc_rdma_backchannel.c
net/sunrpc/xprtrdma/svc_rdma_backchannel.c
+5
-43
No files found.
net/sunrpc/xprtrdma/svc_rdma_backchannel.c
View file @
f5046b8f
...
...
@@ -10,10 +10,6 @@
#include "xprt_rdma.h"
#include <trace/events/rpcrdma.h>
#define RPCDBG_FACILITY RPCDBG_SVCXPRT
#undef SVCRDMA_BACKCHANNEL_DEBUG
/**
* svc_rdma_handle_bc_reply - Process incoming backchannel Reply
* @rqstp: resources for handling the Reply
...
...
@@ -31,33 +27,17 @@ void svc_rdma_handle_bc_reply(struct svc_rqst *rqstp,
__be32
*
rdma_resp
=
rctxt
->
rc_recv_buf
;
struct
rpc_rqst
*
req
;
u32
credits
;
size_t
len
;
__be32
xid
;
__be32
*
p
;
p
=
(
__be32
*
)
src
->
iov_base
;
len
=
src
->
iov_len
;
xid
=
*
rdma_resp
;
#ifdef SVCRDMA_BACKCHANNEL_DEBUG
pr_info
(
"%s: xid=%08x, length=%zu
\n
"
,
__func__
,
be32_to_cpu
(
xid
),
len
);
pr_info
(
"%s: RPC/RDMA: %*ph
\n
"
,
__func__
,
(
int
)
RPCRDMA_HDRLEN_MIN
,
rdma_resp
);
pr_info
(
"%s: RPC: %*ph
\n
"
,
__func__
,
(
int
)
len
,
p
);
#endif
spin_lock
(
&
xprt
->
queue_lock
);
req
=
xprt_lookup_rqst
(
xprt
,
xid
);
req
=
xprt_lookup_rqst
(
xprt
,
*
rdma_resp
);
if
(
!
req
)
goto
out_unlock
;
dst
=
&
req
->
rq_private_buf
.
head
[
0
];
memcpy
(
&
req
->
rq_private_buf
,
&
req
->
rq_rcv_buf
,
sizeof
(
struct
xdr_buf
));
if
(
dst
->
iov_len
<
len
)
if
(
dst
->
iov_len
<
src
->
iov_
len
)
goto
out_unlock
;
memcpy
(
dst
->
iov_base
,
p
,
len
);
memcpy
(
dst
->
iov_base
,
src
->
iov_base
,
src
->
iov_
len
);
xprt_pin_rqst
(
req
);
spin_unlock
(
&
xprt
->
queue_lock
);
...
...
@@ -66,7 +46,6 @@ void svc_rdma_handle_bc_reply(struct svc_rqst *rqstp,
credits
=
1
;
/* don't deadlock */
else
if
(
credits
>
r_xprt
->
rx_buf
.
rb_bc_max_requests
)
credits
=
r_xprt
->
rx_buf
.
rb_bc_max_requests
;
spin_lock
(
&
xprt
->
transport_lock
);
xprt
->
cwnd
=
credits
<<
RPC_CWNDSHIFT
;
spin_unlock
(
&
xprt
->
transport_lock
);
...
...
@@ -174,10 +153,6 @@ rpcrdma_bc_send_request(struct svcxprt_rdma *rdma, struct rpc_rqst *rqst)
*
p
++
=
xdr_zero
;
*
p
=
xdr_zero
;
#ifdef SVCRDMA_BACKCHANNEL_DEBUG
pr_info
(
"%s: %*ph
\n
"
,
__func__
,
64
,
rqst
->
rq_buffer
);
#endif
rqst
->
rq_xtime
=
ktime_get
();
rc
=
svc_rdma_bc_sendto
(
rdma
,
rqst
,
ctxt
);
if
(
rc
)
...
...
@@ -188,7 +163,6 @@ rpcrdma_bc_send_request(struct svcxprt_rdma *rdma, struct rpc_rqst *rqst)
svc_rdma_send_ctxt_put
(
rdma
,
ctxt
);
drop_connection:
dprintk
(
"svcrdma: failed to send bc call
\n
"
);
return
-
ENOTCONN
;
}
...
...
@@ -207,9 +181,6 @@ static int xprt_rdma_bc_send_request(struct rpc_rqst *rqst)
container_of
(
sxprt
,
struct
svcxprt_rdma
,
sc_xprt
);
int
ret
;
dprintk
(
"svcrdma: sending bc call with xid: %08x
\n
"
,
be32_to_cpu
(
rqst
->
rq_xid
));
if
(
test_bit
(
XPT_DEAD
,
&
sxprt
->
xpt_flags
))
return
-
ENOTCONN
;
...
...
@@ -222,8 +193,6 @@ static int xprt_rdma_bc_send_request(struct rpc_rqst *rqst)
static
void
xprt_rdma_bc_close
(
struct
rpc_xprt
*
xprt
)
{
dprintk
(
"svcrdma: %s: xprt %p
\n
"
,
__func__
,
xprt
);
xprt_disconnect_done
(
xprt
);
xprt
->
cwnd
=
RPC_CWNDSHIFT
;
}
...
...
@@ -231,8 +200,6 @@ xprt_rdma_bc_close(struct rpc_xprt *xprt)
static
void
xprt_rdma_bc_put
(
struct
rpc_xprt
*
xprt
)
{
dprintk
(
"svcrdma: %s: xprt %p
\n
"
,
__func__
,
xprt
);
xprt_rdma_free_addresses
(
xprt
);
xprt_free
(
xprt
);
}
...
...
@@ -267,19 +234,14 @@ xprt_setup_rdma_bc(struct xprt_create *args)
struct
rpc_xprt
*
xprt
;
struct
rpcrdma_xprt
*
new_xprt
;
if
(
args
->
addrlen
>
sizeof
(
xprt
->
addr
))
{
dprintk
(
"RPC: %s: address too large
\n
"
,
__func__
);
if
(
args
->
addrlen
>
sizeof
(
xprt
->
addr
))
return
ERR_PTR
(
-
EBADF
);
}
xprt
=
xprt_alloc
(
args
->
net
,
sizeof
(
*
new_xprt
),
RPCRDMA_MAX_BC_REQUESTS
,
RPCRDMA_MAX_BC_REQUESTS
);
if
(
!
xprt
)
{
dprintk
(
"RPC: %s: couldn't allocate rpc_xprt
\n
"
,
__func__
);
if
(
!
xprt
)
return
ERR_PTR
(
-
ENOMEM
);
}
xprt
->
timeout
=
&
xprt_rdma_bc_timeout
;
xprt_set_bound
(
xprt
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment