From: Jason Wang <jasowang@redhat.com>
To: eric.dumazet@gmail.com, mst@redhat.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, ebiederm@xmission.com,
davem@davemloft.net
Subject: [V2 PATCH 1/9] macvtap: zerocopy: fix offset calculation when building skb
Date: Wed, 02 May 2012 11:41:30 +0800 [thread overview]
Message-ID: <20120502034130.11782.25906.stgit@amd-6168-8-1.englab.nay.redhat.com> (raw)
In-Reply-To: <20120502033901.11782.13157.stgit@amd-6168-8-1.englab.nay.redhat.com>
This patch fixes the offset calculation when building 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 prev parent reply other threads:[~2012-05-02 3:47 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-02 3:41 [V2 PATCH 0/9] vhost/macvtap zeropcopy fixes Jason Wang
2012-05-02 3:41 ` Jason Wang [this message]
2012-05-15 17:17 ` [V2 PATCH 1/9] macvtap: zerocopy: fix offset calculation when building skb Shirley Ma
2012-05-02 3:41 ` [V2 PATCH 2/9] macvtap: zerocopy: fix truesize underestimation Jason Wang
2012-05-15 17:26 ` Shirley Ma
2012-05-16 3:04 ` Jason Wang
2012-05-16 15:03 ` Shirley Ma
2012-05-17 2:59 ` Jason Wang
2012-05-17 15:28 ` Shirley Ma
2012-05-18 10:10 ` Jason Wang
2012-05-18 15:22 ` Shirley Ma
2012-05-21 6:15 ` Jason Wang
2012-05-02 3:41 ` [V2 PATCH 3/9] macvtap: zerocopy: put page when fail to get all requested user pages Jason Wang
2012-05-15 17:33 ` Shirley Ma
2012-05-02 3:42 ` [V2 PATCH 4/9] macvtap: zerocopy: set SKBTX_DEV_ZEROCOPY only when skb is built successfully Jason Wang
2012-05-15 17:44 ` Shirley Ma
2012-05-16 3:17 ` Jason Wang
2012-05-02 3:42 ` [V2 PATCH 5/9] macvtap: zerocopy: validate vectors before building skb Jason Wang
2012-05-02 3:42 ` [V2 PATCH 6/9] vhost_net: zerocopy: fix possible NULL pointer dereference of vq->bufs Jason Wang
2012-05-02 3:42 ` [V2 PATCH 7/9] vhost_net: re-poll only on EAGAIN or ENOBUFS Jason Wang
2012-05-02 3:42 ` [V2 PATCH 8/9] vhost_net: zerocopy: adding and signalling immediately when fully copied Jason Wang
2012-05-02 3:42 ` [V2 PATCH 9/9] vhost: zerocopy: poll vq in zerocopy callback Jason Wang
2012-05-15 16:50 ` Shirley Ma
2012-05-16 2:58 ` Jason Wang
2012-05-16 15:10 ` Shirley Ma
2012-05-16 15:14 ` Michael S. Tsirkin
2012-05-16 17:32 ` Shirley Ma
2012-05-16 18:36 ` Michael S. Tsirkin
2012-05-16 19:08 ` Shirley Ma
2012-05-21 5:22 ` Jason Wang
2012-05-17 2:50 ` Jason Wang
2012-05-17 15:34 ` Shirley Ma
2012-05-18 9:58 ` Jason Wang
2012-05-18 15:29 ` Shirley Ma
2012-05-21 6:05 ` Jason Wang
2012-05-21 15:42 ` Shirley Ma
2012-05-21 16:12 ` Shirley Ma
2012-05-22 10:13 ` Jason Wang
2012-05-22 10:05 ` Jason Wang
2012-05-22 15:55 ` Shirley Ma
2012-05-23 10:31 ` Jason Wang
2012-05-02 5:50 ` [V2 PATCH 0/9] vhost/macvtap zeropcopy fixes Michael S. Tsirkin
2012-05-02 6:44 ` David Miller
2012-05-02 8:11 ` Michael S. Tsirkin
2012-05-02 19:40 ` Eric W. Biederman
2012-05-02 21:31 ` Michael S. Tsirkin
2012-05-02 21:54 ` Eric W. Biederman
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=20120502034130.11782.25906.stgit@amd-6168-8-1.englab.nay.redhat.com \
--to=jasowang@redhat.com \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=eric.dumazet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
/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).