* [PATCH bpf-next] bpf: flowlabel in bpf_fib_lookup should be flowinfo
@ 2018-06-03 15:15 dsahern
2018-06-04 1:41 ` Alexei Starovoitov
0 siblings, 1 reply; 4+ messages in thread
From: dsahern @ 2018-06-03 15:15 UTC (permalink / raw)
To: netdev, borkmann, ast; +Cc: David Ahern, Michal Kubecek
From: David Ahern <dsahern@gmail.com>
As Michal noted the flow struct takes both the flow label and priority.
Update the bpf_fib_lookup API to note that it is flowinfo and not just
the flow label.
Cc: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: David Ahern <dsahern@gmail.com>
---
include/uapi/linux/bpf.h | 2 +-
net/core/filter.c | 2 +-
samples/bpf/xdp_fwd_kern.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index f0b6608b1f1c..5ef032bc4746 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -2623,7 +2623,7 @@ struct bpf_fib_lookup {
union {
/* inputs to lookup */
__u8 tos; /* AF_INET */
- __be32 flowlabel; /* AF_INET6 */
+ __be32 flowinfo; /* AF_INET6, flow_label + priority */
/* output: metric of fib result (IPv4/IPv6 only) */
__u32 rt_metric;
diff --git a/net/core/filter.c b/net/core/filter.c
index 28e864777c0f..704d515de2df 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -4222,7 +4222,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
fl6.flowi6_oif = 0;
strict = RT6_LOOKUP_F_HAS_SADDR;
}
- fl6.flowlabel = params->flowlabel;
+ fl6.flowlabel = params->flowinfo;
fl6.flowi6_scope = 0;
fl6.flowi6_flags = 0;
fl6.mp_hash = 0;
diff --git a/samples/bpf/xdp_fwd_kern.c b/samples/bpf/xdp_fwd_kern.c
index 4a6be0f87505..6673cdb9f55c 100644
--- a/samples/bpf/xdp_fwd_kern.c
+++ b/samples/bpf/xdp_fwd_kern.c
@@ -88,7 +88,7 @@ static __always_inline int xdp_fwd_flags(struct xdp_md *ctx, u32 flags)
return XDP_PASS;
fib_params.family = AF_INET6;
- fib_params.flowlabel = *(__be32 *)ip6h & IPV6_FLOWINFO_MASK;
+ fib_params.flowinfo = *(__be32 *)ip6h & IPV6_FLOWINFO_MASK;
fib_params.l4_protocol = ip6h->nexthdr;
fib_params.sport = 0;
fib_params.dport = 0;
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next] bpf: flowlabel in bpf_fib_lookup should be flowinfo
2018-06-03 15:15 [PATCH bpf-next] bpf: flowlabel in bpf_fib_lookup should be flowinfo dsahern
@ 2018-06-04 1:41 ` Alexei Starovoitov
2018-06-04 1:47 ` David Ahern
0 siblings, 1 reply; 4+ messages in thread
From: Alexei Starovoitov @ 2018-06-04 1:41 UTC (permalink / raw)
To: dsahern; +Cc: netdev, borkmann, ast, David Ahern, Michal Kubecek
On Sun, Jun 03, 2018 at 08:15:19AM -0700, dsahern@kernel.org wrote:
> From: David Ahern <dsahern@gmail.com>
>
> As Michal noted the flow struct takes both the flow label and priority.
> Update the bpf_fib_lookup API to note that it is flowinfo and not just
> the flow label.
>
> Cc: Michal Kubecek <mkubecek@suse.cz>
> Signed-off-by: David Ahern <dsahern@gmail.com>
Applied, Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next] bpf: flowlabel in bpf_fib_lookup should be flowinfo
2018-06-04 1:41 ` Alexei Starovoitov
@ 2018-06-04 1:47 ` David Ahern
2018-06-04 1:48 ` Alexei Starovoitov
0 siblings, 1 reply; 4+ messages in thread
From: David Ahern @ 2018-06-04 1:47 UTC (permalink / raw)
To: Alexei Starovoitov; +Cc: netdev, borkmann, ast, Michal Kubecek
On 6/3/18 7:41 PM, Alexei Starovoitov wrote:
> On Sun, Jun 03, 2018 at 08:15:19AM -0700, dsahern@kernel.org wrote:
>> From: David Ahern <dsahern@gmail.com>
>>
>> As Michal noted the flow struct takes both the flow label and priority.
>> Update the bpf_fib_lookup API to note that it is flowinfo and not just
>> the flow label.
>>
>> Cc: Michal Kubecek <mkubecek@suse.cz>
>> Signed-off-by: David Ahern <dsahern@gmail.com>
>
> Applied, Thanks
>
I noticed 4.17 was released. Just to make sure we are on the same page,
this patch needs to be 4.18.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next] bpf: flowlabel in bpf_fib_lookup should be flowinfo
2018-06-04 1:47 ` David Ahern
@ 2018-06-04 1:48 ` Alexei Starovoitov
0 siblings, 0 replies; 4+ messages in thread
From: Alexei Starovoitov @ 2018-06-04 1:48 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, borkmann, ast, Michal Kubecek
On Sun, Jun 03, 2018 at 07:47:11PM -0600, David Ahern wrote:
> On 6/3/18 7:41 PM, Alexei Starovoitov wrote:
> > On Sun, Jun 03, 2018 at 08:15:19AM -0700, dsahern@kernel.org wrote:
> >> From: David Ahern <dsahern@gmail.com>
> >>
> >> As Michal noted the flow struct takes both the flow label and priority.
> >> Update the bpf_fib_lookup API to note that it is flowinfo and not just
> >> the flow label.
> >>
> >> Cc: Michal Kubecek <mkubecek@suse.cz>
> >> Signed-off-by: David Ahern <dsahern@gmail.com>
> >
> > Applied, Thanks
> >
>
> I noticed 4.17 was released. Just to make sure we are on the same page,
> this patch needs to be 4.18.
It was applied to bpf-next obviously.
As soon as we resolve the situation with af_xdp the PR will be sent to Dave
for net-next, so net-next can be sent to Linus.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-06-04 1:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-03 15:15 [PATCH bpf-next] bpf: flowlabel in bpf_fib_lookup should be flowinfo dsahern
2018-06-04 1:41 ` Alexei Starovoitov
2018-06-04 1:47 ` David Ahern
2018-06-04 1:48 ` Alexei Starovoitov
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).