From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Mar 2017 23:16:38 +0000 (-0800)
Subject: Merge branch 'work.sendmsg' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: v4.11-rc1~25
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=69fd110eb650ea7baa82158f3b89a7d86da1d056

Merge branch 'work.sendmsg' of git://git./linux/kernel/git/viro/vfs

Pull vfs sendmsg updates from Al Viro:
 "More sendmsg work.

  This is a fairly separate isolated stuff (there's a continuation
  around lustre, but that one was too late to soak in -next), thus the
  separate pull request"

* 'work.sendmsg' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ncpfs: switch to sock_sendmsg()
  ncpfs: don't mess with manually advancing iovec on send
  ncpfs: sendmsg does *not* bugger iovec these days
  ceph_tcp_sendpage(): use ITER_BVEC sendmsg
  afs_send_pages(): use ITER_BVEC
  rds: remove dead code
  ceph: switch to sock_recvmsg()
  usbip_recv(): switch to sock_recvmsg()
  iscsi_target: deal with short writes on the tx side
  [nbd] pass iov_iter to nbd_xmit()
  [nbd] switch sock_xmit() to sock_{send,recv}msg()
  [drbd] use sock_sendmsg()
---

69fd110eb650ea7baa82158f3b89a7d86da1d056
diff --cc drivers/block/nbd.c
index 0bf2b21a62cb,3c2dbe412c02..1541cb880744
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@@ -263,39 -256,26 +248,41 @@@ static int sock_xmit(struct nbd_device 
  static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)
  {
  	struct request *req = blk_mq_rq_from_pdu(cmd);
 -	int result, flags;
 +	int result;
- 	struct nbd_request request;
+ 	struct nbd_request request = {.magic = htonl(NBD_REQUEST_MAGIC)};
+ 	struct kvec iov = {.iov_base = &request, .iov_len = sizeof(request)};
+ 	struct iov_iter from;
  	unsigned long size = blk_rq_bytes(req);
  	struct bio *bio;
  	u32 type;
  	u32 tag = blk_mq_unique_tag(req);
  
+ 	iov_iter_kvec(&from, WRITE | ITER_KVEC, &iov, 1, sizeof(request));
+ 
 -	if (req_op(req) == REQ_OP_DISCARD)
 +	switch (req_op(req)) {
 +	case REQ_OP_DISCARD:
  		type = NBD_CMD_TRIM;
 -	else if (req_op(req) == REQ_OP_FLUSH)
 +		break;
 +	case REQ_OP_FLUSH:
  		type = NBD_CMD_FLUSH;
 -	else if (rq_data_dir(req) == WRITE)
 +		break;
 +	case REQ_OP_WRITE:
  		type = NBD_CMD_WRITE;
 -	else
 +		break;
 +	case REQ_OP_READ:
  		type = NBD_CMD_READ;
 +		break;
 +	default:
 +		return -EIO;
 +	}
 +
 +	if (rq_data_dir(req) == WRITE &&
 +	    (nbd->flags & NBD_FLAG_READ_ONLY)) {
 +		dev_err_ratelimited(disk_to_dev(nbd->disk),
 +				    "Write on read-only\n");
 +		return -EIO;
 +	}
  
- 	memset(&request, 0, sizeof(request));
- 	request.magic = htonl(NBD_REQUEST_MAGIC);
  	request.type = htonl(type);
  	if (type != NBD_CMD_FLUSH) {
  		request.from = cpu_to_be64((u64)blk_rq_pos(req) << 9);
@@@ -325,11 -306,14 +312,13 @@@
  
  		bio_for_each_segment(bvec, bio, iter) {
  			bool is_last = !next && bio_iter_last(bvec, iter);
 +			int flags = is_last ? 0 : MSG_MORE;
  
 -			if (is_last)
 -				flags = MSG_MORE;
  			dev_dbg(nbd_to_dev(nbd), "request %p: sending %d bytes data\n",
  				cmd, bvec.bv_len);
- 			result = sock_send_bvec(nbd, index, &bvec, flags);
+ 			iov_iter_bvec(&from, ITER_BVEC | WRITE,
+ 				      &bvec, 1, bvec.bv_len);
+ 			result = sock_xmit(nbd, index, 1, &from, flags);
  			if (result <= 0) {
  				dev_err(disk_to_dev(nbd->disk),
  					"Send data failed (result %d)\n",
diff --cc drivers/target/iscsi/iscsi_target_util.c
index cc5958882431,a9ba2479374f..5041a9c8bdcb
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@@ -1369,15 -1336,58 +1337,31 @@@ int tx_data
  	if (!conn || !conn->sock || !conn->conn_ops)
  		return -1;
  
- 	memset(&c, 0, sizeof(struct iscsi_data_count));
- 	c.iov = iov;
- 	c.iov_count = iov_count;
- 	c.data_length = data;
- 	c.type = ISCSI_TX_DATA;
+ 	if (data <= 0) {
+ 		pr_err("Data length is: %d\n", data);
+ 		return -1;
+ 	}
+ 
+ 	memset(&msg, 0, sizeof(struct msghdr));
+ 
+ 	iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC,
+ 		      iov, iov_count, data);
+ 
+ 	while (msg_data_left(&msg)) {
+ 		int tx_loop = sock_sendmsg(conn->sock, &msg);
+ 		if (tx_loop <= 0) {
+ 			pr_debug("tx_loop: %d total_tx %d\n",
+ 				tx_loop, total_tx);
+ 			return tx_loop;
+ 		}
+ 		total_tx += tx_loop;
+ 		pr_debug("tx_loop: %d, total_tx: %d, data: %d\n",
+ 					tx_loop, total_tx, data);
+ 	}
  
- 	return iscsit_do_tx_data(conn, &c);
+ 	return total_tx;
  }
  
 -static bool sockaddr_equal(struct sockaddr_storage *x, struct sockaddr_storage *y)
 -{
 -	switch (x->ss_family) {
 -	case AF_INET: {
 -		struct sockaddr_in *sinx = (struct sockaddr_in *)x;
 -		struct sockaddr_in *siny = (struct sockaddr_in *)y;
 -		if (sinx->sin_addr.s_addr != siny->sin_addr.s_addr)
 -			return false;
 -		if (sinx->sin_port != siny->sin_port)
 -			return false;
 -		break;
 -	}
 -	case AF_INET6: {
 -		struct sockaddr_in6 *sinx = (struct sockaddr_in6 *)x;
 -		struct sockaddr_in6 *siny = (struct sockaddr_in6 *)y;
 -		if (!ipv6_addr_equal(&sinx->sin6_addr, &siny->sin6_addr))
 -			return false;
 -		if (sinx->sin6_port != siny->sin6_port)
 -			return false;
 -		break;
 -	}
 -	default:
 -		return false;
 -	}
 -	return true;
 -}
 -
  void iscsit_collect_login_stats(
  	struct iscsi_conn *conn,
  	u8 status_class,