From: Jason Wang <jasowang@redhat.com>
To: netdev@vger.kernel.org, xma@us.ibm.com, davem@davemloft.net,
linux-kernel@vger.kernel.org, mst@redhat.com
Cc: ebiederm@xmission.com
Subject: [PATCH 1/6] macvtap: zerocopy: fix offset calculation when building skb
Date: Mon, 16 Apr 2012 14:07:49 +0800 [thread overview]
Message-ID: <20120416060749.14140.19433.stgit@intel-e5620-16-2.englab.nay.redhat.com> (raw)
This patch fixes the offset calculation when build skb:
- offset1 were used as skb data offset not vector offset
- reset offset to zero only when we advance to next vector
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/macvtap.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 0427c65..bd4a70d 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -505,10 +505,11 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
if (copy > size) {
++from;
--count;
- }
+ offset = 0;
+ } else
+ offset += size;
copy -= size;
offset1 += size;
- offset = 0;
}
if (len == offset1)
@@ -519,13 +520,13 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
int num_pages;
unsigned long base;
- len = from->iov_len - offset1;
+ len = from->iov_len - offset;
if (!len) {
- offset1 = 0;
+ offset = 0;
++from;
continue;
}
- base = (unsigned long)from->iov_base + offset1;
+ base = (unsigned long)from->iov_base + offset;
size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT;
num_pages = get_user_pages_fast(base, size, 0, &page[i]);
if ((num_pages != size) ||
@@ -546,7 +547,7 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
len -= size;
i++;
}
- offset1 = 0;
+ offset = 0;
++from;
}
return 0;
next reply other threads:[~2012-04-16 6:16 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-16 6:07 Jason Wang [this message]
2012-04-16 6:07 ` [PATCH 2/6] macvtap: zerocopy: fix truesize underestimation Jason Wang
2012-04-16 7:14 ` Michael S. Tsirkin
2012-04-16 8:23 ` Jason Wang
2012-04-16 8:49 ` Eric Dumazet
2012-04-16 13:25 ` Michael S. Tsirkin
2012-04-16 6:08 ` [PATCH 3/6] macvtap: zerocopy: validate vector length before pinning user pages Jason Wang
2012-04-16 6:53 ` Eric Dumazet
2012-04-16 8:21 ` Jason Wang
2012-04-17 5:33 ` Eric Dumazet
2012-04-17 5:43 ` Michael S. Tsirkin
2012-04-17 6:19 ` Michael S. Tsirkin
2012-04-16 7:58 ` Michael S. Tsirkin
2012-04-16 6:08 ` [PATCH 4/6] macvtap: zerocopy: set SKBTX_DEV_ZEROCOPY only when skb is built successfully Jason Wang
2012-04-16 6:08 ` [PATCH 5/6] vhost_net: fix use after free of vq->ubufs Jason Wang
2012-04-16 13:28 ` Michael S. Tsirkin
2012-04-17 3:19 ` Jason Wang
2012-04-17 10:22 ` Michael S. Tsirkin
2012-04-17 10:47 ` Jason Wang
2012-04-16 6:08 ` [PATCH 6/6] vhost_net: don't poll on -EFAULT Jason Wang
2012-04-16 7:16 ` Michael S. Tsirkin
2012-04-16 8:28 ` Jason Wang
2012-04-16 13:39 ` Michael S. Tsirkin
2012-04-17 3:27 ` Jason Wang
2012-04-17 4:57 ` Michael S. Tsirkin
2012-04-17 5:54 ` Jason Wang
2012-04-17 6:07 ` Michael S. Tsirkin
2012-04-17 6:30 ` Jason Wang
2012-04-17 10:18 ` Michael S. Tsirkin
2012-04-17 10:46 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120416060749.14140.19433.stgit@intel-e5620-16-2.englab.nay.redhat.com \
--to=jasowang@redhat.com \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=xma@us.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).