netdev - Re: [PATCH bpf,v3 2/4] bpf: Call __bpf_sk_lookup()/__bpf_skc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <ZEq4/JAgLRCKEeQr@google.com>
Date:   Thu, 27 Apr 2023 11:03:40 -0700
From:   Stanislav Fomichev <sdf@...gle.com>
To:     Gilad Sever <gilad9366@...il.com>
Cc:     dsahern@...nel.org, martin.lau@...ux.dev, daniel@...earbox.net,
        john.fastabend@...il.com, ast@...nel.org, andrii@...nel.org,
        song@...nel.org, yhs@...com, kpsingh@...nel.org, haoluo@...gle.com,
        jolsa@...nel.org, davem@...emloft.net, edumazet@...gle.com,
        kuba@...nel.org, pabeni@...hat.com, mykolal@...com,
        shuah@...nel.org, hawk@...nel.org, joe@...d.net.nz,
        eyal.birger@...il.com, shmulik.ladkani@...il.com,
        bpf@...r.kernel.org, netdev@...r.kernel.org,
        linux-kselftest@...r.kernel.org
Subject: Re: [PATCH bpf,v3 2/4] bpf: Call __bpf_sk_lookup()/__bpf_skc_lookup()
 directly via TC hookpoint

On 04/26, Gilad Sever wrote:
> skb->dev always exists in the tc flow. There is no need to use
> bpf_skc_lookup(), bpf_sk_lookup() from this code path.
> 
> This change facilitates fixing the tc flow to be VRF aware.
> 
> Reviewed-by: Shmulik Ladkani <shmulik.ladkani@...il.com>
> Reviewed-by: Eyal Birger <eyal.birger@...il.com>
> Signed-off-by: Gilad Sever <gilad9366@...il.com>

Acked-by: Stanislav Fomichev <sdf@...gle.com>

> ---
>  net/core/filter.c | 24 ++++++++++++++++++------
>  1 file changed, 18 insertions(+), 6 deletions(-)
> 
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 5910956f4e0d..f43f86fc1235 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -6704,8 +6704,12 @@ static const struct bpf_func_proto bpf_sk_lookup_udp_proto = {
>  BPF_CALL_5(bpf_tc_skc_lookup_tcp, struct sk_buff *, skb,
>  	   struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)
>  {
> -	return (unsigned long)bpf_skc_lookup(skb, tuple, len, IPPROTO_TCP,
> -					     netns_id, flags);
> +	struct net *caller_net = dev_net(skb->dev);
> +	int ifindex = skb->dev->ifindex;
> +
> +	return (unsigned long)__bpf_skc_lookup(skb, tuple, len, caller_net,
> +					       ifindex, IPPROTO_TCP, netns_id,
> +					       flags);
>  }
>  
>  static const struct bpf_func_proto bpf_tc_skc_lookup_tcp_proto = {
> @@ -6723,8 +6727,12 @@ static const struct bpf_func_proto bpf_tc_skc_lookup_tcp_proto = {
>  BPF_CALL_5(bpf_tc_sk_lookup_tcp, struct sk_buff *, skb,
>  	   struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)
>  {
> -	return (unsigned long)bpf_sk_lookup(skb, tuple, len, IPPROTO_TCP,
> -					    netns_id, flags);
> +	struct net *caller_net = dev_net(skb->dev);
> +	int ifindex = skb->dev->ifindex;
> +
> +	return (unsigned long)__bpf_sk_lookup(skb, tuple, len, caller_net,
> +					      ifindex, IPPROTO_TCP, netns_id,
> +					      flags);
>  }
>  
>  static const struct bpf_func_proto bpf_tc_sk_lookup_tcp_proto = {
> @@ -6742,8 +6750,12 @@ static const struct bpf_func_proto bpf_tc_sk_lookup_tcp_proto = {
>  BPF_CALL_5(bpf_tc_sk_lookup_udp, struct sk_buff *, skb,
>  	   struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags)
>  {
> -	return (unsigned long)bpf_sk_lookup(skb, tuple, len, IPPROTO_UDP,
> -					    netns_id, flags);
> +	struct net *caller_net = dev_net(skb->dev);
> +	int ifindex = skb->dev->ifindex;
> +
> +	return (unsigned long)__bpf_sk_lookup(skb, tuple, len, caller_net,
> +					      ifindex, IPPROTO_UDP, netns_id,
> +					      flags);
>  }
>  
>  static const struct bpf_func_proto bpf_tc_sk_lookup_udp_proto = {
> -- 
> 2.34.1
>