nvmet-tcp: set MSG_SENDPAGE_NOTLAST with MSG_MORE when we have more to send
authorSagi Grimberg <sagi@grimberg.me>
Tue, 5 May 2020 05:20:02 +0000 (22:20 -0700)
committerChristoph Hellwig <hch@lst.de>
Wed, 27 May 2020 05:12:37 +0000 (07:12 +0200)
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.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/target/tcp.c

index f0da04e..c08aec6 100644 (file)
@@ -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;