UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

SUNRPC: Treat the task and request as separate in the xprt_ops->send_request() 

When we shift to using the transmit queue, then the task that holds the
write lock will not necessarily be the same as the one being transmitted.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2018-08-30 13:27:29 -04:00
parent 902c58872e
commit 50f484e298
5 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/sunrpc/xprt.h
View File

@ -140,7 +140,7 @@ struct rpc_xprt_ops {
void (*connect)(struct rpc_xprt *xprt, struct rpc_task *task); void (*connect)(struct rpc_xprt *xprt, struct rpc_task *task);
int (*buf_alloc)(struct rpc_task *task); int (*buf_alloc)(struct rpc_task *task);
void (*buf_free)(struct rpc_task *task); void (*buf_free)(struct rpc_task *task);
int (*send_request)(struct rpc_task *task); int (*send_request)(struct rpc_rqst *req, struct rpc_task *task);
void (*set_retrans_timeout)(struct rpc_task *task); void (*set_retrans_timeout)(struct rpc_task *task);
void (*timer)(struct rpc_xprt *xprt, struct rpc_task *task); void (*timer)(struct rpc_xprt *xprt, struct rpc_task *task);
void (*release_request)(struct rpc_task *task); void (*release_request)(struct rpc_task *task);

2
net/sunrpc/xprt.c
View File

@ -1191,7 +1191,7 @@ void xprt_transmit(struct rpc_task *task)
} }
connect_cookie = xprt->connect_cookie; connect_cookie = xprt->connect_cookie;
status = xprt->ops->send_request(task); status = xprt->ops->send_request(req, task);
trace_xprt_transmit(xprt, req->rq_xid, status); trace_xprt_transmit(xprt, req->rq_xid, status);
if (status != 0) { if (status != 0) {
task->tk_status = status; task->tk_status = status;

3
net/sunrpc/xprtrdma/svc_rdma_backchannel.c
View File

@ -215,9 +215,8 @@ drop_connection:
* connection. * connection.
*/ */
static int static int
xprt_rdma_bc_send_request(struct rpc_task *task) xprt_rdma_bc_send_request(struct rpc_rqst *rqst, struct rpc_task *task)
{ {
struct rpc_rqst *rqst = task->tk_rqstp;
struct svc_xprt *sxprt = rqst->rq_xprt->bc_xprt; struct svc_xprt *sxprt = rqst->rq_xprt->bc_xprt;
struct svcxprt_rdma *rdma; struct svcxprt_rdma *rdma;
int ret; int ret;

5
net/sunrpc/xprtrdma/transport.c
View File

@ -706,9 +706,8 @@ xprt_rdma_free(struct rpc_task *task)
* sent. Do not try to send this message again. * sent. Do not try to send this message again.
*/ */
static int static int
xprt_rdma_send_request(struct rpc_task *task) xprt_rdma_send_request(struct rpc_rqst *rqst, struct rpc_task *task)
{ {
struct rpc_rqst *rqst = task->tk_rqstp;
struct rpc_xprt *xprt = rqst->rq_xprt; struct rpc_xprt *xprt = rqst->rq_xprt;
struct rpcrdma_req *req = rpcr_to_rdmar(rqst); struct rpcrdma_req *req = rpcr_to_rdmar(rqst);
struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt); struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);
@ -741,7 +740,7 @@ xprt_rdma_send_request(struct rpc_task *task)
/* An RPC with no reply will throw off credit accounting, /* An RPC with no reply will throw off credit accounting,
* so drop the connection to reset the credit grant. * so drop the connection to reset the credit grant.
*/ */
if (!rpc_reply_expected(task)) if (!rpc_reply_expected(rqst->rq_task))
goto drop_connection; goto drop_connection;
return 0; return 0;

27
net/sunrpc/xprtsock.c
View File

@ -449,12 +449,12 @@ static void xs_nospace_callback(struct rpc_task *task)
/** /**
* xs_nospace - place task on wait queue if transmit was incomplete * xs_nospace - place task on wait queue if transmit was incomplete
* @req: pointer to RPC request
* @task: task to put to sleep * @task: task to put to sleep
* *
*/ */
static int xs_nospace(struct rpc_task *task) static int xs_nospace(struct rpc_rqst *req, struct rpc_task *task)
{ {
struct rpc_rqst *req = task->tk_rqstp;
struct rpc_xprt *xprt = req->rq_xprt; struct rpc_xprt *xprt = req->rq_xprt;
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
struct sock *sk = transport->inet; struct sock *sk = transport->inet;
@ -513,6 +513,7 @@ static inline void xs_encode_stream_record_marker(struct xdr_buf *buf)
/** /**
* xs_local_send_request - write an RPC request to an AF_LOCAL socket * xs_local_send_request - write an RPC request to an AF_LOCAL socket
* @req: pointer to RPC request
* @task: RPC task that manages the state of an RPC request * @task: RPC task that manages the state of an RPC request
* *
* Return values: * Return values:
@ -522,9 +523,8 @@ static inline void xs_encode_stream_record_marker(struct xdr_buf *buf)
* ENOTCONN: Caller needs to invoke connect logic then call again * ENOTCONN: Caller needs to invoke connect logic then call again
* other: Some other error occured, the request was not sent * other: Some other error occured, the request was not sent
*/ */
static int xs_local_send_request(struct rpc_task *task) static int xs_local_send_request(struct rpc_rqst *req, struct rpc_task *task)
{ {
struct rpc_rqst *req = task->tk_rqstp;
struct rpc_xprt *xprt = req->rq_xprt; struct rpc_xprt *xprt = req->rq_xprt;
struct sock_xprt *transport = struct sock_xprt *transport =
container_of(xprt, struct sock_xprt, xprt); container_of(xprt, struct sock_xprt, xprt);
@ -569,7 +569,7 @@ static int xs_local_send_request(struct rpc_task *task)
case -ENOBUFS: case -ENOBUFS:
break; break;
case -EAGAIN: case -EAGAIN:
status = xs_nospace(task); status = xs_nospace(req, task);
break; break;
default: default:
dprintk("RPC: sendmsg returned unrecognized error %d\n", dprintk("RPC: sendmsg returned unrecognized error %d\n",
@ -585,6 +585,7 @@ static int xs_local_send_request(struct rpc_task *task)
/** /**
* xs_udp_send_request - write an RPC request to a UDP socket * xs_udp_send_request - write an RPC request to a UDP socket
* @req: pointer to RPC request
* @task: address of RPC task that manages the state of an RPC request * @task: address of RPC task that manages the state of an RPC request
* *
* Return values: * Return values:
@ -594,9 +595,8 @@ static int xs_local_send_request(struct rpc_task *task)
* ENOTCONN: Caller needs to invoke connect logic then call again * ENOTCONN: Caller needs to invoke connect logic then call again
* other: Some other error occurred, the request was not sent * other: Some other error occurred, the request was not sent
*/ */
static int xs_udp_send_request(struct rpc_task *task) static int xs_udp_send_request(struct rpc_rqst *req, struct rpc_task *task)
{ {
struct rpc_rqst *req = task->tk_rqstp;
struct rpc_xprt *xprt = req->rq_xprt; struct rpc_xprt *xprt = req->rq_xprt;
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
struct xdr_buf *xdr = &req->rq_snd_buf; struct xdr_buf *xdr = &req->rq_snd_buf;
@ -638,7 +638,7 @@ process_status:
/* Should we call xs_close() here? */ /* Should we call xs_close() here? */
break; break;
case -EAGAIN: case -EAGAIN:
status = xs_nospace(task); status = xs_nospace(req, task);
break; break;
case -ENETUNREACH: case -ENETUNREACH:
case -ENOBUFS: case -ENOBUFS:
@ -658,6 +658,7 @@ process_status:
/** /**
* xs_tcp_send_request - write an RPC request to a TCP socket * xs_tcp_send_request - write an RPC request to a TCP socket
* @req: pointer to RPC request
* @task: address of RPC task that manages the state of an RPC request * @task: address of RPC task that manages the state of an RPC request
* *
* Return values: * Return values:
@ -670,9 +671,8 @@ process_status:
* XXX: In the case of soft timeouts, should we eventually give up * XXX: In the case of soft timeouts, should we eventually give up
* if sendmsg is not able to make progress? * if sendmsg is not able to make progress?
*/ */
static int xs_tcp_send_request(struct rpc_task *task) static int xs_tcp_send_request(struct rpc_rqst *req, struct rpc_task *task)
{ {
struct rpc_rqst *req = task->tk_rqstp;
struct rpc_xprt *xprt = req->rq_xprt; struct rpc_xprt *xprt = req->rq_xprt;
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
struct xdr_buf *xdr = &req->rq_snd_buf; struct xdr_buf *xdr = &req->rq_snd_buf;
@ -697,7 +697,7 @@ static int xs_tcp_send_request(struct rpc_task *task)
* completes while the socket holds a reference to the pages, * completes while the socket holds a reference to the pages,
* then we may end up resending corrupted data. * then we may end up resending corrupted data.
*/ */
if (task->tk_flags & RPC_TASK_SENT) if (req->rq_task->tk_flags & RPC_TASK_SENT)
zerocopy = false; zerocopy = false;
if (test_bit(XPRT_SOCK_UPD_TIMEOUT, &transport->sock_state)) if (test_bit(XPRT_SOCK_UPD_TIMEOUT, &transport->sock_state))
@ -761,7 +761,7 @@ static int xs_tcp_send_request(struct rpc_task *task)
/* Should we call xs_close() here? */ /* Should we call xs_close() here? */
break; break;
case -EAGAIN: case -EAGAIN:
status = xs_nospace(task); status = xs_nospace(req, task);
break; break;
case -ECONNRESET: case -ECONNRESET:
case -ECONNREFUSED: case -ECONNREFUSED:
@ -2706,9 +2706,8 @@ static int bc_sendto(struct rpc_rqst *req)
/* /*
* The send routine. Borrows from svc_send * The send routine. Borrows from svc_send
*/ */
static int bc_send_request(struct rpc_task *task) static int bc_send_request(struct rpc_rqst *req, struct rpc_task *task)
{ {
struct rpc_rqst *req = task->tk_rqstp;
struct svc_xprt *xprt; struct svc_xprt *xprt;
int len; int len;