Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af2b040e authored by Al Viro's avatar Al Viro
Browse files

rxrpc: switch rxrpc_send_data() to iov_iter primitives 



Convert skb_add_data() to iov_iter; allows to get rid of the explicit
messing with iovec in its only caller - skb_add_data() will keep advancing
->msg_iter for us, so there's no need to similate that manually.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4c946d9c

include/linux/skbuff.h

+5 −6
Original line number Original line Diff line number Diff line
@@ -2484,19 +2484,18 @@ static inline int skb_put_padto(struct sk_buff *skb, unsigned int len) 
}

}





static inline int skb_add_data(struct sk_buff *skb,

static inline int skb_add_data(struct sk_buff *skb,

			       char __user *from, int copy)

			       struct iov_iter *from, int copy)

{

{

	const int off = skb->len;

	const int off = skb->len;





	if (skb->ip_summed == CHECKSUM_NONE) {

	if (skb->ip_summed == CHECKSUM_NONE) {

		int err = 0;

		__wsum csum = 0;

		__wsum csum = csum_and_copy_from_user(from, skb_put(skb, copy),

		if (csum_and_copy_from_iter(skb_put(skb, copy), copy,

							    copy, 0, &err);

					    &csum, from) == copy) {

		if (!err) {

			skb->csum = csum_block_add(skb->csum, csum, off);

			skb->csum = csum_block_add(skb->csum, csum, off);

			return 0;

			return 0;

		}

		}

	} else if (!copy_from_user(skb_put(skb, copy), from, copy))

	} else if (copy_from_iter(skb_put(skb, copy), copy, from) == copy)

		return 0;

		return 0;





	__skb_trim(skb, off);

	__skb_trim(skb, off);

net/rxrpc/ar-output.c

+10 −33
Original line number Original line Diff line number Diff line
@@ -529,13 +529,11 @@ static int rxrpc_send_data(struct kiocb *iocb, 
			   struct msghdr *msg, size_t len)

			   struct msghdr *msg, size_t len)

{

{

	struct rxrpc_skb_priv *sp;

	struct rxrpc_skb_priv *sp;

	unsigned char __user *from;

	struct sk_buff *skb;

	struct sk_buff *skb;

	const struct iovec *iov;

	struct sock *sk = &rx->sk;

	struct sock *sk = &rx->sk;

	long timeo;

	long timeo;

	bool more;

	bool more;

	int ret, ioc, segment, copied;

	int ret, copied;





	timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);

	timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
@@ -545,25 +543,17 @@ static int rxrpc_send_data(struct kiocb *iocb, 
	if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))

	if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))

		return -EPIPE;

		return -EPIPE;





	iov = msg->msg_iter.iov;

	ioc = msg->msg_iter.nr_segs - 1;

	from = iov->iov_base;

	segment = iov->iov_len;

	iov++;

	more = msg->msg_flags & MSG_MORE;

	more = msg->msg_flags & MSG_MORE;





	skb = call->tx_pending;

	skb = call->tx_pending;

	call->tx_pending = NULL;

	call->tx_pending = NULL;





	copied = 0;

	copied = 0;

	do {

	if (len > iov_iter_count(&msg->msg_iter))

		len = iov_iter_count(&msg->msg_iter);

	while (len) {

		int copy;

		int copy;





		if (segment > len)

			segment = len;



		_debug("SEGMENT %d @%p", segment, from);



		if (!skb) {

		if (!skb) {

			size_t size, chunk, max, space;

			size_t size, chunk, max, space;
@@ -631,13 +621,13 @@ static int rxrpc_send_data(struct kiocb *iocb, 
		/* append next segment of data to the current buffer */

		/* append next segment of data to the current buffer */

		copy = skb_tailroom(skb);

		copy = skb_tailroom(skb);

		ASSERTCMP(copy, >, 0);

		ASSERTCMP(copy, >, 0);

		if (copy > segment)

		if (copy > len)

			copy = segment;

			copy = len;

		if (copy > sp->remain)

		if (copy > sp->remain)

			copy = sp->remain;

			copy = sp->remain;





		_debug("add");

		_debug("add");

		ret = skb_add_data(skb, from, copy);

		ret = skb_add_data(skb, &msg->msg_iter, copy);

		_debug("added");

		_debug("added");

		if (ret < 0)

		if (ret < 0)

			goto efault;

			goto efault;
@@ -646,18 +636,6 @@ static int rxrpc_send_data(struct kiocb *iocb, 
		copied += copy;

		copied += copy;





		len -= copy;

		len -= copy;

		segment -= copy;

		from += copy;

		while (segment == 0 && ioc > 0) {

			from = iov->iov_base;

			segment = iov->iov_len;

			iov++;

			ioc--;

		}

		if (len == 0) {

			segment = 0;

			ioc = 0;

		}





		/* check for the far side aborting the call or a network error

		/* check for the far side aborting the call or a network error

		 * occurring */

		 * occurring */
@@ -665,7 +643,7 @@ static int rxrpc_send_data(struct kiocb *iocb, 
			goto call_aborted;

			goto call_aborted;





		/* add the packet to the send queue if it's now full */

		/* add the packet to the send queue if it's now full */

		if (sp->remain <= 0 || (segment == 0 && !more)) {

		if (sp->remain <= 0 || (!len && !more)) {

			struct rxrpc_connection *conn = call->conn;

			struct rxrpc_connection *conn = call->conn;

			uint32_t seq;

			uint32_t seq;

			size_t pad;

			size_t pad;
@@ -711,11 +689,10 @@ static int rxrpc_send_data(struct kiocb *iocb, 




			memcpy(skb->head, &sp->hdr,

			memcpy(skb->head, &sp->hdr,

			       sizeof(struct rxrpc_header));

			       sizeof(struct rxrpc_header));

			rxrpc_queue_packet(call, skb, segment == 0 && !more);

			rxrpc_queue_packet(call, skb, !iov_iter_count(&msg->msg_iter) && !more);

			skb = NULL;

			skb = NULL;

		}

		}



	}

	} while (segment > 0);





success:

success:

	ret = copied;

	ret = copied;