From: David Ahern <dsahern@kernel.org>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org,
prashantbhole.linux@gmail.com, jasowang@redhat.com,
brouer@redhat.com, toke@redhat.com, mst@redhat.com,
toshiaki.makita1@gmail.com, daniel@iogearbox.net,
john.fastabend@gmail.com, ast@kernel.org, kafai@fb.com,
songliubraving@fb.com, yhs@fb.com, andriin@fb.com,
dsahern@gmail.com, David Ahern <dahern@digitalocean.com>
Subject: [PATCH RFC v4 bpf-next 07/11] tun: set egress XDP program
Date: Wed, 26 Feb 2020 20:20:09 -0700 [thread overview]
Message-ID: <20200227032013.12385-8-dsahern@kernel.org> (raw)
In-Reply-To: <20200227032013.12385-1-dsahern@kernel.org>
From: David Ahern <dahern@digitalocean.com>
This patch adds a way to set tx path XDP program in tun driver
by handling XDP_SETUP_PROG_EGRESS and XDP_QUERY_PROG_EGRESS in
ndo_bpf handler.
Signed-off-by: David Ahern <dahern@digitalocean.com>
Signed-off-by: Prashant Bhole <prashantbhole.linux@gmail.com>
---
drivers/net/tun.c | 34 ++++++++++++++++++++++++++--------
1 file changed, 26 insertions(+), 8 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 7cc5a1acaef2..6aae398b904b 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -239,6 +239,7 @@ struct tun_struct {
u32 rx_batched;
struct tun_pcpu_stats __percpu *pcpu_stats;
struct bpf_prog __rcu *xdp_prog;
+ struct bpf_prog __rcu *xdp_egress_prog;
struct tun_prog __rcu *steering_prog;
struct tun_prog __rcu *filter_prog;
struct ethtool_link_ksettings link_ksettings;
@@ -1189,15 +1190,21 @@ tun_net_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
}
static int tun_xdp_set(struct net_device *dev, struct bpf_prog *prog,
- struct netlink_ext_ack *extack)
+ bool egress, struct netlink_ext_ack *extack)
{
struct tun_struct *tun = netdev_priv(dev);
struct tun_file *tfile;
struct bpf_prog *old_prog;
int i;
- old_prog = rtnl_dereference(tun->xdp_prog);
- rcu_assign_pointer(tun->xdp_prog, prog);
+ if (egress) {
+ old_prog = rtnl_dereference(tun->xdp_egress_prog);
+ rcu_assign_pointer(tun->xdp_egress_prog, prog);
+ } else {
+ old_prog = rtnl_dereference(tun->xdp_prog);
+ rcu_assign_pointer(tun->xdp_prog, prog);
+ }
+
if (old_prog)
bpf_prog_put(old_prog);
@@ -1218,12 +1225,16 @@ static int tun_xdp_set(struct net_device *dev, struct bpf_prog *prog,
return 0;
}
-static u32 tun_xdp_query(struct net_device *dev)
+static u32 tun_xdp_query(struct net_device *dev, bool egress)
{
struct tun_struct *tun = netdev_priv(dev);
const struct bpf_prog *xdp_prog;
- xdp_prog = rtnl_dereference(tun->xdp_prog);
+ if (egress)
+ xdp_prog = rtnl_dereference(tun->xdp_egress_prog);
+ else
+ xdp_prog = rtnl_dereference(tun->xdp_prog);
+
if (xdp_prog)
return xdp_prog->aux->id;
@@ -1234,13 +1245,20 @@ static int tun_xdp(struct net_device *dev, struct netdev_bpf *xdp)
{
switch (xdp->command) {
case XDP_SETUP_PROG:
- return tun_xdp_set(dev, xdp->prog, xdp->extack);
+ return tun_xdp_set(dev, xdp->prog, false, xdp->extack);
+ case XDP_SETUP_PROG_EGRESS:
+ return tun_xdp_set(dev, xdp->prog, true, xdp->extack);
case XDP_QUERY_PROG:
- xdp->prog_id = tun_xdp_query(dev);
- return 0;
+ xdp->prog_id = tun_xdp_query(dev, false);
+ break;
+ case XDP_QUERY_PROG_EGRESS:
+ xdp->prog_id = tun_xdp_query(dev, true);
+ break;
default:
return -EINVAL;
}
+
+ return 0;
}
static int tun_net_change_carrier(struct net_device *dev, bool new_carrier)
--
2.21.1 (Apple Git-122.3)
next prev parent reply other threads:[~2020-02-27 3:20 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 3:20 [PATCH RFC v4 bpf-next 00/11] Add support for XDP in egress path David Ahern
2020-02-27 3:20 ` [PATCH RFC v4 bpf-next 01/11] net: Add XDP setup and query commands for Tx programs David Ahern
2020-02-27 3:20 ` [PATCH RFC v4 bpf-next 02/11] net: Add BPF_XDP_EGRESS as a bpf_attach_type David Ahern
2020-02-27 3:20 ` [PATCH RFC v4 bpf-next 03/11] xdp: Add xdp_txq_info to xdp_buff David Ahern
2020-02-27 8:00 ` Jesper Dangaard Brouer
2020-02-27 11:58 ` Toke Høiland-Jørgensen
2020-02-28 3:01 ` David Ahern
2020-02-28 10:10 ` Toke Høiland-Jørgensen
2020-02-27 20:44 ` David Ahern
2020-02-28 10:07 ` Toke Høiland-Jørgensen
2020-02-28 10:41 ` Jesper Dangaard Brouer
2020-02-27 3:20 ` [PATCH RFC v4 bpf-next 04/11] net: Add IFLA_XDP_EGRESS for XDP programs in the egress path David Ahern
2020-02-27 3:20 ` [PATCH RFC v4 bpf-next 05/11] net: core: rename netif_receive_generic_xdp to do_generic_xdp_core David Ahern
2020-02-27 3:20 ` [PATCH RFC v4 bpf-next 06/11] net: core: Rename do_xdp_generic to do_xdp_generic_rx and export David Ahern
2020-02-27 3:20 ` David Ahern [this message]
2020-03-02 3:32 ` [PATCH RFC v4 bpf-next 07/11] tun: set egress XDP program Jason Wang
2020-03-02 3:52 ` David Ahern
2020-03-10 2:18 ` David Ahern
2020-02-27 3:20 ` [PATCH RFC v4 bpf-next 08/11] tun: Support xdp in the Tx path for skb David Ahern
2020-03-02 3:28 ` Jason Wang
2020-03-02 3:41 ` David Ahern
2020-03-03 10:46 ` Jesper Dangaard Brouer
2020-03-03 15:36 ` David Ahern
2020-02-27 3:20 ` [PATCH RFC v4 bpf-next 09/11] tun: Support xdp in the Tx path for xdp_frames David Ahern
2020-03-02 18:30 ` Alexei Starovoitov
2020-03-03 4:27 ` David Ahern
2020-03-03 9:08 ` Jesper Dangaard Brouer
2020-03-03 18:16 ` Alexei Starovoitov
2020-03-03 10:40 ` Jesper Dangaard Brouer
2020-03-10 3:06 ` David Ahern
2020-03-10 3:44 ` David Ahern
2020-03-10 9:03 ` Jesper Dangaard Brouer
2020-02-27 3:20 ` [PATCH RFC v4 bpf-next 10/11] libbpf: Add egress XDP support David Ahern
2020-02-27 3:20 ` [PATCH RFC v4 bpf-next 11/11] samples/bpf: xdp1, add " David Ahern
2020-02-27 11:55 ` [PATCH RFC v4 bpf-next 00/11] Add support for XDP in egress path Toke Høiland-Jørgensen
2020-02-27 16:22 ` Alexei Starovoitov
2020-02-27 17:06 ` Toke Høiland-Jørgensen
2020-02-27 18:37 ` Alexei Starovoitov
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=20200227032013.12385-8-dsahern@kernel.org \
--to=dsahern@kernel.org \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=brouer@redhat.com \
--cc=dahern@digitalocean.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=jasowang@redhat.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kuba@kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=prashantbhole.linux@gmail.com \
--cc=songliubraving@fb.com \
--cc=toke@redhat.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).