Hi Lina, On 4/7/22 10:47 AM, Lina Wang wrote:
The code is copied from the Android Open Source Project and the author( Maciej Żenczykowski) has gave permission to relicense it under GPLv2. The test is to change input IPv6 packets to IPv4 ones and output IPv4 to IPv6 with bpf_skb_change_proto. Signed-off-by: Maciej Żenczykowski <maze@xxxxxxxxxx> Signed-off-by: Lina Wang <lina.wang@xxxxxxxxxxxx> --- tools/testing/selftests/bpf/progs/nat6to4.c | 293 ++++++++++++++++++++ 1 file changed, 293 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/nat6to4.c
Thanks for adding a selftest into your series! Your patch 2/3 is utilizing this program out of selftests/net/udpgro_frglist.sh, however, this is a bit problematic given BPF CI which runs on every BPF submitted patch. Meaning, udpgro_frglist.sh won't be covered by CI and only needs to be run manually. Could you properly include this into test_progs from BPF suite (that way, BPF CI will also pick it up)? See also [2] for more complex netns setups. Thanks again! Daniel Some small comments below. [0] https://patchwork.kernel.org/project/netdevbpf/patch/20220407084727.10241-2-lina.wang@xxxxxxxxxxxx/ [1] https://github.com/kernel-patches/bpf/actions [2] https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/tree/tools/testing/selftests/bpf/prog_tests/xdp_bonding.c
diff --git a/tools/testing/selftests/bpf/progs/nat6to4.c b/tools/testing/selftests/bpf/progs/nat6to4.c new file mode 100644 index 000000000000..099950f7a6cc --- /dev/null +++ b/tools/testing/selftests/bpf/progs/nat6to4.c @@ -0,0 +1,293 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * This code is taken from the Android Open Source Project and the author + * (Maciej Żenczykowski) has gave permission to relicense it under the + * GPLv2. Therefore this program is free software; + * You can redistribute it and/or modify it under the terms of the GNU + * General Public License version 2 as published by the Free Software + * Foundation + + * The original headers, including the original license headers, are + * included below for completeness. + * + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include <linux/bpf.h> +#include <linux/if.h> +#include <linux/if_ether.h> +#include <linux/if_packet.h> +#include <linux/in.h> +#include <linux/in6.h> +#include <linux/ip.h> +#include <linux/ipv6.h> +#include <linux/pkt_cls.h> +#include <linux/swab.h> +#include <stdbool.h> +#include <stdint.h> + +// bionic kernel uapi linux/udp.h header is munged...
nit: Throughout the file, please use C style comments as per kernel coding convention.
+#define __kernel_udphdr udphdr +#include <linux/udp.h> + +#include <bpf/bpf_helpers.h> + +#define htons(x) (__builtin_constant_p(x) ? ___constant_swab16(x) : __builtin_bswap16(x)) +#define htonl(x) (__builtin_constant_p(x) ? ___constant_swab32(x) : __builtin_bswap32(x)) +#define ntohs(x) htons(x) +#define ntohl(x) htonl(x)
nit: Please use libbpf's bpf_htons() and friends helpers [3]. [3] https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/tree/tools/lib/bpf/bpf_endian.h OT: In Cilium we run similar NAT46/64 translation for XDP and tc/BPF for our LB services [4] (that is, v4 VIP with v6 backends, and v6 VIP with v4 backends). [4] https://github.com/cilium/cilium/blob/master/bpf/lib/nat_46x64.h https://github.com/cilium/cilium/blob/master/test/nat46x64/test.sh
