diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-14 20:31:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-14 20:31:21 -0700 |
| commit | d00f26b623333f2419f4c3b95ff11c8b1bb96f56 (patch) | |
| tree | fa1ae8e845b1b788168ecbba8bcec77633f4f683 /include/net/ip6_fib.h | |
| parent | 9b65d2ffe853e4cf81585eaf60ce00237b277dc0 (diff) | |
| parent | b92d44b5c2efe70dbe7fc44fdd2ad46f8612418a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2020-05-14
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) Merged tag 'perf-for-bpf-2020-05-06' from tip tree that includes CAP_PERFMON.
2) support for narrow loads in bpf_sock_addr progs and additional
helpers in cg-skb progs, from Andrey.
3) bpf benchmark runner, from Andrii.
4) arm and riscv JIT optimizations, from Luke.
5) bpf iterator infrastructure, from Yonghong.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip6_fib.h')
| -rw-r--r-- | include/net/ip6_fib.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 1d98828c6649..fdaf975e3331 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -544,6 +544,13 @@ static inline bool fib6_metric_locked(struct fib6_info *f6i, int metric) return !!(f6i->fib6_metrics->metrics[RTAX_LOCK - 1] & (1 << metric)); } +#if IS_BUILTIN(CONFIG_IPV6) && defined(CONFIG_BPF_SYSCALL) +struct bpf_iter__ipv6_route { + __bpf_md_ptr(struct bpf_iter_meta *, meta); + __bpf_md_ptr(struct fib6_info *, rt); +}; +#endif + #ifdef CONFIG_IPV6_MULTIPLE_TABLES static inline bool fib6_has_custom_rules(const struct net *net) { |