When using the bpf_redirect_map() helper to redirect packets from XDP, the eBPF program cannot currently know whether the redirect will succeed, which makes it impossible to gracefully handle errors. To properly fix this will probably require deeper changes to the way TX resources are allocated, but one thing that is fairly straight forward to fix is to allow lookups into devmaps, so programs can at least know when a redirect is *guaranteed* to fail because there is no entry in the map. Currently, programs work around this by keeping a shadow map of another type which indicates whether a map index is valid.
This series contains two changes that are complementary ways to fix this issue. The first patch adds a flag to make the bpf_redirect_map() helper itself do a lookup in the map and return XDP_PASS if the map index is unset, while the second patch allows regular lookups into devmaps from eBPF programs. The performance impact of both patches is negligible, in the sense that I cannot measure it because the variance between test runs is higher than the difference pre/post patch. Changelog: v2: - For patch 1, make it clear that the change works for any map type. - For patch 2, just use the new BPF_F_RDONLY_PROG flag to make the return value read-only. --- Toke Høiland-Jørgensen (2): bpf_xdp_redirect_map: Add flag to return XDP_PASS on map lookup failure devmap: Allow map lookups from eBPF include/uapi/linux/bpf.h | 8 ++++++++ kernel/bpf/devmap.c | 5 +++++ kernel/bpf/verifier.c | 7 ++----- net/core/filter.c | 10 +++++++++- 4 files changed, 24 insertions(+), 6 deletions(-)