From: Stanislav Fomichev <sdf@google.com>
To: Gilad Sever <gilad9366@gmail.com>
Cc: dsahern@kernel.org, martin.lau@linux.dev, daniel@iogearbox.net,
john.fastabend@gmail.com, ast@kernel.org, andrii@kernel.org,
song@kernel.org, yhs@fb.com, kpsingh@kernel.org,
haoluo@google.com, jolsa@kernel.org, davem@davemloft.net,
edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
mykolal@fb.com, shuah@kernel.org, hawk@kernel.org,
joe@wand.net.nz, eyal.birger@gmail.com,
shmulik.ladkani@gmail.com, bpf@vger.kernel.org,
netdev@vger.kernel.org, linux-kselftest@vger.kernel.org
Subject: Re: [PATCH bpf,v3 3/4] bpf: fix bpf socket lookup from tc/xdp to respect socket VRF bindings
Date: Thu, 27 Apr 2023 11:03:27 -0700 [thread overview]
Message-ID: <ZEq47yhL58mceV3C@google.com> (raw)
In-Reply-To: <20230426085122.376768-4-gilad9366@gmail.com>
On 04/26, Gilad Sever wrote:
> When calling bpf_sk_lookup_tcp(), bpf_sk_lookup_udp() or
> bpf_skc_lookup_tcp() from tc/xdp ingress, VRF socket bindings aren't
> respoected, i.e. unbound sockets are returned, and bound sockets aren't
> found.
>
> VRF binding is determined by the sdif argument to sk_lookup(), however
> when called from tc the IP SKB control block isn't initialized and thus
> inet{,6}_sdif() always returns 0.
>
> Fix by calculating sdif for the tc/xdp flows by observing the device's
> l3 enslaved state.
>
> The cg/sk_skb hooking points which are expected to support
> inet{,6}_sdif() pass sdif=-1 which makes __bpf_skc_lookup() use the
> existing logic.
>
> Fixes: 6acc9b432e67 ("bpf: Add helper to retrieve socket in BPF")
> Reviewed-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
> Reviewed-by: Eyal Birger <eyal.birger@gmail.com>
> Signed-off-by: Gilad Sever <gilad9366@gmail.com>
Acked-by: Stanislav Fomichev <sdf@google.com>
with one nit below
> ---
> v3: Rename bpf_l2_sdif() to dev_sdif() as suggested by Stanislav Fomichev
> ---
> net/core/filter.c | 63 +++++++++++++++++++++++++++++++----------------
> 1 file changed, 42 insertions(+), 21 deletions(-)
>
> diff --git a/net/core/filter.c b/net/core/filter.c
> index f43f86fc1235..894913aaa29f 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -6529,12 +6529,11 @@ static struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple,
> static struct sock *
> __bpf_skc_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,
> struct net *caller_net, u32 ifindex, u8 proto, u64 netns_id,
> - u64 flags)
> + u64 flags, int sdif)
> {
> struct sock *sk = NULL;
> struct net *net;
> u8 family;
> - int sdif;
>
> if (len == sizeof(tuple->ipv4))
> family = AF_INET;
> @@ -6546,10 +6545,12 @@ __bpf_skc_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,
> if (unlikely(flags || !((s32)netns_id < 0 || netns_id <= S32_MAX)))
> goto out;
>
> - if (family == AF_INET)
> - sdif = inet_sdif(skb);
> - else
> - sdif = inet6_sdif(skb);
> + if (sdif < 0) {
> + if (family == AF_INET)
> + sdif = inet_sdif(skb);
> + else
> + sdif = inet6_sdif(skb);
> + }
>
> if ((s32)netns_id < 0) {
> net = caller_net;
> @@ -6569,10 +6570,11 @@ __bpf_skc_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,
> static struct sock *
> __bpf_sk_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,
> struct net *caller_net, u32 ifindex, u8 proto, u64 netns_id,
> - u64 flags)
> + u64 flags, int sdif)
> {
> struct sock *sk = __bpf_skc_lookup(skb, tuple, len, caller_net,
> - ifindex, proto, netns_id, flags);
> + ifindex, proto, netns_id, flags,
> + sdif);
>
> if (sk) {
> struct sock *sk2 = sk_to_full_sk(sk);
> @@ -6612,7 +6614,7 @@ bpf_skc_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,
> }
>
> return __bpf_skc_lookup(skb, tuple, len, caller_net, ifindex, proto,
> - netns_id, flags);
> + netns_id, flags, -1);
> }
>
> static struct sock *
> @@ -6701,15 +6703,25 @@ static const struct bpf_func_proto bpf_sk_lookup_udp_proto = {
> .arg5_type = ARG_ANYTHING,
> };
[..]
> +static int dev_sdif(const struct net_device *dev)
> +{
> +#if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV)
> + if (netif_is_l3_slave(dev))
> + return dev->ifindex;
> +#endif
> + return 0;
> +}
nit: should this go into include/linux/netdevice.h?
> +
> BPF_CALL_5(bpf_tc_skc_lookup_tcp, struct sk_buff *, skb,
> struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)
> {
> struct net *caller_net = dev_net(skb->dev);
> + int sdif = dev_sdif(skb->dev);
> int ifindex = skb->dev->ifindex;
>
> return (unsigned long)__bpf_skc_lookup(skb, tuple, len, caller_net,
> ifindex, IPPROTO_TCP, netns_id,
> - flags);
> + flags, sdif);
> }
>
> static const struct bpf_func_proto bpf_tc_skc_lookup_tcp_proto = {
> @@ -6728,11 +6740,12 @@ BPF_CALL_5(bpf_tc_sk_lookup_tcp, struct sk_buff *, skb,
> struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)
> {
> struct net *caller_net = dev_net(skb->dev);
> + int sdif = dev_sdif(skb->dev);
> int ifindex = skb->dev->ifindex;
>
> return (unsigned long)__bpf_sk_lookup(skb, tuple, len, caller_net,
> ifindex, IPPROTO_TCP, netns_id,
> - flags);
> + flags, sdif);
> }
>
> static const struct bpf_func_proto bpf_tc_sk_lookup_tcp_proto = {
> @@ -6751,11 +6764,12 @@ BPF_CALL_5(bpf_tc_sk_lookup_udp, struct sk_buff *, skb,
> struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)
> {
> struct net *caller_net = dev_net(skb->dev);
> + int sdif = dev_sdif(skb->dev);
> int ifindex = skb->dev->ifindex;
>
> return (unsigned long)__bpf_sk_lookup(skb, tuple, len, caller_net,
> ifindex, IPPROTO_UDP, netns_id,
> - flags);
> + flags, sdif);
> }
>
> static const struct bpf_func_proto bpf_tc_sk_lookup_udp_proto = {
> @@ -6788,11 +6802,13 @@ BPF_CALL_5(bpf_xdp_sk_lookup_udp, struct xdp_buff *, ctx,
> struct bpf_sock_tuple *, tuple, u32, len, u32, netns_id, u64, flags)
> {
> struct net *caller_net = dev_net(ctx->rxq->dev);
> - int ifindex = ctx->rxq->dev->ifindex;
> + struct net_device *dev = ctx->rxq->dev;
> + int sdif = dev_sdif(dev);
> + int ifindex = dev->ifindex;
>
> return (unsigned long)__bpf_sk_lookup(NULL, tuple, len, caller_net,
> ifindex, IPPROTO_UDP, netns_id,
> - flags);
> + flags, sdif);
> }
>
> static const struct bpf_func_proto bpf_xdp_sk_lookup_udp_proto = {
> @@ -6811,11 +6827,13 @@ BPF_CALL_5(bpf_xdp_skc_lookup_tcp, struct xdp_buff *, ctx,
> struct bpf_sock_tuple *, tuple, u32, len, u32, netns_id, u64, flags)
> {
> struct net *caller_net = dev_net(ctx->rxq->dev);
> - int ifindex = ctx->rxq->dev->ifindex;
> + struct net_device *dev = ctx->rxq->dev;
> + int sdif = dev_sdif(dev);
> + int ifindex = dev->ifindex;
>
> return (unsigned long)__bpf_skc_lookup(NULL, tuple, len, caller_net,
> ifindex, IPPROTO_TCP, netns_id,
> - flags);
> + flags, sdif);
> }
>
> static const struct bpf_func_proto bpf_xdp_skc_lookup_tcp_proto = {
> @@ -6834,11 +6852,13 @@ BPF_CALL_5(bpf_xdp_sk_lookup_tcp, struct xdp_buff *, ctx,
> struct bpf_sock_tuple *, tuple, u32, len, u32, netns_id, u64, flags)
> {
> struct net *caller_net = dev_net(ctx->rxq->dev);
> - int ifindex = ctx->rxq->dev->ifindex;
> + struct net_device *dev = ctx->rxq->dev;
> + int sdif = dev_sdif(dev);
> + int ifindex = dev->ifindex;
>
> return (unsigned long)__bpf_sk_lookup(NULL, tuple, len, caller_net,
> ifindex, IPPROTO_TCP, netns_id,
> - flags);
> + flags, sdif);
> }
>
> static const struct bpf_func_proto bpf_xdp_sk_lookup_tcp_proto = {
> @@ -6858,7 +6878,8 @@ BPF_CALL_5(bpf_sock_addr_skc_lookup_tcp, struct bpf_sock_addr_kern *, ctx,
> {
> return (unsigned long)__bpf_skc_lookup(NULL, tuple, len,
> sock_net(ctx->sk), 0,
> - IPPROTO_TCP, netns_id, flags);
> + IPPROTO_TCP, netns_id, flags,
> + -1);
> }
>
> static const struct bpf_func_proto bpf_sock_addr_skc_lookup_tcp_proto = {
> @@ -6877,7 +6898,7 @@ BPF_CALL_5(bpf_sock_addr_sk_lookup_tcp, struct bpf_sock_addr_kern *, ctx,
> {
> return (unsigned long)__bpf_sk_lookup(NULL, tuple, len,
> sock_net(ctx->sk), 0, IPPROTO_TCP,
> - netns_id, flags);
> + netns_id, flags, -1);
> }
>
> static const struct bpf_func_proto bpf_sock_addr_sk_lookup_tcp_proto = {
> @@ -6896,7 +6917,7 @@ BPF_CALL_5(bpf_sock_addr_sk_lookup_udp, struct bpf_sock_addr_kern *, ctx,
> {
> return (unsigned long)__bpf_sk_lookup(NULL, tuple, len,
> sock_net(ctx->sk), 0, IPPROTO_UDP,
> - netns_id, flags);
> + netns_id, flags, -1);
> }
>
> static const struct bpf_func_proto bpf_sock_addr_sk_lookup_udp_proto = {
> --
> 2.34.1
>
next prev parent reply other threads:[~2023-04-27 18:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-26 8:51 [PATCH bpf,v3 0/4] Socket lookup BPF API from tc/xdp ingress does not respect VRF bindings Gilad Sever
2023-04-26 8:51 ` [PATCH bpf,v3 1/4] bpf: factor out socket lookup functions for the TC hookpoint Gilad Sever
2023-04-27 18:03 ` Stanislav Fomichev
2023-04-26 8:51 ` [PATCH bpf,v3 2/4] bpf: Call __bpf_sk_lookup()/__bpf_skc_lookup() directly via " Gilad Sever
2023-04-27 18:03 ` Stanislav Fomichev
2023-04-26 8:51 ` [PATCH bpf,v3 3/4] bpf: fix bpf socket lookup from tc/xdp to respect socket VRF bindings Gilad Sever
2023-04-27 18:03 ` Stanislav Fomichev [this message]
2023-04-26 8:51 ` [PATCH bpf,v3 4/4] selftests/bpf: Add vrf_socket_lookup tests Gilad Sever
2023-04-27 17:31 ` Stanislav Fomichev
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=ZEq47yhL58mceV3C@google.com \
--to=sdf@google.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=eyal.birger@gmail.com \
--cc=gilad9366@gmail.com \
--cc=haoluo@google.com \
--cc=hawk@kernel.org \
--cc=joe@wand.net.nz \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shmulik.ladkani@gmail.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).