Message ID | 20221011090846.752622-2-mtahhan@redhat.com (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | BPF |
Headers | show |
Series | doc: BPF_MAP_TYPE_DEVMAP, BPF_MAP_TYPE_DEVMAP_HASH | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Not a local patch |
bpf/vmtest-bpf-next-PR | fail | PR summary |
bpf/vmtest-bpf-next-VM_Test-14 | fail | Logs for test_progs_no_alu32 on x86_64 with llvm-16 |
bpf/vmtest-bpf-next-VM_Test-4 | success | Logs for llvm-toolchain |
bpf/vmtest-bpf-next-VM_Test-5 | success | Logs for set-matrix |
bpf/vmtest-bpf-next-VM_Test-2 | success | Logs for build for x86_64 with gcc |
bpf/vmtest-bpf-next-VM_Test-3 | success | Logs for build for x86_64 with llvm-16 |
bpf/vmtest-bpf-next-VM_Test-1 | success | Logs for build for s390x with gcc |
bpf/vmtest-bpf-next-VM_Test-17 | success | Logs for test_verifier on x86_64 with llvm-16 |
bpf/vmtest-bpf-next-VM_Test-13 | fail | Logs for test_progs_no_alu32 on x86_64 with gcc |
bpf/vmtest-bpf-next-VM_Test-16 | success | Logs for test_verifier on x86_64 with gcc |
bpf/vmtest-bpf-next-VM_Test-6 | success | Logs for test_maps on s390x with gcc |
bpf/vmtest-bpf-next-VM_Test-7 | success | Logs for test_maps on x86_64 with gcc |
bpf/vmtest-bpf-next-VM_Test-8 | success | Logs for test_maps on x86_64 with llvm-16 |
bpf/vmtest-bpf-next-VM_Test-9 | success | Logs for test_progs on s390x with gcc |
bpf/vmtest-bpf-next-VM_Test-10 | fail | Logs for test_progs on x86_64 with gcc |
bpf/vmtest-bpf-next-VM_Test-11 | fail | Logs for test_progs on x86_64 with llvm-16 |
bpf/vmtest-bpf-next-VM_Test-12 | success | Logs for test_progs_no_alu32 on s390x with gcc |
bpf/vmtest-bpf-next-VM_Test-15 | success | Logs for test_verifier on s390x with gcc |
mtahhan@redhat.com writes: > From: Maryam Tahhan <mtahhan@redhat.com> > > Add documentation for BPF_MAP_TYPE_DEVMAP and > BPF_MAP_TYPE_DEVMAP_HASH including kernel version > introduced, usage and examples. Thanks for doing this! Some comments below. > > Signed-off-by: Maryam Tahhan <mtahhan@redhat.com> > --- > Documentation/bpf/map_devmap.rst | 231 +++++++++++++++++++++++++++++++ > 1 file changed, 231 insertions(+) > create mode 100644 Documentation/bpf/map_devmap.rst > > diff --git a/Documentation/bpf/map_devmap.rst b/Documentation/bpf/map_devmap.rst > new file mode 100644 > index 000000000000..ecd2b7b951cc > --- /dev/null > +++ b/Documentation/bpf/map_devmap.rst > @@ -0,0 +1,231 @@ > +.. SPDX-License-Identifier: GPL-2.0-only > +.. Copyright (C) 2022 Red Hat, Inc. > + > +================================================= > +BPF_MAP_TYPE_DEVMAP and BPF_MAP_TYPE_DEVMAP_HASH > +================================================= > + > +.. note:: > + - ``BPF_MAP_TYPE_DEVMAP`` was introduced in kernel version 4.14 > + - ``BPF_MAP_TYPE_DEVMAP_HASH`` was introduced in kernel version 5.4 > + > +``BPF_MAP_TYPE_DEVMAP`` is a BPF map, primarily used as a backend map for the XDP > +BPF helper call ``bpf_redirect_map()``. It's backed by an array that uses the key as > +the index to lookup a reference to a net device. The user provides <``key``/ ``ifindex``> > +pairs to update the map with new net devices. The TYPE_DEVMAP also takes the bpf_devmap_val struct as its value, not just key/ifindex (as is indeed also noted below). Maybe it's better to just collapse the description of the two into one paragraph noting that they only differ in the "sparseness" of keys? > +``BPF_MAP_TYPE_DEVMAP_HASH`` is also a backend map for ``bpf_redirect_map()``. > +It's backed by a hash table that uses the ``ifindex`` as the key to lookup a reference > +to a net device. As it's a hash map, it allows for densely packing the net devices > +(compared with the sparsely packed ``BPF_MAP_TYPE_DEVMAP``). Should we note that the packing comes at the cost of a hash of the key when looking up? > The user provides > +<``key``/ ``struct bpf_devmap_val``> pairs to update the map with new net devices. > + > +The setup and packet enqueue/send code is shared between the two types of > +devmap; only the lookup and insertion is different. > + > +XDP_REDIRECT > +============ > + > +XDP_REDIRECT works by a three-step process, implemented as follows: > + > +1. The ``bpf_redirect()`` and ``bpf_redirect_map()`` helpers will lookup the > + target of the redirect and store it (along with some other metadata) in a > + per-CPU ``struct bpf_redirect_info``. This is where the maps above come into > + play. > + > +2. When the program returns the ``XDP_REDIRECT`` return code, the driver will > + call ``xdp_do_redirect()`` which will use the information in ``struct > + bpf_redirect_info`` to actually enqueue the frame into a map type-specific > + bulk queue structure. > + > +3. Before exiting its NAPI poll loop, the driver will call ``xdp_do_flush()``, > + which will flush all the different bulk queues, thus completing the > + redirect. This is supposed to be user-facing documentation right (i.e., to be read by BPF program authors not kernel programmers)? If so, maybe this is a tad bit too much detail. I feel it's fine to explain the three-step process and bulk queueing, but the function and data structure names are maybe superfluous details? > +Pointers to the map entries will be kept around for this whole sequence of > +steps, protected by RCU. However, there is no top-level ``rcu_read_lock()`` in > +the core code; instead, the RCU protection relies on everything happening > +inside a single NAPI poll sequence, which means it's between a pair of calls > +to ``local_bh_disable()`` / ``local_bh_enable()``. > + > +The map entries are marked as ``__rcu`` and the map code makes sure to dereference > +those pointers with ``rcu_dereference_check()`` in a way that works for both > +sections that to hold an ``rcu_read_lock()`` and sections that are called from > +NAPI without a separate ``rcu_read_lock()``. The code below does not use RCU > +annotations, but relies on those in the map code. This is *definitely* too much detail for user-facing documentation. > +.. note:: > + ``XDP_REDIRECT`` is not fully supported yet for xdp frags since not all XDP > + capable drivers can map a non-linear ``xdp_frame`` in ``ndo_xdp_xmit``. It's not really "fully supported" for non-frags either (i.e., it still depends on driver support). So maybe expand this to say something like "not all drivers support transmitting frames after a redirect, and for those that do, not all of them support non-linear frames"? Do we explain anywhere what a non-linear frame is, BTW? > +Usage > +===== > + > +.. c:function:: > + long bpf_map_update_elem(struct bpf_map *map, const void *key, const void *value, u64 flags) Feels a bit weird to include these (generic) helpers into a document on the specific map type? Shouldn't they be documented separately (and the map type just document the value type)? > + Net device entries can be added or updated using the ``bpf_map_update_elem()`` > + helper. This helper replaces existing elements atomically. The ``flags`` > + parameter can be used to control the update behaviour: Should probably specify that updates can only be done from userspace (not from a BPF program)? > + > + - ``BPF_ANY`` will create a new element or update an existing element > + - ``BPF_NOEXIST`` will create a new element only if one did not already > + exist > + - ``BPF_EXIST`` will update an existing element > + > + ``bpf_map_update_elem()`` returns 0 on success, or negative error in > + case of failure. > + > + The value parameter is of type ``struct bpf_devmap_val``: It's either a bpf_devmap_val struct or just an ifindex (for backwards compatibility reasons). > + > + .. code-block:: c > + > + struct bpf_devmap_val { > + __u32 ifindex; /* device index */ > + union { > + int fd; /* prog fd on map write */ > + __u32 id; /* prog id on map read */ > + } bpf_prog; > + }; > + > + DEVMAPs can associate a program with a device entry by adding a ``bpf_prog.fd`` > + to ``struct bpf_devmap_val``. Programs are run after ``XDP_REDIRECT`` and have > + access to both Rx device and Tx device. The program associated with the ``fd`` > + must have type XDP with expected attach type ``xdp_devmap``. > + When a program is associated with a device index, the program is run on an > + ``XDP_REDIRECT`` and before the buffer is added to the per-cpu queue. Examples > + of how to attach/use xdp_devmap progs can be found in the kernel selftests: > + > + - test_xdp_with_devmap_helpers_ > + - xdp_devmap_attach_ > + > +.. _xdp_devmap_attach: https://github.com/torvalds/linux/blob/master/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c > +.. _test_xdp_with_devmap_helpers: https://github.com/torvalds/linux/blob/master/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c > + > +.. c:function:: > + void *bpf_map_lookup_elem(struct bpf_map *map, const void *key) > + > + net device entries can be retrieved using the ``bpf_map_lookup_elem()`` > + helper. This helper returns a pointer to the value associated with ``key``, or > + ``NULL`` if no entry was found. > + > +.. c:function:: > + long bpf_map_delete_elem(struct bpf_map *map, const void *key) > + > + net device entries can be deleted using the ``bpf_map_delete_elem()`` > + helper. This helper will return 0 on success, or negative error in case of > + failure. > + > +.. c:function:: > + long bpf_redirect_map(struct bpf_map *map, u32 key, u64 flags) This helper makes a bit more sense to have documented here, but I also feels like it would make more sense to document thew hole redirect facility in one place, along with all the different map types (i.e., also XSK and CPUMAP)? > + Redirect the packet to the endpoint referenced by map at index > ``key``. s/map/``map``/ ? > + For ``BPF_MAP_TYPE_DEVMAP`` and ``BPF_MAP_TYPE_DEVMAP_HASH`` this map contains > + references to net devices (for forwarding packets through other ports). > + > + The lower two bits of *flags* are used as the return code if the map lookup > + fails. This is so that the return value can be one of the XDP program return > + codes up to ``XDP_TX``, as chosen by the caller. The higher bits of ``flags`` > + can be set to ``BPF_F_BROADCAST`` or ``BPF_F_EXCLUDE_INGRESS`` as defined > + below. > + > + With ``BPF_F_BROADCAST`` the packet will be broadcast to all the interfaces > + in the map, with ``BPF_F_EXCLUDE_INGRESS`` the ingress interface will be excluded > + from the broadcast. > + > + This helper will return ``XDP_REDIRECT`` on success, or the value of the two > + lower bits of the *flags* argument if the map lookup fails. > > +Examples > +======== > + > +Kernel BPF > +---------- > + > +The following code snippet shows how to declare a ``BPF_MAP_TYPE_DEVMAP`` > +called tx_port. > + > +.. code-block:: c > + > + struct { > + __uint(type, BPF_MAP_TYPE_DEVMAP); > + __uint(key_size, sizeof(int)); > + __uint(value_size, sizeof(int)); I think we generally use '__u32' not 'int' as the key and value types; also, should this use the '__type(key, __u32)' syntax instead of __uint(key_size..)? > + __uint(max_entries, 256); > + } tx_port SEC(".maps"); > + > +The following code snippet shows how to declare a ``BPF_MAP_TYPE_DEVMAP_HASH`` > +called forward_map. > + > +.. code-block:: c > + > + struct { > + __uint(type, BPF_MAP_TYPE_DEVMAP_HASH); > + __uint(key_size, sizeof(int)); > + __uint(value_size, sizeof(struct bpf_devmap_val)); > + __uint(max_entries, 32); > + } forward_map SEC(".maps"); As above, and maybe point out that this one is deliberately using the struct value while the other isn't? > +The following code snippet shows a simple xdp_redirect_map program. > + > +.. code-block:: c > + > + SEC("xdp") > + int xdp_redirect_map_func(struct xdp_md *ctx) > + { > + void *data_end = (void *)(long)ctx->data_end; > + void *data = (void *)(long)ctx->data; Why define the data pointers if they're not used? > + int action = XDP_PASS; Why is this defined as a variable, and why is it initialised (it will always be overridden below)? > + int index = ctx->ingress_ifindex; Should probably explain that this works in concert with the userspace code to index the devmap on ingress ifindex, yielding a fixed destination port for each ingress ifindex? > + > + action = bpf_redirect_map(&tx_port, index, BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS); > + > + out: Unused label? > + return action; > + } > + > + > +User space > +---------- > + > +The following code snippet shows how to update a devmap called ``tx_port``. > + > +.. code-block:: c > + > + int update_devmap(int ifindex, int redirect_ifindex) > + { > + int ret = -1; > + > + ret = bpf_map_update_elem(bpf_map__fd(tx_port), &ifindex, &redirect_ifindex, 0); > + if (ret < 0) { > + fprintf(stderr, "Failed to update devmap_ value: %s\n", > + strerror(errno)); > + } > + > + return ret; > + } > + > +The following code snippet shows how to update a hash_devmap called ``forward_map``. > + > +.. code-block:: c > + > + int update_devmap(int ifindex, int redirect_ifindex) > + { > + struct bpf_devmap_val devmap_val; This should be zero-initialised; maybe just initialise as { .ifindex = redirect_ifindex }; ? > + int ret = -1; > + > + devmap_val.ifindex = redirect_ifindex; > + ret = bpf_map_update_elem(bpf_map__fd(forward_map), &ifindex, &devmap_val, 0); > + if (ret < 0) { > + fprintf(stderr, "Failed to update devmap_ value: %s\n", > + strerror(errno)); > + } > + return ret; > + } > + > +References > +=========== > + > +- https://lwn.net/Articles/728146/ > +- https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=6f9d451ab1a33728adb72d7ff66a7b374d665176 > +- https://elixir.bootlin.com/linux/latest/source/net/core/filter.c#L4106 > -- > 2.35.3
diff --git a/Documentation/bpf/map_devmap.rst b/Documentation/bpf/map_devmap.rst new file mode 100644 index 000000000000..ecd2b7b951cc --- /dev/null +++ b/Documentation/bpf/map_devmap.rst @@ -0,0 +1,231 @@ +.. SPDX-License-Identifier: GPL-2.0-only +.. Copyright (C) 2022 Red Hat, Inc. + +================================================= +BPF_MAP_TYPE_DEVMAP and BPF_MAP_TYPE_DEVMAP_HASH +================================================= + +.. note:: + - ``BPF_MAP_TYPE_DEVMAP`` was introduced in kernel version 4.14 + - ``BPF_MAP_TYPE_DEVMAP_HASH`` was introduced in kernel version 5.4 + +``BPF_MAP_TYPE_DEVMAP`` is a BPF map, primarily used as a backend map for the XDP +BPF helper call ``bpf_redirect_map()``. It's backed by an array that uses the key as +the index to lookup a reference to a net device. The user provides <``key``/ ``ifindex``> +pairs to update the map with new net devices. + +``BPF_MAP_TYPE_DEVMAP_HASH`` is also a backend map for ``bpf_redirect_map()``. +It's backed by a hash table that uses the ``ifindex`` as the key to lookup a reference +to a net device. As it's a hash map, it allows for densely packing the net devices +(compared with the sparsely packed ``BPF_MAP_TYPE_DEVMAP``). The user provides +<``key``/ ``struct bpf_devmap_val``> pairs to update the map with new net devices. + +The setup and packet enqueue/send code is shared between the two types of +devmap; only the lookup and insertion is different. + +XDP_REDIRECT +============ + +XDP_REDIRECT works by a three-step process, implemented as follows: + +1. The ``bpf_redirect()`` and ``bpf_redirect_map()`` helpers will lookup the + target of the redirect and store it (along with some other metadata) in a + per-CPU ``struct bpf_redirect_info``. This is where the maps above come into + play. + +2. When the program returns the ``XDP_REDIRECT`` return code, the driver will + call ``xdp_do_redirect()`` which will use the information in ``struct + bpf_redirect_info`` to actually enqueue the frame into a map type-specific + bulk queue structure. + +3. Before exiting its NAPI poll loop, the driver will call ``xdp_do_flush()``, + which will flush all the different bulk queues, thus completing the + redirect. + +Pointers to the map entries will be kept around for this whole sequence of +steps, protected by RCU. However, there is no top-level ``rcu_read_lock()`` in +the core code; instead, the RCU protection relies on everything happening +inside a single NAPI poll sequence, which means it's between a pair of calls +to ``local_bh_disable()`` / ``local_bh_enable()``. + +The map entries are marked as ``__rcu`` and the map code makes sure to dereference +those pointers with ``rcu_dereference_check()`` in a way that works for both +sections that to hold an ``rcu_read_lock()`` and sections that are called from +NAPI without a separate ``rcu_read_lock()``. The code below does not use RCU +annotations, but relies on those in the map code. + +.. note:: + ``XDP_REDIRECT`` is not fully supported yet for xdp frags since not all XDP + capable drivers can map a non-linear ``xdp_frame`` in ``ndo_xdp_xmit``. + +Usage +===== + +.. c:function:: + long bpf_map_update_elem(struct bpf_map *map, const void *key, const void *value, u64 flags) + + Net device entries can be added or updated using the ``bpf_map_update_elem()`` + helper. This helper replaces existing elements atomically. The ``flags`` + parameter can be used to control the update behaviour: + + - ``BPF_ANY`` will create a new element or update an existing element + - ``BPF_NOEXIST`` will create a new element only if one did not already + exist + - ``BPF_EXIST`` will update an existing element + + ``bpf_map_update_elem()`` returns 0 on success, or negative error in + case of failure. + + The value parameter is of type ``struct bpf_devmap_val``: + + .. code-block:: c + + struct bpf_devmap_val { + __u32 ifindex; /* device index */ + union { + int fd; /* prog fd on map write */ + __u32 id; /* prog id on map read */ + } bpf_prog; + }; + + DEVMAPs can associate a program with a device entry by adding a ``bpf_prog.fd`` + to ``struct bpf_devmap_val``. Programs are run after ``XDP_REDIRECT`` and have + access to both Rx device and Tx device. The program associated with the ``fd`` + must have type XDP with expected attach type ``xdp_devmap``. + When a program is associated with a device index, the program is run on an + ``XDP_REDIRECT`` and before the buffer is added to the per-cpu queue. Examples + of how to attach/use xdp_devmap progs can be found in the kernel selftests: + + - test_xdp_with_devmap_helpers_ + - xdp_devmap_attach_ + +.. _xdp_devmap_attach: https://github.com/torvalds/linux/blob/master/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c +.. _test_xdp_with_devmap_helpers: https://github.com/torvalds/linux/blob/master/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c + +.. c:function:: + void *bpf_map_lookup_elem(struct bpf_map *map, const void *key) + + net device entries can be retrieved using the ``bpf_map_lookup_elem()`` + helper. This helper returns a pointer to the value associated with ``key``, or + ``NULL`` if no entry was found. + +.. c:function:: + long bpf_map_delete_elem(struct bpf_map *map, const void *key) + + net device entries can be deleted using the ``bpf_map_delete_elem()`` + helper. This helper will return 0 on success, or negative error in case of + failure. + +.. c:function:: + long bpf_redirect_map(struct bpf_map *map, u32 key, u64 flags) + + Redirect the packet to the endpoint referenced by map at index ``key``. + For ``BPF_MAP_TYPE_DEVMAP`` and ``BPF_MAP_TYPE_DEVMAP_HASH`` this map contains + references to net devices (for forwarding packets through other ports). + + The lower two bits of *flags* are used as the return code if the map lookup + fails. This is so that the return value can be one of the XDP program return + codes up to ``XDP_TX``, as chosen by the caller. The higher bits of ``flags`` + can be set to ``BPF_F_BROADCAST`` or ``BPF_F_EXCLUDE_INGRESS`` as defined + below. + + With ``BPF_F_BROADCAST`` the packet will be broadcast to all the interfaces + in the map, with ``BPF_F_EXCLUDE_INGRESS`` the ingress interface will be excluded + from the broadcast. + + This helper will return ``XDP_REDIRECT`` on success, or the value of the two + lower bits of the *flags* argument if the map lookup fails. + +Examples +======== + +Kernel BPF +---------- + +The following code snippet shows how to declare a ``BPF_MAP_TYPE_DEVMAP`` +called tx_port. + +.. code-block:: c + + struct { + __uint(type, BPF_MAP_TYPE_DEVMAP); + __uint(key_size, sizeof(int)); + __uint(value_size, sizeof(int)); + __uint(max_entries, 256); + } tx_port SEC(".maps"); + +The following code snippet shows how to declare a ``BPF_MAP_TYPE_DEVMAP_HASH`` +called forward_map. + +.. code-block:: c + + struct { + __uint(type, BPF_MAP_TYPE_DEVMAP_HASH); + __uint(key_size, sizeof(int)); + __uint(value_size, sizeof(struct bpf_devmap_val)); + __uint(max_entries, 32); + } forward_map SEC(".maps"); + +The following code snippet shows a simple xdp_redirect_map program. + +.. code-block:: c + + SEC("xdp") + int xdp_redirect_map_func(struct xdp_md *ctx) + { + void *data_end = (void *)(long)ctx->data_end; + void *data = (void *)(long)ctx->data; + int action = XDP_PASS; + int index = ctx->ingress_ifindex; + + action = bpf_redirect_map(&tx_port, index, BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS); + + out: + return action; + } + + +User space +---------- + +The following code snippet shows how to update a devmap called ``tx_port``. + +.. code-block:: c + + int update_devmap(int ifindex, int redirect_ifindex) + { + int ret = -1; + + ret = bpf_map_update_elem(bpf_map__fd(tx_port), &ifindex, &redirect_ifindex, 0); + if (ret < 0) { + fprintf(stderr, "Failed to update devmap_ value: %s\n", + strerror(errno)); + } + + return ret; + } + +The following code snippet shows how to update a hash_devmap called ``forward_map``. + +.. code-block:: c + + int update_devmap(int ifindex, int redirect_ifindex) + { + struct bpf_devmap_val devmap_val; + int ret = -1; + + devmap_val.ifindex = redirect_ifindex; + ret = bpf_map_update_elem(bpf_map__fd(forward_map), &ifindex, &devmap_val, 0); + if (ret < 0) { + fprintf(stderr, "Failed to update devmap_ value: %s\n", + strerror(errno)); + } + return ret; + } + +References +=========== + +- https://lwn.net/Articles/728146/ +- https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=6f9d451ab1a33728adb72d7ff66a7b374d665176 +- https://elixir.bootlin.com/linux/latest/source/net/core/filter.c#L4106