2023-06-12 14:12:51

by Chuck Lever

Subject: [PATCH v2 1/5] SUNRPC: Revert cc93ce9529a6 ("svcrdma: Retain the page backing rq_res.head[0].iov_base")

From: Chuck Lever <[email protected]>

Pre-requisite for releasing pages in the send completion handler.
Reverted by hand: patch -R would not apply cleanly.

Signed-off-by: Chuck Lever <[email protected]>
---
net/sunrpc/xprtrdma/svc_rdma_sendto.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index a35d1e055b1a..8e7ccef74207 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -975,11 +975,6 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
ret = svc_rdma_send_reply_msg(rdma, sctxt, rctxt, rqstp);
if (ret < 0)
goto put_ctxt;
-
- /* Prevent svc_xprt_release() from releasing the page backing
- * rq_res.head[0].iov_base. It's no longer being accessed by
- * the I/O device. */
- rqstp->rq_respages++;
return 0;

reply_chunk:

2023-06-12 14:46:49

by Jeff Layton

Subject: Re: [PATCH v2 1/5] SUNRPC: Revert cc93ce9529a6 ("svcrdma: Retain the page backing rq_res.head[0].iov_base")

On Mon, 2023-06-12 at 10:10 -0400, Chuck Lever wrote:
> From: Chuck Lever <[email protected]>
>
> Pre-requisite for releasing pages in the send completion handler.
> Reverted by hand: patch -R would not apply cleanly.
>

I'm guessing because there were other patches to this area in the
interim that you didn't want to revert?

> Signed-off-by: Chuck Lever <[email protected]>
> ---
> net/sunrpc/xprtrdma/svc_rdma_sendto.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
> index a35d1e055b1a..8e7ccef74207 100644
> --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
> +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
> @@ -975,11 +975,6 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
> ret = svc_rdma_send_reply_msg(rdma, sctxt, rctxt, rqstp);
> if (ret < 0)
> goto put_ctxt;
> -
> - /* Prevent svc_xprt_release() from releasing the page backing
> - * rq_res.head[0].iov_base. It's no longer being accessed by
> - * the I/O device. */
> - rqstp->rq_respages++;
> return 0;
>
> reply_chunk:
>
>

--
Jeff Layton <[email protected]>

2023-06-12 14:49:14

by Chuck Lever III

Subject: Re: [PATCH v2 1/5] SUNRPC: Revert cc93ce9529a6 ("svcrdma: Retain the page backing rq_res.head[0].iov_base")

> On Jun 12, 2023, at 10:24 AM, Jeff Layton <[email protected]> wrote:
>
> On Mon, 2023-06-12 at 10:10 -0400, Chuck Lever wrote:
>> From: Chuck Lever <[email protected]>
>>
>> Pre-requisite for releasing pages in the send completion handler.
>> Reverted by hand: patch -R would not apply cleanly.
>>
>
> I'm guessing because there were other patches to this area in the
> interim that you didn't want to revert?

Correct.


>> Signed-off-by: Chuck Lever <[email protected]>
>> ---
>> net/sunrpc/xprtrdma/svc_rdma_sendto.c | 5 -----
>> 1 file changed, 5 deletions(-)
>>
>> diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
>> index a35d1e055b1a..8e7ccef74207 100644
>> --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
>> +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
>> @@ -975,11 +975,6 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
>> ret = svc_rdma_send_reply_msg(rdma, sctxt, rctxt, rqstp);
>> if (ret < 0)
>> goto put_ctxt;
>> -
>> - /* Prevent svc_xprt_release() from releasing the page backing
>> - * rq_res.head[0].iov_base. It's no longer being accessed by
>> - * the I/O device. */
>> - rqstp->rq_respages++;
>> return 0;
>>
>> reply_chunk:
>>
>>
>
> --
> Jeff Layton <[email protected]>

--
Chuck Lever