From: David Ahern <dsahern@kernel•org>
To: netdev@vger•kernel.org
Cc: davem@davemloft•net, kuba@kernel•org, brouer@redhat•com,
toke@redhat•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 <dsahern@kernel•org>
Subject: [PATCH bpf-next 1/5] bpf: Handle 8-byte values in DEVMAP and DEVMAP_HASH
Date: Tue, 26 May 2020 19:09:01 -0600 [thread overview]
Message-ID: <20200527010905.48135-2-dsahern@kernel.org> (raw)
In-Reply-To: <20200527010905.48135-1-dsahern@kernel.org>
Add support to DEVMAP and DEVMAP_HASH to support 8-byte values as a
<device index, program id> pair. To do this, a new struct is needed in
bpf_dtab_netdev to hold the values to return on lookup.
Signed-off-by: David Ahern <dsahern@kernel•org>
---
kernel/bpf/devmap.c | 56 ++++++++++++++++++++++++++++++++++-----------
1 file changed, 43 insertions(+), 13 deletions(-)
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
index a51d9fb7a359..95db6d8beebc 100644
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -60,12 +60,22 @@ struct xdp_dev_bulk_queue {
unsigned int count;
};
+/* devmap value can be dev index or dev index + prog fd/id */
+struct dev_map_ext_val {
+ u32 ifindex; /* must be first for compat with 4-byte values */
+ union {
+ int prog_fd; /* prog fd on write */
+ u32 prog_id; /* prog id on read */
+ };
+};
+
struct bpf_dtab_netdev {
struct net_device *dev; /* must be first member, due to tracepoint */
struct hlist_node index_hlist;
struct bpf_dtab *dtab;
struct rcu_head rcu;
unsigned int idx;
+ struct dev_map_ext_val val;
};
struct bpf_dtab {
@@ -108,9 +118,13 @@ static int dev_map_init_map(struct bpf_dtab *dtab, union bpf_attr *attr)
u64 cost = 0;
int err;
- /* check sanity of attributes */
+ /* check sanity of attributes. 2 value sizes supported:
+ * 4 bytes: ifindex
+ * 8 bytes: ifindex + prog fd
+ */
if (attr->max_entries == 0 || attr->key_size != 4 ||
- attr->value_size != 4 || attr->map_flags & ~DEV_CREATE_FLAG_MASK)
+ (attr->value_size != 4 && attr->value_size != 8) ||
+ attr->map_flags & ~DEV_CREATE_FLAG_MASK)
return -EINVAL;
/* Lookup returns a pointer straight to dev->ifindex, so make sure the
@@ -472,18 +486,15 @@ int dev_map_generic_redirect(struct bpf_dtab_netdev *dst, struct sk_buff *skb,
static void *dev_map_lookup_elem(struct bpf_map *map, void *key)
{
struct bpf_dtab_netdev *obj = __dev_map_lookup_elem(map, *(u32 *)key);
- struct net_device *dev = obj ? obj->dev : NULL;
- return dev ? &dev->ifindex : NULL;
+ return obj ? &obj->val : NULL;
}
static void *dev_map_hash_lookup_elem(struct bpf_map *map, void *key)
{
struct bpf_dtab_netdev *obj = __dev_map_hash_lookup_elem(map,
*(u32 *)key);
- struct net_device *dev = obj ? obj->dev : NULL;
-
- return dev ? &dev->ifindex : NULL;
+ return obj ? &obj->val : NULL;
}
static void __dev_map_entry_free(struct rcu_head *rcu)
@@ -552,15 +563,18 @@ static struct bpf_dtab_netdev *__dev_map_alloc_node(struct net *net,
return ERR_PTR(-ENOMEM);
dev->dev = dev_get_by_index(net, ifindex);
- if (!dev->dev) {
- kfree(dev);
- return ERR_PTR(-EINVAL);
- }
+ if (!dev->dev)
+ goto err_out;
dev->idx = idx;
dev->dtab = dtab;
+ dev->val.ifindex = ifindex;
+
return dev;
+err_out:
+ kfree(dev);
+ return ERR_PTR(-EINVAL);
}
static int __dev_map_update_elem(struct net *net, struct bpf_map *map,
@@ -568,8 +582,16 @@ static int __dev_map_update_elem(struct net *net, struct bpf_map *map,
{
struct bpf_dtab *dtab = container_of(map, struct bpf_dtab, map);
struct bpf_dtab_netdev *dev, *old_dev;
- u32 ifindex = *(u32 *)value;
u32 i = *(u32 *)key;
+ u32 ifindex;
+
+ if (map->value_size == 4) {
+ ifindex = *(u32 *)value;
+ } else {
+ struct dev_map_ext_val *val = value;
+
+ ifindex = val->ifindex;
+ }
if (unlikely(map_flags > BPF_EXIST))
return -EINVAL;
@@ -609,10 +631,18 @@ static int __dev_map_hash_update_elem(struct net *net, struct bpf_map *map,
{
struct bpf_dtab *dtab = container_of(map, struct bpf_dtab, map);
struct bpf_dtab_netdev *dev, *old_dev;
- u32 ifindex = *(u32 *)value;
u32 idx = *(u32 *)key;
unsigned long flags;
int err = -EEXIST;
+ u32 ifindex;
+
+ if (map->value_size == 4) {
+ ifindex = *(u32 *)value;
+ } else {
+ struct dev_map_ext_val *val = value;
+
+ ifindex = val->ifindex;
+ }
if (unlikely(map_flags > BPF_EXIST || !ifindex))
return -EINVAL;
--
2.21.1 (Apple Git-122.3)
next prev parent reply other threads:[~2020-05-27 1:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 1:09 [PATCH bpf-next 0/5] bpf: Add support for XDP programs in DEVMAP entries David Ahern
2020-05-27 1:09 ` David Ahern [this message]
2020-05-27 10:26 ` [PATCH bpf-next 1/5] bpf: Handle 8-byte values in DEVMAP and DEVMAP_HASH Jesper Dangaard Brouer
2020-05-27 13:56 ` David Ahern
2020-05-27 14:57 ` Toke Høiland-Jørgensen
2020-05-27 15:24 ` David Ahern
2020-05-27 14:27 ` David Ahern
2020-05-27 15:30 ` Jesper Dangaard Brouer
2020-05-27 18:38 ` David Ahern
2020-05-27 1:09 ` [PATCH bpf-next 2/5] bpf: Add support to attach bpf program to a devmap entry David Ahern
2020-05-27 10:01 ` Toke Høiland-Jørgensen
2020-05-27 14:02 ` David Ahern
2020-05-27 14:58 ` Toke Høiland-Jørgensen
2020-05-27 1:09 ` [PATCH bpf-next 3/5] xdp: Add xdp_txq_info to xdp_buff David Ahern
2020-05-27 1:09 ` [PATCH bpf-next 4/5] bpftool: Add SEC name for xdp programs attached to device map David Ahern
2020-05-27 10:02 ` Toke Høiland-Jørgensen
2020-05-27 14:03 ` David Ahern
2020-05-27 15:01 ` Toke Høiland-Jørgensen
2020-05-27 15:43 ` Jesper Dangaard Brouer
2020-05-27 1:09 ` [PATCH bpf-next 5/5] selftest: Add tests for XDP programs in devmap entries 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=20200527010905.48135-2-dsahern@kernel.org \
--to=dsahern@kernel$(echo .)org \
--cc=andriin@fb$(echo .)com \
--cc=ast@kernel$(echo .)org \
--cc=brouer@redhat$(echo .)com \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=dsahern@gmail$(echo .)com \
--cc=john.fastabend@gmail$(echo .)com \
--cc=kafai@fb$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=songliubraving@fb$(echo .)com \
--cc=toke@redhat$(echo .)com \
--cc=yhs@fb$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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