[PATCH] nvme-tcp: Use protocol specific operations while reading socket

[PATCH] nvme-tcp: Use protocol specific operations while reading socket

[Potnuri Bharat Teja]

Using socket specific read_sock() calls instead of directly calling
tcp_read_sock() helps lld module registered handlers if any, to be called
from nvme-tcp host.
This patch therefore replaces the tcp_read_sock() with socket specific
prot_ops.

Signed-off-by: Potnuri Bharat Teja <bharat at chelsio.com>
Acked-by: Sagi Grimberg <sagi at grimberg.me>
---
 drivers/nvme/host/tcp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 08a2501b9357..6ba667e62b75 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -1016,14 +1016,15 @@ static int nvme_tcp_try_send(struct nvme_tcp_queue *queue)
 
 static int nvme_tcp_try_recv(struct nvme_tcp_queue *queue)
 {
-	struct sock *sk = queue->sock->sk;
+	struct socket *sock = queue->sock;
+	struct sock *sk = sock->sk;
 	read_descriptor_t rd_desc;
 	int consumed;
 
 	rd_desc.arg.data = queue;
 	rd_desc.count = 1;
 	lock_sock(sk);
-	consumed = tcp_read_sock(sk, &rd_desc, nvme_tcp_recv_skb);
+	consumed = sock->ops->read_sock(sk, &rd_desc, nvme_tcp_recv_skb);
 	release_sock(sk);
 	return consumed;
 }
-- 
2.18.0.232.gb7bd9486b055

[PATCH] nvme-tcp: Use protocol specific operations while reading socket

[Potnuri Bharat Teja]

On Monday, July 07/08/19, 2019@15:22:00 +0530, Potnuri Bharat Teja wrote:
> Using socket specific read_sock() calls instead of directly calling
> tcp_read_sock() helps lld module registered handlers if any, to be called
> from nvme-tcp host.
> This patch therefore replaces the tcp_read_sock() with socket specific
> prot_ops.
> 
> Signed-off-by: Potnuri Bharat Teja <bharat at chelsio.com>
> Acked-by: Sagi Grimberg <sagi at grimberg.me>
> ---
Hi Sagi/Christoph,
Can this be queued for rc?

Thanks,
Bharat

>  drivers/nvme/host/tcp.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
> index 08a2501b9357..6ba667e62b75 100644
> --- a/drivers/nvme/host/tcp.c
> +++ b/drivers/nvme/host/tcp.c
> @@ -1016,14 +1016,15 @@ static int nvme_tcp_try_send(struct nvme_tcp_queue *queue)
>  
>  static int nvme_tcp_try_recv(struct nvme_tcp_queue *queue)
>  {
> -	struct sock *sk = queue->sock->sk;
> +	struct socket *sock = queue->sock;
> +	struct sock *sk = sock->sk;
>  	read_descriptor_t rd_desc;
>  	int consumed;
>  
>  	rd_desc.arg.data = queue;
>  	rd_desc.count = 1;
>  	lock_sock(sk);
> -	consumed = tcp_read_sock(sk, &rd_desc, nvme_tcp_recv_skb);
> +	consumed = sock->ops->read_sock(sk, &rd_desc, nvme_tcp_recv_skb);
>  	release_sock(sk);
>  	return consumed;
>  }
> -- 
> 2.18.0.232.gb7bd9486b055
> 

[PATCH] nvme-tcp: Use protocol specific operations while reading socket

[Christoph Hellwig]

On Wed, Jul 24, 2019@11:58:38AM +0530, Potnuri Bharat Teja wrote:
> On Monday, July 07/08/19, 2019@15:22:00 +0530, Potnuri Bharat Teja wrote:
> > Using socket specific read_sock() calls instead of directly calling
> > tcp_read_sock() helps lld module registered handlers if any, to be called
> > from nvme-tcp host.
> > This patch therefore replaces the tcp_read_sock() with socket specific
> > prot_ops.
> > 
> > Signed-off-by: Potnuri Bharat Teja <bharat at chelsio.com>
> > Acked-by: Sagi Grimberg <sagi at grimberg.me>
> > ---
> Hi Sagi/Christoph,
> Can this be queued for rc?

How is this a -rc candidate?  I was planning on queuing it up for 5.4444.

[PATCH] nvme-tcp: Use protocol specific operations while reading socket

[Potnuri Bharat Teja]

On Wednesday, July 07/24/19, 2019@08:33:24 +0200, Christoph Hellwig wrote:
> On Wed, Jul 24, 2019@11:58:38AM +0530, Potnuri Bharat Teja wrote:
> > On Monday, July 07/08/19, 2019@15:22:00 +0530, Potnuri Bharat Teja wrote:
> > > Using socket specific read_sock() calls instead of directly calling
> > > tcp_read_sock() helps lld module registered handlers if any, to be called
> > > from nvme-tcp host.
> > > This patch therefore replaces the tcp_read_sock() with socket specific
> > > prot_ops.
> > > 
> > > Signed-off-by: Potnuri Bharat Teja <bharat at chelsio.com>
> > > Acked-by: Sagi Grimberg <sagi at grimberg.me>
> > > ---
> > Hi Sagi/Christoph,
> > Can this be queued for rc?
> 
> How is this a -rc candidate?  I was planning on queuing it up for 5.4444.
I believe its a trivial one, so was hoping it could get into immediate rc(rc-2).
If you think otherwise I am fine with 5.4 also.
Thanks.

[PATCH] nvme-tcp: Use protocol specific operations while reading socket

[Christoph Hellwig]

On Wed, Jul 24, 2019@12:28:59PM +0530, Potnuri Bharat Teja wrote:
> > > Hi Sagi/Christoph,
> > > Can this be queued for rc?
> > 
> > How is this a -rc candidate?  I was planning on queuing it up for 5.4444.
> I believe its a trivial one, so was hoping it could get into immediate rc(rc-2).
> If you think otherwise I am fine with 5.4 also.

It does look trivial, but that isn't really the criteria for rc time
inclusion, the prime criteria is if is an important bug fix.

[PATCH] nvme-tcp: Use protocol specific operations while reading socket

[Potnuri Bharat Teja]

On Wednesday, July 07/24/19, 2019@09:01:07 +0200, Christoph Hellwig wrote:
> On Wed, Jul 24, 2019@12:28:59PM +0530, Potnuri Bharat Teja wrote:
> > > > Hi Sagi/Christoph,
> > > > Can this be queued for rc?
> > > 
> > > How is this a -rc candidate?  I was planning on queuing it up for 5.4444.
> > I believe its a trivial one, so was hoping it could get into immediate rc(rc-2).
> > If you think otherwise I am fine with 5.4 also.
> 
> It does look trivial, but that isn't really the criteria for rc time
> inclusion, the prime criteria is if is an important bug fix.
Agreed.

[PATCH] nvme-tcp: Use protocol specific operations while reading socket

[Sagi Grimberg]

>>>> Hi Sagi/Christoph,
>>>> Can this be queued for rc?
>>>
>>> How is this a -rc candidate?  I was planning on queuing it up for 5.4444.
>> I believe its a trivial one, so was hoping it could get into immediate rc(rc-2).
>> If you think otherwise I am fine with 5.4 also.
> 
> It does look trivial, but that isn't really the criteria for rc time
> inclusion, the prime criteria is if is an important bug fix.

Yea, this is 5.4 for sure...