Commit 97fbfeb8 authored by Gilad Sever's avatar Gilad Sever Committed by Daniel Borkmann
Browse files

bpf: Call __bpf_sk_lookup()/__bpf_skc_lookup() directly via TC hookpoint 



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.

Signed-off-by: default avatarGilad Sever <gilad9366@gmail.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reviewed-by: default avatarShmulik Ladkani <shmulik.ladkani@gmail.com>
Reviewed-by: default avatarEyal Birger <eyal.birger@gmail.com>
Acked-by: default avatarStanislav Fomichev <sdf@google.com>
Link: https://lore.kernel.org/bpf/20230621104211.301902-3-gilad9366@gmail.com
parent 6e98730b

net/core/filter.c

+18 −6
Original line number Diff line number Diff line
@@ -6743,8 +6743,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 = {
@@ -6762,8 +6766,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 = {
@@ -6781,8 +6789,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 = {