From nobody Wed Dec 4 18:48:06 2024 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B9AA187859; Wed, 20 Nov 2024 07:43:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732088618; cv=none; b=bEK8MJMpw67DAb8y4fDZis4Cr85vDkS5ORChs6eD+Gegq/dlcbqeQoaEPBX+zK2y/6Tc5r+htIu98BBp5bRmkUCt6o1TCg82wDw2ee2cqehQkHUlE38lplIdPhvcGz+j6pLGSV+2aP5hED0m7LvfJdrlTmEc2tqBHU8DGNlJlC8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732088618; c=relaxed/simple; bh=sr5+NUkQODstLZWFhfyvEYSmS540B3EQIWGX4Jmv+PY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gZ64BjZCRpETMkCk6tUj0so/It+kKQp6urkHJZn0Wp+BcOY8h/IqGeXQ7SDtdmPBPliIsrfZESbiyciXZSJlRPYj4dYYdQ+1iA5bJqkhVoG7MGe53LGhgiHrQW6e5RIbm5zZglsSEcf3cfqPF/CO8AES4e3jpsOnYr3fyqxC3gk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=jacHtPdO; arc=none smtp.client-ip=217.70.183.193 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="jacHtPdO" Received: by mail.gandi.net (Postfix) with ESMTPSA id 3A3BC24000E; Wed, 20 Nov 2024 07:43:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1732088614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nr0NhIWE3Qxai0XHX0AFNUjmQ/QZTeohcIogA5xtZDg=; b=jacHtPdOlkrqrNBSkW2kBp2p3FOu6fXrFRPIfFct8YUz9yhXWjQFTQsslJfzjH2lvTb0Zm WAIOZYS7GPf4yNVuIlZRZJW4cQJI7m9yPU5yJ8kr+ldMjTlrFVJwqzU/nQAC02cHId/DfY fiFdUvLo56RP4vNg/FwH/Izo9PVW4IBiFqHPhISMRn+UYlJYbCkOiXiym4upsEYfRoydaz zG6u8k9bEw1Fj5oPKeorozMYICehVzmFE+Gfiu0D9TSWKKTSncSetK5ANit0WUkBAsruTA e6s4ksQAqaq3Z6g5yx9W9AXfxGX9maBKjjs15u0j50H3UC63ORT/RZ9bYYlMLA== From: =?utf-8?q?Alexis_Lothor=C3=A9_=28eBPF_Foundation=29?= Date: Wed, 20 Nov 2024 08:43:16 +0100 Subject: [PATCH bpf-next v3 06/14] selftests/bpf: add gre packets testing to flow_dissector Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241120-flow_dissector-v3-6-45b46494f937@bootlin.com> References: <20241120-flow_dissector-v3-0-45b46494f937@bootlin.com> In-Reply-To: <20241120-flow_dissector-v3-0-45b46494f937@bootlin.com> To: Andrii Nakryiko , Eduard Zingerman , Mykola Lysenko , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Shuah Khan , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer Cc: ebpf@linuxfoundation.org, Thomas Petazzoni , Bastien Curutchet , bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, =?utf-8?q?Alexis_Lothor=C3=A9_=28eBPF_Foundation=29?= X-Mailer: b4 0.14.2 X-GND-Sasl: alexis.lothore@bootlin.com The bpf_flow program is able to handle GRE headers in IP packets. Add a few test data input simulating those GRE packets, with 2 different cases: - parse GRE and the encapsulated packet - parse GRE only Acked-by: Stanislav Fomichev Signed-off-by: Alexis Lothor=C3=A9 (eBPF Foundation) --- Changes in v3: -none Changes in v2: - fetch Acked-by tag --- .../selftests/bpf/prog_tests/flow_dissector.c | 76 ++++++++++++++++++= ++++ 1 file changed, 76 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c b/tool= s/testing/selftests/bpf/prog_tests/flow_dissector.c index 29182009cda944e617a26e450902e63c2f7787ce..1e17254376ec440816670a564f1= 28a7c0275c618 100644 --- a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c +++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c @@ -63,6 +63,19 @@ struct dvlan_ipv6_pkt { struct tcphdr tcp; } __packed; =20 +struct gre_base_hdr { + __be16 flags; + __be16 protocol; +} gre_base_hdr; + +struct gre_minimal_pkt { + struct ethhdr eth; + struct iphdr iph; + struct gre_base_hdr gre_hdr; + struct iphdr iph_inner; + struct tcphdr tcp; +} __packed; + struct test { const char *name; union { @@ -72,6 +85,7 @@ struct test { struct ipv6_pkt ipv6; struct ipv6_frag_pkt ipv6_frag; struct dvlan_ipv6_pkt dvlan_ipv6; + struct gre_minimal_pkt gre_minimal; } pkt; struct bpf_flow_keys keys; __u32 flags; @@ -417,6 +431,68 @@ struct test tests[] =3D { }, .retval =3D BPF_FLOW_DISSECTOR_CONTINUE, }, + { + .name =3D "ip-gre", + .pkt.gre_minimal =3D { + .eth.h_proto =3D __bpf_constant_htons(ETH_P_IP), + .iph.ihl =3D 5, + .iph.protocol =3D IPPROTO_GRE, + .iph.tot_len =3D __bpf_constant_htons(MAGIC_BYTES), + .gre_hdr =3D { + .flags =3D 0, + .protocol =3D __bpf_constant_htons(ETH_P_IP), + }, + .iph_inner.ihl =3D 5, + .iph_inner.protocol =3D IPPROTO_TCP, + .iph_inner.tot_len =3D + __bpf_constant_htons(MAGIC_BYTES - + sizeof(struct iphdr)), + .tcp.doff =3D 5, + .tcp.source =3D 80, + .tcp.dest =3D 8080, + }, + .keys =3D { + .nhoff =3D ETH_HLEN, + .thoff =3D ETH_HLEN + sizeof(struct iphdr) * 2 + + sizeof(struct gre_base_hdr), + .addr_proto =3D ETH_P_IP, + .ip_proto =3D IPPROTO_TCP, + .n_proto =3D __bpf_constant_htons(ETH_P_IP), + .is_encap =3D true, + .sport =3D 80, + .dport =3D 8080, + }, + .retval =3D BPF_OK, + }, + { + .name =3D "ip-gre-no-encap", + .pkt.ipip =3D { + .eth.h_proto =3D __bpf_constant_htons(ETH_P_IP), + .iph.ihl =3D 5, + .iph.protocol =3D IPPROTO_GRE, + .iph.tot_len =3D __bpf_constant_htons(MAGIC_BYTES), + .iph_inner.ihl =3D 5, + .iph_inner.protocol =3D IPPROTO_TCP, + .iph_inner.tot_len =3D + __bpf_constant_htons(MAGIC_BYTES - + sizeof(struct iphdr)), + .tcp.doff =3D 5, + .tcp.source =3D 80, + .tcp.dest =3D 8080, + }, + .keys =3D { + .flags =3D BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP, + .nhoff =3D ETH_HLEN, + .thoff =3D ETH_HLEN + sizeof(struct iphdr) + + sizeof(struct gre_base_hdr), + .addr_proto =3D ETH_P_IP, + .ip_proto =3D IPPROTO_GRE, + .n_proto =3D __bpf_constant_htons(ETH_P_IP), + .is_encap =3D true, + }, + .flags =3D BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP, + .retval =3D BPF_OK, + }, }; =20 static int create_tap(const char *ifname) --=20 2.47.0