nvme-tcp: set MSG_SENDPAGE_NOTLAST with MSG_MORE when we have more to send
Subsystems (2)
Sagi Grimberg
maintainerPATCH 1/2 nvme-tcp: set MSG_SENDPAGE_NOTLAST with MSG_MORE when we have more to send
We can signal the stack that this is not the last page coming and the stack can build a larger tso segment, so go ahead and use it.
--- drivers/nvme/host/tcp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/nvme/host/tcp.c +8 -3
@@ -885,7 +885,7 @@ static int nvme_tcp_try_send_data(struct nvme_tcp_request *req)if (last && !queue->data_digest) flags |=MSG_EOR ;else - flags |=MSG_MORE ; + flags |=MSG_MORE |MSG_SENDPAGE_NOTLAST ;/* can't zcopy slab pages */ if (unlikely (PageSlab (page))) {
@@ -924,11 +924,16 @@ static int nvme_tcp_try_send_cmd_pdu(struct nvme_tcp_request *req)struct nvme_tcp_queue *queue = req->queue;struct nvme_tcp_cmd_pdu *pdu = req->pdu;bool inline_data =nvme_tcp_has_inline_data (req); -int flags =MSG_DONTWAIT | (inline_data ?MSG_MORE :MSG_EOR );u8 hdgst =nvme_tcp_hdgst_len (queue);int len =sizeof (*pdu) + hdgst - req->offset; +int flags =MSG_DONTWAIT ;int ret; +if (inline_data) + flags |=MSG_MORE |MSG_SENDPAGE_NOTLAST ; +else + flags |=MSG_EOR ; +if (queue->hdr_digest && !req->offset)nvme_tcp_hdgst (queue->snd_hash, pdu,sizeof (*pdu));
@@ -967,7 +972,7 @@ static int nvme_tcp_try_send_data_pdu(struct nvme_tcp_request *req) ret =kernel_sendpage (queue->sock,virt_to_page (pdu),offset_in_page (pdu) + req->offset, len, -MSG_DONTWAIT |MSG_MORE ); +MSG_DONTWAIT |MSG_MORE |MSG_SENDPAGE_NOTLAST );if (unlikely (ret <=0 ))return ret;
Signature · 7 lines
2.20.1 _______________________________________________ linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Sagi Grimberg
maintainerPATCH 2/2 nvmet-tcp: set MSG_SENDPAGE_NOTLAST with MSG_MORE when we have more to send
We can signal the stack that this is not the last page coming and the stack can build a larger tso segment, so go ahead and use it.
--- drivers/nvme/target/tcp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/nvme/target/tcp.c +4 -4
@@ -510,7 +510,7 @@ static int nvmet_try_send_data_pdu(struct nvmet_tcp_cmd *cmd) ret =kernel_sendpage (cmd->queue->sock,virt_to_page (cmd->data_pdu),offset_in_page (cmd->data_pdu) + cmd->offset, - left,MSG_DONTWAIT |MSG_MORE ); + left,MSG_DONTWAIT |MSG_MORE |MSG_SENDPAGE_NOTLAST );if (ret <=0 )return ret;
@@ -538,7 +538,7 @@ static int nvmet_try_send_data(struct nvmet_tcp_cmd *cmd, bool last_in_batch)if ((!last_in_batch && cmd->queue->send_list_len) || cmd->wbytes_done + left < cmd->req.transfer_len || queue->data_digest || !queue->nvme_sq.sqhd_disabled) - flags |=MSG_MORE ; + flags |=MSG_MORE |MSG_SENDPAGE_NOTLAST ; ret =kernel_sendpage (cmd->queue->sock, page, cmd->offset, left, flags);
@@ -585,7 +585,7 @@ static int nvmet_try_send_response(struct nvmet_tcp_cmd *cmd,int ret;if (!last_in_batch && cmd->queue->send_list_len) - flags |=MSG_MORE ; + flags |=MSG_MORE |MSG_SENDPAGE_NOTLAST ;else flags |=MSG_EOR ;
@@ -614,7 +614,7 @@ static int nvmet_try_send_r2t(struct nvmet_tcp_cmd *cmd, bool last_in_batch)int ret;if (!last_in_batch && cmd->queue->send_list_len) - flags |=MSG_MORE ; + flags |=MSG_MORE |MSG_SENDPAGE_NOTLAST ;else flags |=MSG_EOR ;
Signature · 7 lines
2.20.1 _______________________________________________ linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 2/2] nvmet-tcp: set MSG_SENDPAGE_NOTLAST with MSG_MORE when we have more to send
Quoted 2 lines · Sagi Grimberg
We can signal the stack that this is not the last page coming and the stack can build a larger tso segment, so go ahead and use it.
Applied to nvme-5.8.
Can you prepare a patch to add the missing MSG_EOR flag in nvmet_try_send_ddgst?
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerQuoted 2 lines · Sagi Grimberg
We can signal the stack that this is not the last page coming and the stack can build a larger tso segment, so go ahead and use it.
Maybe you wan a little helper that returns the flags based on a last flag? Something like:
static int nvme_tcp_msg_flags(bool last_page)
{
if (last_page)
return MSG_DONTWAIT | MSG_MORE | MSG_SENDPAGE_NOTLAST;
return MSG_DONTWAIT | MSG_EOR;
}or do we have a case where we don't want to set EOR? At least the target seems to currently have such a case.
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Sagi Grimberg
maintainerQuoted 7 lines
Quoted 3 lines
We can signal the stack that this is not the last page coming and the stack can build a larger tso segment, so go ahead and use it.
Maybe you wan a little helper that returns the flags based on a last flag? Something like:
Quoted 6 lines
static int
nvme_tcp_msg_flags(bool last_page){ if (last_page) return MSG_DONTWAIT | MSG_MORE | MSG_SENDPAGE_NOTLAST; return MSG_DONTWAIT | MSG_EOR; }
You have it reversed, the flag here probably means more...
Let me see if it is useful to have, will let you know...
Quoted 3 lines
or do we have a case where we don't want to set EOR? At least the target seems to currently have such a case.
As a design goal, we try to tell the stack explicitly if we have more to send and if not we want to push it down to reduce latency. So I think we need to have it in the target as well.
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerQuoted 19 lines · Sagi Grimberg
Quoted 7 lines
Quoted 3 lines
We can signal the stack that this is not the last page coming and the stack can build a larger tso segment, so go ahead and use it.
Maybe you wan a little helper that returns the flags based on a last flag? Something like:
Quoted 6 lines
static int
nvme_tcp_msg_flags(bool last_page){ if (last_page) return MSG_DONTWAIT | MSG_MORE | MSG_SENDPAGE_NOTLAST; return MSG_DONTWAIT | MSG_EOR; }You have it reversed, the flag here probably means more...
Let me see if it is useful to have, will let you know...
Quoted 1 line
Quoted 6 lines
Quoted 2 lines
or do we have a case where we don't want to set EOR? At least the target seems to currently have such a case.
As a design goal, we try to tell the stack explicitly if we have more to send and if not we want to push it down to reduce latency. So I think we need to have it in the target as well.
What I mean is that nvmet_try_send_data and nvmet_try_send_ddgst may set neither MS_MORE nor MSG_EOR. Is that intentional?
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Sagi Grimberg
maintainerQuoted 22 lines
Quoted 22 lines
Quoted 7 lines
Quoted 3 lines
We can signal the stack that this is not the last page coming and the stack can build a larger tso segment, so go ahead and use it.
Maybe you wan a little helper that returns the flags based on a last flag? Something like:
Quoted 6 lines
static int
nvme_tcp_msg_flags(bool last_page){ if (last_page) return MSG_DONTWAIT | MSG_MORE | MSG_SENDPAGE_NOTLAST; return MSG_DONTWAIT | MSG_EOR; }You have it reversed, the flag here probably means more...
Let me see if it is useful to have, will let you know...
Quoted 3 lines
or do we have a case where we don't want to set EOR? At least the target seems to currently have such a case.
Quoted 6 lines
Quoted 3 lines
As a design goal, we try to tell the stack explicitly if we have more to send and if not we want to push it down to reduce latency. So I think we need to have it in the target as well.
What I mean is that
nvmet_try_send_dataandnvmet_try_send_ddgstmay set neitherMS_MOREnorMSG_EOR. Is that intentional?
nvmet_try_send_data should set MSG_EOR if it doesn't have more to send and also nvmet_try_send_ddgst. So its not intentional.
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerQuoted 5 lines · Sagi Grimberg
Quoted 2 lines
What I mean is that
nvmet_try_send_dataandnvmet_try_send_ddgstmay set neitherMS_MOREnorMSG_EOR. Is that intentional?
nvmet_try_send_datashould setMSG_EORif it doesn't have more to send and alsonvmet_try_send_ddgst. So its not intentional.
Ok. Can you send it with a little helper like I suggested (probably one each for host and target) that ensures the right flags are set everywhere?
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Sagi Grimberg
maintainerQuoted 10 lines
Quoted 6 lines
Quoted 3 lines
What I mean is that
nvmet_try_send_dataandnvmet_try_send_ddgstmay set neitherMS_MOREnorMSG_EOR. Is that intentional?
nvmet_try_send_datashould setMSG_EORif it doesn't have more to send and alsonvmet_try_send_ddgst. So its not intentional.Ok. Can you send it with a little helper like I suggested (probably one each for host and target) that ensures the right flags are set everywhere?
I think its actually better without the helper. MSG_SENDPAGE_NOTLAST is designed only for sendpage and not for sendmsg which we use for ddgst (although the net stack code appears to ignore, but still) and when we send a pdu header that has data, we dont need the condition because its not last for sure.
So the helpers capture ~60% of the call-sites... seems to me like its better off without them at the moment. WDYT?
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerQuoted 11 lines · Sagi Grimberg
Quoted 10 lines
Quoted 6 lines
Quoted 3 lines
What I mean is that
nvmet_try_send_dataandnvmet_try_send_ddgstmay set neitherMS_MOREnorMSG_EOR. Is that intentional?
nvmet_try_send_datashould setMSG_EORif it doesn't have more to send and alsonvmet_try_send_ddgst. So its not intentional.Ok. Can you send it with a little helper like I suggested (probably one each for host and target) that ensures the right flags are set everywhere?
Quoted 8 lines
I think its actually better without the helper.
MSG_SENDPAGE_NOTLASTis designed only for sendpage and not for sendmsg which we use for ddgst (although the net stack code appears to ignore, but still) and when we send a pdu header that has data, we dont need the condition because its not last for sure.So the helpers capture ~60% of the call-sites... seems to me like its better off without them at the moment. WDYT?
Ok. Are going to resend with the nvmet_try_send_data fix thrown in?
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Sagi Grimberg
maintainerQuoted 17 lines
Quoted 17 lines
Quoted 10 lines
Quoted 6 lines
Quoted 3 lines
What I mean is that
nvmet_try_send_dataandnvmet_try_send_ddgstmay set neitherMS_MOREnorMSG_EOR. Is that intentional?
nvmet_try_send_datashould setMSG_EORif it doesn't have more to send and alsonvmet_try_send_ddgst. So its not intentional.Ok. Can you send it with a little helper like I suggested (probably one each for host and target) that ensures the right flags are set everywhere?
I think its actually better without the helper.
MSG_SENDPAGE_NOTLASTis designed only for sendpage and not for sendmsg which we use for ddgst (although the net stack code appears to ignore, but still) and when we send a pdu header that has data, we dont need the condition because its not last for sure.
Quoted 4 lines
Quoted 2 lines
So the helpers capture ~60% of the call-sites... seems to me like its better off without them at the moment. WDYT?
Ok. Are going to resend with the
nvmet_try_send_datafix thrown in?
Don't want to overload more logical changes on the patch itself, I'll send a patch separately, these should be good to go...
Thanks.
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Applied to nvme-5.8.
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme