Commit b4bf0777 authored by Jason Wang's avatar Jason Wang Committed by David S. Miller
Browse files

net: move iov_pages() to net/core/iovec.c 



To let it be reused and reduce code duplication.

Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6261d983

drivers/net/macvtap.c

+0 −23
Original line number Diff line number Diff line
@@ -698,29 +698,6 @@ static int macvtap_skb_to_vnet_hdr(const struct sk_buff *skb, 
	return 0;

}



static unsigned long iov_pages(const struct iovec *iv, int offset,

			       unsigned long nr_segs)

{

	unsigned long seg, base;

	int pages = 0, len, size;



	while (nr_segs && (offset >= iv->iov_len)) {

		offset -= iv->iov_len;

		++iv;

		--nr_segs;

	}



	for (seg = 0; seg < nr_segs; seg++) {

		base = (unsigned long)iv[seg].iov_base + offset;

		len = iv[seg].iov_len - offset;

		size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;

		pages += size;

		offset = 0;

	}



	return pages;

}



/* Get packet from user space buffer */

static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,

				const struct iovec *iv, unsigned long total_len,

drivers/net/tun.c

+0 −23
Original line number Diff line number Diff line
@@ -1041,29 +1041,6 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from, 
	return 0;

}



static unsigned long iov_pages(const struct iovec *iv, int offset,

			       unsigned long nr_segs)

{

	unsigned long seg, base;

	int pages = 0, len, size;



	while (nr_segs && (offset >= iv->iov_len)) {

		offset -= iv->iov_len;

		++iv;

		--nr_segs;

	}



	for (seg = 0; seg < nr_segs; seg++) {

		base = (unsigned long)iv[seg].iov_base + offset;

		len = iv[seg].iov_len - offset;

		size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;

		pages += size;

		offset = 0;

	}



	return pages;

}



/* Get packet from user space buffer */

static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,

			    void *msg_control, const struct iovec *iv,

include/linux/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -313,6 +313,8 @@ extern int csum_partial_copy_fromiovecend(unsigned char *kdata, 
					  struct iovec *iov, 

					  int offset, 

					  unsigned int len, __wsum *csump);

extern unsigned long iov_pages(const struct iovec *iov, int offset,

			       unsigned long nr_segs);



extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *address, int mode);

extern int memcpy_toiovecend(const struct iovec *v, unsigned char *kdata,

net/core/iovec.c

+24 −0
Original line number Diff line number Diff line
@@ -212,3 +212,27 @@ int csum_partial_copy_fromiovecend(unsigned char *kdata, struct iovec *iov, 
	goto out;

}

EXPORT_SYMBOL(csum_partial_copy_fromiovecend);



unsigned long iov_pages(const struct iovec *iov, int offset,

			unsigned long nr_segs)

{

	unsigned long seg, base;

	int pages = 0, len, size;



	while (nr_segs && (offset >= iov->iov_len)) {

		offset -= iov->iov_len;

		++iov;

		--nr_segs;

	}



	for (seg = 0; seg < nr_segs; seg++) {

		base = (unsigned long)iov[seg].iov_base + offset;

		len = iov[seg].iov_len - offset;

		size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;

		pages += size;

		offset = 0;

	}



	return pages;

}

EXPORT_SYMBOL(iov_pages);