Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 6 Apr 2023 18:47:37 -0700
From:   Alexei Starovoitov <alexei.starovoitov@gmail.com>
To:     Christian Ehrig <cehrig@cloudflare.com>
Cc:     bpf@vger.kernel.org, kernel-team@cloudflare.com,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>,
        Stanislav Fomichev <sdf@google.com>,
        Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>,
        Mykola Lysenko <mykolal@fb.com>, Shuah Khan <shuah@kernel.org>,
        Kaixi Fan <fankaixi.li@bytedance.com>,
        Paul Chaignon <paul@isovalent.com>,
        Dave Marchevsky <davemarchevsky@fb.com>,
        linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH bpf-next v2 3/3] selftests/bpf: Test FOU kfuncs for
 externally controlled ipip devices
Message-ID: <20230407014737.sqnq4a3g7ye2novk@dhcp-172-26-102-232.dhcp.thefacebook.com>
References: <cover.1680520500.git.cehrig@cloudflare.com>
 <528a824713c1545839d870eaad84d87749a23371.1680520500.git.cehrig@cloudflare.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <528a824713c1545839d870eaad84d87749a23371.1680520500.git.cehrig@cloudflare.com>
Precedence: bulk

On Mon, Apr 03, 2023 at 02:12:09PM +0200, Christian Ehrig wrote:
> +
> +SEC("tc")
> +int ipip_encap_get_tunnel(struct __sk_buff *skb)
> +{
> +	int ret;
> +	struct bpf_tunnel_key key = {};
> +	struct bpf_fou_encap encap = {};
> +
> +	ret = bpf_skb_get_tunnel_key(skb, &key, sizeof(key), 0);
> +	if (ret < 0) {
> +		log_err(ret);
> +		return TC_ACT_SHOT;
> +	}
> +
> +	ret = bpf_skb_get_fou_encap(skb, &encap);
> +	if (ret < 0) {
> +		log_err(ret);
> +		return TC_ACT_SHOT;
> +	}
> +
> +	if (bpf_ntohs(encap.dport) != 5555)
> +		return TC_ACT_SHOT;
> +
> +	bpf_printk("%d remote ip 0x%x, sport %d, dport %d\n", ret,
> +		   key.remote_ipv4, bpf_ntohs(encap.sport),
> +		   bpf_ntohs(encap.dport));
> +	return TC_ACT_OK;
> +}
> +
>  SEC("tc")
>  int ipip6_set_tunnel(struct __sk_buff *skb)
>  {
> diff --git a/tools/testing/selftests/bpf/test_tunnel.sh b/tools/testing/selftests/bpf/test_tunnel.sh
> index 2dec7dbf29a2..f2379414a887 100755
> --- a/tools/testing/selftests/bpf/test_tunnel.sh
> +++ b/tools/testing/selftests/bpf/test_tunnel.sh

All looks good to me, but please integrate the selftest into test_progs.
test_tunnel is obsolete. BPF CI doesn't run it and maintainers don't do either.