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, 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 v3 bpf-next 08/15] net: set XDP egress program on netdevice
Date: Fri, 24 Apr 2020 14:14:21 -0600 [thread overview]
Message-ID: <20200424201428.89514-9-dsahern@kernel.org> (raw)
In-Reply-To: <20200424201428.89514-1-dsahern@kernel.org>
From: David Ahern <dahern@digitalocean.com>
This patch handles the plumbing for installing an XDP egress
program on a net_device by handling XDP_SETUP_PROG_EGRESS and
XDP_QUERY_PROG_EGRESS in generic_xdp_install handler. New static
key is added to signal when an egress program has been installed.
Update dev_xdp_uninstall to remove egress programs.
Signed-off-by: David Ahern <dahern@digitalocean.com>
---
include/linux/netdevice.h | 2 ++
net/core/dev.c | 48 +++++++++++++++++++++++++++------------
2 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 809e1a83b413..bfd8b6c8bf70 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -751,6 +751,8 @@ struct netdev_rx_queue {
#endif
} ____cacheline_aligned_in_smp;
+extern struct static_key_false xdp_egress_needed_key;
+
/*
* RX queue sysfs structures and functions.
*/
diff --git a/net/core/dev.c b/net/core/dev.c
index 0a56862a32e5..b8ebe9dcc3be 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4620,6 +4620,7 @@ void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog)
}
static DEFINE_STATIC_KEY_FALSE(generic_xdp_needed_key);
+DEFINE_STATIC_KEY_FALSE(xdp_egress_needed_key);
int do_xdp_generic_rx(struct bpf_prog *xdp_prog, struct sk_buff *skb)
{
@@ -5335,12 +5336,12 @@ static void __netif_receive_skb_list(struct list_head *head)
static int generic_xdp_install(struct net_device *dev, struct netdev_bpf *xdp)
{
- struct bpf_prog *old = rtnl_dereference(dev->xdp_prog);
- struct bpf_prog *new = xdp->prog;
+ struct bpf_prog *old, *new = xdp->prog;
int ret = 0;
switch (xdp->command) {
case XDP_SETUP_PROG:
+ old = rtnl_dereference(dev->xdp_prog);
rcu_assign_pointer(dev->xdp_prog, new);
if (old)
bpf_prog_put(old);
@@ -5353,11 +5354,25 @@ static int generic_xdp_install(struct net_device *dev, struct netdev_bpf *xdp)
dev_disable_gro_hw(dev);
}
break;
+ case XDP_SETUP_PROG_EGRESS:
+ old = rtnl_dereference(dev->xdp_egress_prog);
+ rcu_assign_pointer(dev->xdp_egress_prog, new);
+ if (old)
+ bpf_prog_put(old);
+ if (old && !new)
+ static_branch_dec(&xdp_egress_needed_key);
+ else if (new && !old)
+ static_branch_inc(&xdp_egress_needed_key);
+ break;
case XDP_QUERY_PROG:
+ old = rtnl_dereference(dev->xdp_prog);
+ xdp->prog_id = old ? old->aux->id : 0;
+ break;
+ case XDP_QUERY_PROG_EGRESS:
+ old = rtnl_dereference(dev->xdp_egress_prog);
xdp->prog_id = old ? old->aux->id : 0;
break;
-
default:
ret = -EINVAL;
break;
@@ -8633,6 +8648,10 @@ static void dev_xdp_uninstall(struct net_device *dev)
/* Remove generic XDP */
WARN_ON(dev_xdp_install(dev, generic_xdp_install, NULL, 0, NULL));
+ /* Remove XDP egress */
+ WARN_ON(dev_xdp_install(dev, generic_xdp_install, NULL,
+ XDP_FLAGS_EGRESS_MODE, NULL));
+
/* Remove from the driver */
ndo_bpf = dev->netdev_ops->ndo_bpf;
if (!ndo_bpf)
@@ -8679,21 +8698,22 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,
offload = flags & XDP_FLAGS_HW_MODE;
egress = flags & XDP_FLAGS_EGRESS_MODE;
- if (egress)
+ if (egress) {
query = XDP_QUERY_PROG_EGRESS;
- else
+ bpf_op = bpf_chk = generic_xdp_install;
+ } else {
query = offload ? XDP_QUERY_PROG_HW : XDP_QUERY_PROG;
-
- bpf_op = bpf_chk = ops->ndo_bpf;
- if (!bpf_op && (flags & (XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE))) {
- NL_SET_ERR_MSG(extack, "underlying driver does not support XDP in native mode");
- return -EOPNOTSUPP;
+ bpf_op = bpf_chk = ops->ndo_bpf;
+ if (!bpf_op && (flags & (XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE))) {
+ NL_SET_ERR_MSG(extack, "underlying driver does not support XDP in native mode");
+ return -EOPNOTSUPP;
+ }
+ if (!bpf_op || (flags & XDP_FLAGS_SKB_MODE))
+ bpf_op = generic_xdp_install;
+ if (bpf_op == bpf_chk)
+ bpf_chk = generic_xdp_install;
}
- if (!bpf_op || (flags & XDP_FLAGS_SKB_MODE))
- bpf_op = generic_xdp_install;
- if (bpf_op == bpf_chk)
- bpf_chk = generic_xdp_install;
prog_id = __dev_xdp_query(dev, bpf_op, query);
if (flags & XDP_FLAGS_REPLACE) {
--
2.21.1 (Apple Git-122.3)
next prev parent reply other threads:[~2020-04-24 20:14 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 20:14 [PATCH v3 bpf-next 00/15] net: Add support for XDP in egress path David Ahern
2020-04-24 20:14 ` [PATCH v3 bpf-next 01/15] net: Refactor convert_to_xdp_frame David Ahern
2020-04-27 16:19 ` John Fastabend
2020-04-24 20:14 ` [PATCH v3 bpf-next 02/15] net: uapi for XDP programs in the egress path David Ahern
2020-04-24 20:14 ` [PATCH v3 bpf-next 03/15] net: Add XDP setup and query commands for Tx programs David Ahern
2020-04-24 20:14 ` [PATCH v3 bpf-next 04/15] net: Add BPF_XDP_EGRESS as a bpf_attach_type David Ahern
2020-04-24 20:14 ` [PATCH v3 bpf-next 05/15] xdp: Add xdp_txq_info to xdp_buff David Ahern
2020-04-24 20:14 ` [PATCH v3 bpf-next 06/15] net: Rename do_xdp_generic to do_xdp_generic_rx David Ahern
2020-04-24 20:14 ` [PATCH v3 bpf-next 07/15] net: rename netif_receive_generic_xdp to do_generic_xdp_core David Ahern
2020-04-24 20:14 ` David Ahern [this message]
2020-04-24 20:14 ` [PATCH v3 bpf-next 09/15] net: Support xdp in the Tx path for packets as an skb David Ahern
2020-04-24 20:14 ` [PATCH v3 bpf-next 10/15] net: Support xdp in the Tx path for xdp_frames David Ahern
2020-04-24 20:14 ` [PATCH v3 bpf-next 11/15] libbpf: Add egress XDP support David Ahern
2020-04-24 20:14 ` [PATCH v3 bpf-next 12/15] bpftool: Add support for XDP egress David Ahern
2020-04-27 15:13 ` Toke Høiland-Jørgensen
2020-04-24 20:14 ` [PATCH v3 bpf-next 13/15] selftest: Add test for xdp_egress David Ahern
2020-04-27 17:48 ` John Fastabend
2020-04-27 17:52 ` John Fastabend
2020-04-27 17:58 ` David Ahern
2020-04-24 20:14 ` [PATCH v3 bpf-next 14/15] selftest: Add xdp_egress attach tests David Ahern
2020-04-24 20:14 ` [PATCH v3 bpf-next 15/15] samples/bpf: add XDP egress support to xdp1 David Ahern
2020-04-27 15:21 ` [PATCH v3 bpf-next 00/15] net: Add support for XDP in egress path Toke Høiland-Jørgensen
2020-04-27 18:25 ` John Fastabend
2020-04-27 18:58 ` David Ahern
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=20200424201428.89514-9-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=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).