From: Prashant Bhole <prashantbhole.linux@gmail.com>
To: "David S . Miller" <davem@davemloft.net>,
"Michael S . Tsirkin" <mst@redhat.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jesper Dangaard Brouer <hawk@kernel.org>
Cc: Prashant Bhole <prashantbhole.linux@gmail.com>,
Jason Wang <jasowang@redhat.com>, David Ahern <dsahern@gmail.com>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
John Fastabend <john.fastabend@gmail.com>,
Toshiaki Makita <toshiaki.makita1@gmail.com>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>, Andrii Nakryiko <andriin@fb.com>,
netdev@vger.kernel.org
Subject: [RFC net-next 12/14] tun: add a way to inject tx path packet into Rx path
Date: Wed, 18 Dec 2019 17:10:48 +0900 [thread overview]
Message-ID: <20191218081050.10170-13-prashantbhole.linux@gmail.com> (raw)
In-Reply-To: <20191218081050.10170-1-prashantbhole.linux@gmail.com>
In order to support XDP_TX from tx path XDP program, we need a way
to inject tx path packet into RX path. Let's modify the RX path
function tun_xdp_one() for this purpose.
This patch adds a parameter to pass information whether packet has
virtio_net header.
Signed-off-by: Prashant Bhole <prashantbhole.linux@gmail.com>
---
drivers/net/tun.c | 41 +++++++++++++++++++++++++++++++----------
1 file changed, 31 insertions(+), 10 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 1afded9252f5..0701a7a80346 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2238,6 +2238,13 @@ static u32 tun_do_xdp_tx_generic(struct tun_struct *tun,
return act;
}
+static int tun_xdp_one(struct tun_struct *tun,
+ struct tun_file *tfile,
+ struct xdp_buff *xdp, int *flush,
+ struct tun_page *tpage, int has_hdr);
+
+static void tun_put_page(struct tun_page *tpage);
+
static u32 tun_do_xdp_tx(struct tun_struct *tun, struct tun_file *tfile,
struct xdp_frame *frame)
{
@@ -2543,23 +2550,36 @@ static void tun_put_page(struct tun_page *tpage)
static int tun_xdp_one(struct tun_struct *tun,
struct tun_file *tfile,
struct xdp_buff *xdp, int *flush,
- struct tun_page *tpage)
+ struct tun_page *tpage, int has_hdr)
{
unsigned int datasize = xdp->data_end - xdp->data;
- struct tun_xdp_hdr *hdr = xdp->data_hard_start;
- struct virtio_net_hdr *gso = &hdr->gso;
+ struct virtio_net_hdr *gso = NULL;
struct tun_pcpu_stats *stats;
- struct bpf_prog *xdp_prog;
struct sk_buff *skb = NULL;
- u32 rxhash = 0, act;
- int buflen = hdr->buflen;
- int err = 0;
+ struct bpf_prog *xdp_prog;
+ struct tun_xdp_hdr *hdr;
+ unsigned int headroom;
bool skb_xdp = false;
+ u32 rxhash = 0, act;
struct page *page;
+ int err = 0;
+ int buflen;
+
+ if (has_hdr) {
+ hdr = xdp->data_hard_start;
+ gso = &hdr->gso;
+ buflen = hdr->buflen;
+ } else {
+ /* came here from tun tx path */
+ xdp->data_hard_start -= sizeof(struct xdp_frame);
+ headroom = xdp->data - xdp->data_hard_start;
+ buflen = datasize + headroom +
+ SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
+ }
xdp_prog = rcu_dereference(tun->xdp_prog);
if (xdp_prog) {
- if (gso->gso_type) {
+ if (has_hdr && gso->gso_type) {
skb_xdp = true;
goto build;
}
@@ -2604,7 +2624,8 @@ static int tun_xdp_one(struct tun_struct *tun,
skb_reserve(skb, xdp->data - xdp->data_hard_start);
skb_put(skb, xdp->data_end - xdp->data);
- if (virtio_net_hdr_to_skb(skb, gso, tun_is_little_endian(tun))) {
+ if (has_hdr &&
+ virtio_net_hdr_to_skb(skb, gso, tun_is_little_endian(tun))) {
this_cpu_inc(tun->pcpu_stats->rx_frame_errors);
kfree_skb(skb);
err = -EINVAL;
@@ -2668,7 +2689,7 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len)
for (i = 0; i < n; i++) {
xdp = &((struct xdp_buff *)ctl->ptr)[i];
- tun_xdp_one(tun, tfile, xdp, &flush, &tpage);
+ tun_xdp_one(tun, tfile, xdp, &flush, &tpage, true);
}
if (flush)
--
2.21.0
next prev parent reply other threads:[~2019-12-18 8:12 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 8:10 [RFC net-next 00/14] XDP in tx path Prashant Bhole
2019-12-18 8:10 ` [RFC net-next 01/14] net: add tx path XDP support Prashant Bhole
2019-12-18 8:10 ` [RFC net-next 02/14] tools: sync kernel uapi/linux/if_link.h header Prashant Bhole
2019-12-18 8:10 ` [RFC net-next 03/14] libbpf: API for tx path XDP support Prashant Bhole
2019-12-18 18:20 ` Alexei Starovoitov
2019-12-18 8:10 ` [RFC net-next 04/14] samples/bpf: xdp1, add XDP tx support Prashant Bhole
2019-12-18 8:10 ` [RFC net-next 05/14] net: core: rename netif_receive_generic_xdp() to do_generic_xdp_core() Prashant Bhole
2019-12-18 8:10 ` [RFC net-next 06/14] net: core: export do_xdp_generic_core() Prashant Bhole
2019-12-18 8:10 ` [RFC net-next 07/14] tuntap: check tun_msg_ctl type at necessary places Prashant Bhole
2019-12-18 8:10 ` [RFC net-next 08/14] vhost_net: user tap recvmsg api to access ptr ring Prashant Bhole
2019-12-18 8:10 ` [RFC net-next 09/14] tuntap: remove usage of ptr ring in vhost_net Prashant Bhole
2019-12-18 8:10 ` [RFC net-next 10/14] tun: set tx path XDP program Prashant Bhole
2019-12-18 8:10 ` [RFC net-next 11/14] tun: run XDP program in tx path Prashant Bhole
2019-12-18 10:07 ` Jesper Dangaard Brouer
2019-12-18 11:48 ` Toke Høiland-Jørgensen
2019-12-18 16:33 ` David Ahern
2019-12-19 2:44 ` Jason Wang
2019-12-18 18:19 ` Alexei Starovoitov
2019-12-19 2:34 ` Prashant Bhole
2019-12-19 10:15 ` Toke Høiland-Jørgensen
2019-12-20 0:07 ` Prashant Bhole
2019-12-20 3:24 ` Jason Wang
2019-12-20 4:46 ` Prashant Bhole
2019-12-20 7:36 ` Jason Wang
2019-12-20 10:11 ` Toke Høiland-Jørgensen
2019-12-20 16:11 ` David Ahern
2019-12-20 22:17 ` Prashant Bhole
2019-12-23 6:05 ` Jason Wang
2019-12-23 8:09 ` Prashant Bhole
2019-12-23 8:34 ` Jason Wang
2019-12-23 11:06 ` Prashant Bhole
2019-12-18 16:29 ` David Ahern
2019-12-19 1:47 ` Prashant Bhole
2019-12-18 8:10 ` Prashant Bhole [this message]
2019-12-18 8:10 ` [RFC net-next 13/14] tun: handle XDP_TX action of tx path XDP program Prashant Bhole
2019-12-18 8:10 ` [RFC net-next 14/14] tun: run xdp prog when tun is read from file interface Prashant Bhole
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=20191218081050.10170-13-prashantbhole.linux@gmail.com \
--to=prashantbhole.linux@gmail.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=hawk@kernel.org \
--cc=jakub.kicinski@netronome.com \
--cc=jasowang@redhat.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=mst@redhat.com \
--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).