lkml.org 
[lkml]   [2019]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 308/413] SUNRPC: Ensure the bvecs are reset when we re-encode the RPC request
    Date
    From: Trond Myklebust <trond.myklebust@hammerspace.com>

    commit 75369089820473eac45e9ddd970081901a373c08 upstream.

    The bvec tracks the list of pages, so if the number of pages changes
    due to a re-encode, we need to reset the bvec as well.

    Fixes: 277e4ab7d530 ("SUNRPC: Simplify TCP receive code by switching...")
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Cc: stable@vger.kernel.org # v4.20+
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/sunrpc/clnt.c | 3 +--
    net/sunrpc/xprt.c | 2 ++
    net/sunrpc/xprtsock.c | 1 +
    3 files changed, 4 insertions(+), 2 deletions(-)

    --- a/net/sunrpc/clnt.c
    +++ b/net/sunrpc/clnt.c
    @@ -1788,6 +1788,7 @@ rpc_xdr_encode(struct rpc_task *task)
    req->rq_snd_buf.head[0].iov_len = 0;
    xdr_init_encode(&xdr, &req->rq_snd_buf,
    req->rq_snd_buf.head[0].iov_base, req);
    + xdr_free_bvec(&req->rq_snd_buf);
    if (rpc_encode_header(task, &xdr))
    return;

    @@ -1827,8 +1828,6 @@ call_encode(struct rpc_task *task)
    rpc_call_rpcerror(task, task->tk_status);
    }
    return;
    - } else {
    - xprt_request_prepare(task->tk_rqstp);
    }

    /* Add task to reply queue before transmission to avoid races */
    --- a/net/sunrpc/xprt.c
    +++ b/net/sunrpc/xprt.c
    @@ -1013,6 +1013,8 @@ xprt_request_enqueue_receive(struct rpc_

    if (!xprt_request_need_enqueue_receive(task, req))
    return;
    +
    + xprt_request_prepare(task->tk_rqstp);
    spin_lock(&xprt->queue_lock);

    /* Update the softirq receive buffer */
    --- a/net/sunrpc/xprtsock.c
    +++ b/net/sunrpc/xprtsock.c
    @@ -909,6 +909,7 @@ static int xs_nospace(struct rpc_rqst *r
    static void
    xs_stream_prepare_request(struct rpc_rqst *req)
    {
    + xdr_free_bvec(&req->rq_rcv_buf);
    req->rq_task->tk_status = xdr_alloc_bvec(&req->rq_rcv_buf, GFP_KERNEL);
    }


    \
     
     \ /
      Last update: 2019-07-24 21:37    [W:5.874 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site