diff mbox series

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

Message ID 168657900128.5619.7769165526407423007.stgit@manet.1015granger.net (mailing list archive)
State Not Applicable
Headers show
Series svcrdma: Go back to releasing pages-under-I/O | expand

Commit Message

Chuck Lever June 12, 2023, 2:10 p.m. UTC
From: Chuck Lever <chuck.lever@oracle.com>

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

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 net/sunrpc/xprtrdma/svc_rdma_sendto.c |    5 -----
 1 file changed, 5 deletions(-)

Comments

Jeff Layton June 12, 2023, 2:24 p.m. UTC | #1
On Mon, 2023-06-12 at 10:10 -0400, Chuck Lever wrote:
> From: Chuck Lever <chuck.lever@oracle.com>
> 
> 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 <chuck.lever@oracle.com>
> ---
>  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:
> 
>
Chuck Lever June 12, 2023, 2:25 p.m. UTC | #2
> On Jun 12, 2023, at 10:24 AM, Jeff Layton <jlayton@kernel.org> wrote:
> 
> On Mon, 2023-06-12 at 10:10 -0400, Chuck Lever wrote:
>> From: Chuck Lever <chuck.lever@oracle.com>
>> 
>> 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 <chuck.lever@oracle.com>
>> ---
>> 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 <jlayton@kernel.org>

--
Chuck Lever
diff mbox series

Patch

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: