Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[openwrt/staging/blogic.git] / drivers / nvme / target / tcp.c

diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
index 4546049a96b379a7bbab39547819800976d7045a..1669177cd26c9f4a5d4e7bacff3951bbf0eb10c0 100644 (file)
--- a/drivers/nvme/target/tcp.c
+++ b/drivers/nvme/target/tcp.c
@@ -325,6 +325,14 @@ static void nvmet_tcp_fatal_error(struct nvmet_tcp_queue *queue)
                kernel_sock_shutdown(queue->sock, SHUT_RDWR);
 }
 
+static void nvmet_tcp_socket_error(struct nvmet_tcp_queue *queue, int status)
+{
+       if (status == -EPIPE || status == -ECONNRESET)
+               kernel_sock_shutdown(queue->sock, SHUT_RDWR);
+       else
+               nvmet_tcp_fatal_error(queue);
+}
+
 static int nvmet_tcp_map_data(struct nvmet_tcp_cmd *cmd)
 {
        struct nvme_sgl_desc *sgl = &cmd->req.cmd->common.dptr.sgl;
@@ -510,7 +518,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 +546,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 +593,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 +622,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;
 
@@ -644,6 +652,8 @@ static int nvmet_try_send_ddgst(struct nvmet_tcp_cmd *cmd, bool last_in_batch)
 
        if (!last_in_batch && cmd->queue->send_list_len)
                msg.msg_flags |= MSG_MORE;
+       else
+               msg.msg_flags |= MSG_EOR;
 
        ret = kernel_sendmsg(queue->sock, &msg, &iov, 1, iov.iov_len);
        if (unlikely(ret <= 0))
@@ -716,11 +726,15 @@ static int nvmet_tcp_try_send(struct nvmet_tcp_queue *queue,
 
        for (i = 0; i < budget; i++) {
                ret = nvmet_tcp_try_send_one(queue, i == budget - 1);
-               if (ret <= 0)
+               if (unlikely(ret < 0)) {
+                       nvmet_tcp_socket_error(queue, ret);
+                       goto done;
+               } else if (ret == 0) {
                        break;
+               }
                (*sends)++;
        }
-
+done:
        return ret;
 }
 
@@ -1157,11 +1171,15 @@ static int nvmet_tcp_try_recv(struct nvmet_tcp_queue *queue,
 
        for (i = 0; i < budget; i++) {
                ret = nvmet_tcp_try_recv_one(queue);
-               if (ret <= 0)
+               if (unlikely(ret < 0)) {
+                       nvmet_tcp_socket_error(queue, ret);
+                       goto done;
+               } else if (ret == 0) {
                        break;
+               }
                (*recvs)++;
        }
-
+done:
        return ret;
 }
 
@@ -1186,27 +1204,16 @@ static void nvmet_tcp_io_work(struct work_struct *w)
                pending = false;
 
                ret = nvmet_tcp_try_recv(queue, NVMET_TCP_RECV_BUDGET, &ops);
-               if (ret > 0) {
+               if (ret > 0)
                        pending = true;
-               } else if (ret < 0) {
-                       if (ret == -EPIPE || ret == -ECONNRESET)
-                               kernel_sock_shutdown(queue->sock, SHUT_RDWR);
-                       else
-                               nvmet_tcp_fatal_error(queue);
+               else if (ret < 0)
                        return;
-               }
 
                ret = nvmet_tcp_try_send(queue, NVMET_TCP_SEND_BUDGET, &ops);
-               if (ret > 0) {
-                       /* transmitted message/data */
+               if (ret > 0)
                        pending = true;
-               } else if (ret < 0) {
-                       if (ret == -EPIPE || ret == -ECONNRESET)
-                               kernel_sock_shutdown(queue->sock, SHUT_RDWR);
-                       else
-                               nvmet_tcp_fatal_error(queue);
+               else if (ret < 0)
                        return;
-               }
 
        } while (pending && ops < NVMET_TCP_IO_WORK_BUDGET);