From: Mao Wenan <maowenan@huawei.com>
To: <davem@davemloft.net>, <ast@kernel.org>, <daniel@iogearbox.net>,
<kuba@kernel.org>, <hawk@kernel.org>, <john.fastabend@gmail.com>,
<kafai@fb.com>, <songliubraving@fb.com>, <yhs@fb.com>,
<andriin@fb.com>, <jwi@linux.ibm.com>,
<toshiaki.makita1@gmail.com>, <jianglidong3@jd.com>,
<edumazet@google.com>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<bpf@vger.kernel.org>, <kernel-janitors@vger.kernel.org>
Subject: [PATCH net v2] veth: xdp: use head instead of hard_start
Date: Tue, 31 Mar 2020 14:06:41 +0800 [thread overview]
Message-ID: <20200331060641.79999-1-maowenan@huawei.com> (raw)
In-Reply-To: <fb5ab568-9bc8-3145-a8db-3e975ccdf846@gmail.com>
xdp.data_hard_start is equal to first address of
struct xdp_frame, which is mentioned in
convert_to_xdp_frame(). But the pointer hard_start
in veth_xdp_rcv_one() is 32 bytes offset of frame,
so it should use head instead of hard_start to
set xdp.data_hard_start. Otherwise, if BPF program
calls helper_function such as bpf_xdp_adjust_head, it
will be confused for xdp_frame_end.
Fixes: 9fc8d518d9d5 ("veth: Handle xdp_frames in xdp napi ring")
Signed-off-by: Mao Wenan <maowenan@huawei.com>
---
v2: add fixes tag, as well as commit log.
drivers/net/veth.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index d4cbb9e8c63f..5ea550884bf8 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -506,7 +506,7 @@ static struct sk_buff *veth_xdp_rcv_one(struct veth_rq *rq,
struct xdp_buff xdp;
u32 act;
- xdp.data_hard_start = hard_start;
+ xdp.data_hard_start = head;
xdp.data = frame->data;
xdp.data_end = frame->data + frame->len;
xdp.data_meta = frame->data - frame->metasize;
--
2.20.1
next prev parent reply other threads:[~2020-03-31 6:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 10:26 [PATCH net] veth: xdp: use head instead of hard_start Mao Wenan
2020-03-30 11:34 ` Jesper Dangaard Brouer
2020-03-30 23:35 ` Toshiaki Makita
2020-03-31 3:56 ` maowenan
2020-03-31 5:45 ` Toshiaki Makita
2020-03-31 6:06 ` Mao Wenan [this message]
2020-03-31 6:16 ` [PATCH net v2] " Toshiaki Makita
2020-04-01 16:15 ` Jesper Dangaard Brouer
2020-04-02 0:47 ` Toshiaki Makita
2020-04-02 9:06 ` Jesper Dangaard Brouer
2020-04-02 15:40 ` Alexei Starovoitov
2020-04-03 7:58 ` Jesper Dangaard Brouer
2020-04-03 21:12 ` Alexei Starovoitov
2020-04-02 1:23 ` maowenan
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=20200331060641.79999-1-maowenan@huawei.com \
--to=maowenan@huawei.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hawk@kernel.org \
--cc=jianglidong3@jd.com \
--cc=john.fastabend@gmail.com \
--cc=jwi@linux.ibm.com \
--cc=kafai@fb.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=toshiaki.makita1@gmail.com \
--cc=yhs@fb.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).