From patchwork Sun Aug 21 18:13:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 12950037 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E99AC00140 for ; Sun, 21 Aug 2022 18:14:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231654AbiHUSOJ (ORCPT ); Sun, 21 Aug 2022 14:14:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231665AbiHUSOH (ORCPT ); Sun, 21 Aug 2022 14:14:07 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0C11205D8 for ; Sun, 21 Aug 2022 11:14:05 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id k6-20020a05600c1c8600b003a54ecc62f6so4909538wms.5 for ; Sun, 21 Aug 2022 11:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metanetworks.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=rlBVZsSeaVS1a8uJUAYvNRuqY9DbM99SrMSYCWdeWwk=; b=IJ3QSDGOuEVhY4Qe+D663fcQPO3WvSqW7TK9/+AcYYqH6gWudGzd6oOSMhDW5iJ5Ch QXivXUJzqVbv5I5Drebk32SgQh3u9we7Fp3imFZzuhexcyCBlLjh4xz8eH97RJ8H9gj0 db1nlYZSxWQbJWt+wo4ikSB8eIdZ6QZ9e/SDc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=rlBVZsSeaVS1a8uJUAYvNRuqY9DbM99SrMSYCWdeWwk=; b=qUg8OMPTBJQRQzeh1lXrYdBksQQ2//VEYV+8lYmUZZxkPvoXQveb4Yq2TrzNAIyXhu e+FM7gprkS+e4VQ4K7qehbl8AUPaUuc6Ajd+COoNL7IeqFg6zIuQpsrtjkFzDNyjfn1z dRJq9UfDlckZ7Gz9VHu402+rdWi/QWMp4gSxLNbAtaPWUdeJm2KeFcQaY+Ck1sldnsie nj9Ua30/mNpxFHLkbfW7X3sev0ipEki3UxEvG7TbJdS0gCUa760Cnb8swVymxDLlju1S aoxcglxFUFu7wO5hOhk24Ue1Iwi6HGBBWmTeD/Vq6T+Cic7Oe88UKF3OFn3mjuH3cNKq Q9Kw== X-Gm-Message-State: ACgBeo0DxsmDtXQbsQYAQMuxMmjWo9gb/bPCuFcSvjEBA/fNvLNdGFw3 F+Y7rHOdWqlWUVFg74zfgKhogucA8JnUzz5jp0N2QlDUJYbbRJxKEcJj5JsjvgHToswBXcP3qU3 ooe2kVgz8ALtuJP7n/lYvup1sJnt9CKVK+oZSwFznZi1Td4JMTYFkLhC3JfbQfZS6LYaOzW7+ X-Google-Smtp-Source: AA6agR5QNQkqOM7UlfWIW0oyZaN3p5KQZW12a1xjH26jA7+j/MAyUBIapxHEVmuI1nff/UPyi644fw== X-Received: by 2002:a05:600c:4618:b0:3a5:f3f0:3a60 with SMTP id m24-20020a05600c461800b003a5f3f03a60mr13136534wmo.11.1661105644167; Sun, 21 Aug 2022 11:14:04 -0700 (PDT) Received: from blondie.home ([94.230.83.151]) by smtp.gmail.com with ESMTPSA id n17-20020a5d4851000000b0021eff2ecb31sm9509303wrs.95.2022.08.21.11.14.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Aug 2022 11:14:03 -0700 (PDT) From: Shmulik Ladkani X-Google-Original-From: Shmulik Ladkani To: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann Cc: Andrii Nakryiko , Paul Chaignon , Shmulik Ladkani Subject: [PATCH v2 bpf-next 1/3] bpf: Support setting variable-length tunnel options Date: Sun, 21 Aug 2022 21:13:43 +0300 Message-Id: <20220821181345.337014-2-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220821181345.337014-1-shmulik.ladkani@gmail.com> References: <20220821181345.337014-1-shmulik.ladkani@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Existing 'bpf_skb_set_tunnel_opt' allows setting tunnel options given an option buffer (ARG_PTR_TO_MEM|MEM_RDONLY) and the compile-time fixed buffer size (ARG_CONST_SIZE). However, in certain cases we wish to set tunnel options of dynamic length. For example, we have an ebpf program that gets geneve options on incoming packets, stores them into a map (using a key representing the incoming flow), and later needs to assign *same* options to reply packets (belonging to same flow). This is currently imposssibly without knowing sender's exact geneve options length, which unfortunately is dymamic. Introduce 'skb_set_var_tunnel_opt'. This is a variant of 'bpf_skb_set_tunnel_opt' which gets an *additional* parameter 'len', which is the byte length from 'opt' buffer to copy into ip_tunnnel_info. The 'size' parameter is kept ARG_CONST_SIZE. This way, verifier can still safe-guard buffer access. 'len' must never exceed 'size', o/w EINVAL is returned. Signed-off-by: Shmulik Ladkani --- include/uapi/linux/bpf.h | 12 ++++++++++++ net/core/filter.c | 34 +++++++++++++++++++++++++++++++--- tools/include/uapi/linux/bpf.h | 12 ++++++++++++ 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 934a2a8beb87..1b965dfd0c80 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -5355,6 +5355,17 @@ union bpf_attr { * Return * Current *ktime*. * + * long bpf_skb_set_var_tunnel_opt(struct sk_buff *skb, void *opt, u32 size, u32 len) + * Description + * Set tunnel options metadata for the packet associated to *skb* + * to the variable length *len* bytes of option data contained in + * the raw buffer *opt* sized *size*. + * + * See also the description of the **bpf_skb_get_tunnel_opt**\ () + * helper for additional information. + * Return + * 0 on success, or a negative error in case of failure. + * */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -5566,6 +5577,7 @@ union bpf_attr { FN(tcp_raw_check_syncookie_ipv4), \ FN(tcp_raw_check_syncookie_ipv6), \ FN(ktime_get_tai_ns), \ + FN(skb_set_var_tunnel_opt), \ /* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper diff --git a/net/core/filter.c b/net/core/filter.c index 1acfaffeaf32..894d780aff16 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4669,8 +4669,8 @@ static const struct bpf_func_proto bpf_skb_set_tunnel_key_proto = { .arg4_type = ARG_ANYTHING, }; -BPF_CALL_3(bpf_skb_set_tunnel_opt, struct sk_buff *, skb, - const u8 *, from, u32, size) +static inline u64 __bpf_skb_set_tunopt(struct sk_buff *skb, + const u8 *from, u32 size, u32 len) { struct ip_tunnel_info *info = skb_tunnel_info(skb); const struct metadata_dst *md = this_cpu_ptr(md_dst); @@ -4679,12 +4679,26 @@ BPF_CALL_3(bpf_skb_set_tunnel_opt, struct sk_buff *, skb, return -EINVAL; if (unlikely(size > IP_TUNNEL_OPTS_MAX)) return -ENOMEM; + if (unlikely(len > size)) + return -EINVAL; - ip_tunnel_info_opts_set(info, from, size, TUNNEL_OPTIONS_PRESENT); + ip_tunnel_info_opts_set(info, from, len, TUNNEL_OPTIONS_PRESENT); return 0; } +BPF_CALL_3(bpf_skb_set_tunnel_opt, struct sk_buff *, skb, + const u8 *, from, u32, size) +{ + return __bpf_skb_set_tunopt(skb, from, size, size); +} + +BPF_CALL_4(bpf_skb_set_var_tunnel_opt, struct sk_buff *, skb, + const u8 *, from, u32, size, u32, len) +{ + return __bpf_skb_set_tunopt(skb, from, size, len); +} + static const struct bpf_func_proto bpf_skb_set_tunnel_opt_proto = { .func = bpf_skb_set_tunnel_opt, .gpl_only = false, @@ -4694,6 +4708,16 @@ static const struct bpf_func_proto bpf_skb_set_tunnel_opt_proto = { .arg3_type = ARG_CONST_SIZE, }; +static const struct bpf_func_proto bpf_skb_set_var_tunnel_opt_proto = { + .func = bpf_skb_set_var_tunnel_opt, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_CTX, + .arg2_type = ARG_PTR_TO_MEM | MEM_RDONLY, + .arg3_type = ARG_CONST_SIZE, + .arg4_type = ARG_ANYTHING, +}; + static const struct bpf_func_proto * bpf_get_skb_set_tunnel_proto(enum bpf_func_id which) { @@ -4714,6 +4738,8 @@ bpf_get_skb_set_tunnel_proto(enum bpf_func_id which) return &bpf_skb_set_tunnel_key_proto; case BPF_FUNC_skb_set_tunnel_opt: return &bpf_skb_set_tunnel_opt_proto; + case BPF_FUNC_skb_set_var_tunnel_opt: + return &bpf_skb_set_var_tunnel_opt_proto; default: return NULL; } @@ -7826,6 +7852,7 @@ tc_cls_act_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) case BPF_FUNC_skb_get_tunnel_opt: return &bpf_skb_get_tunnel_opt_proto; case BPF_FUNC_skb_set_tunnel_opt: + case BPF_FUNC_skb_set_var_tunnel_opt: return bpf_get_skb_set_tunnel_proto(func_id); case BPF_FUNC_redirect: return &bpf_redirect_proto; @@ -8169,6 +8196,7 @@ lwt_xmit_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) case BPF_FUNC_skb_get_tunnel_opt: return &bpf_skb_get_tunnel_opt_proto; case BPF_FUNC_skb_set_tunnel_opt: + case BPF_FUNC_skb_set_var_tunnel_opt: return bpf_get_skb_set_tunnel_proto(func_id); case BPF_FUNC_redirect: return &bpf_redirect_proto; diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 1d6085e15fc8..1a1083db5b7a 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -5355,6 +5355,17 @@ union bpf_attr { * Return * Current *ktime*. * + * long bpf_skb_set_var_tunnel_opt(struct sk_buff *skb, void *opt, u32 size, u32 len) + * Description + * Set tunnel options metadata for the packet associated to *skb* + * to the variable length *len* bytes of option data contained in + * the raw buffer *opt* sized *size*. + * + * See also the description of the **bpf_skb_get_tunnel_opt**\ () + * helper for additional information. + * Return + * 0 on success, or a negative error in case of failure. + * */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -5566,6 +5577,7 @@ union bpf_attr { FN(tcp_raw_check_syncookie_ipv4), \ FN(tcp_raw_check_syncookie_ipv6), \ FN(ktime_get_tai_ns), \ + FN(skb_set_var_tunnel_opt), \ /* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper From patchwork Sun Aug 21 18:13:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 12950038 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3716C00140 for ; Sun, 21 Aug 2022 18:14:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231646AbiHUSOS (ORCPT ); Sun, 21 Aug 2022 14:14:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231669AbiHUSOO (ORCPT ); Sun, 21 Aug 2022 14:14:14 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A581D205DA for ; Sun, 21 Aug 2022 11:14:11 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id r83-20020a1c4456000000b003a5cb389944so6624052wma.4 for ; Sun, 21 Aug 2022 11:14:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metanetworks.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=0NOhQ+9Eg1hYodEfeL4gY+mnmGuJvDz8XKjUQSHxK6g=; b=EsnC0JiN4V6KxQAjlJACxefoYvBe1qQYc/yLnwQS9oeHzz0YvelIyPrJVcL8Gh0WZb W3yTG3CRo15sH6rvYAyKsil3vjZ/7pPezUQdGZs6zx0vfQWUpqOoF/PsWh1gZob5tKCD yQ+VryhkIEnB7RCyJt/gPJABwKEdbVwdm59Lc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=0NOhQ+9Eg1hYodEfeL4gY+mnmGuJvDz8XKjUQSHxK6g=; b=qeUd7NdqA9oYyWE9xsfdX3fHxNd3B/jtV75rjkfe/L5QHucfp6i4viaHZUVH5DU+M/ BYR/mjuvUvYgPgRzXbVKy/XETL9FmAYg671Gqbj0g4VyNoFmwLuLWN0MnPt/lN/1lKU3 jXdC30Wnh84URPWfY9c13Uxj32D09QK8LFVgYxqiblMYRx5Ly63Lu5aqzFjzpzNuP7NO JEcBBnctDuOSs/03I2ZmEFJnoNnYXlnO4Y+CT1GiPuNT/Tc+WJ2hVjH4/2M5mDzZLNDd CNSMDEooF8RvGNRjRcRk1/cc970XNdvHYPRJm2L3zspl+gotdIZn+DULWxhmMPnYXfNR MTgw== X-Gm-Message-State: ACgBeo3lGju6auOJk8ToGGN9ZYOislpWN8c+cDbkVAQf1EyeGnpNRYxZ dizg0v6NB/70JRtklW7FNlhgf2zB69HbW1/5ITilHU5hYGJEgLQgRt/mQpFYsrXmWzIPhHyr3QS h+GUL1TLSI7lvELJFhNkE3fLiDT0foqzyKBi1+q0myG0C65sNO1Tp+32z1Yg+Gs4ZQPy6TSWY X-Google-Smtp-Source: AA6agR6LmoB4TuHuvkNFTHXnxjuG+EvA+koRoZAZJFyct30dmauDA/MEAqWWDRZcpcPEQ1SGoUJUIA== X-Received: by 2002:a05:600c:20f:b0:3a5:a785:7f2a with SMTP id 15-20020a05600c020f00b003a5a7857f2amr13242865wmi.94.1661105649307; Sun, 21 Aug 2022 11:14:09 -0700 (PDT) Received: from blondie.home ([94.230.83.151]) by smtp.gmail.com with ESMTPSA id n17-20020a5d4851000000b0021eff2ecb31sm9509303wrs.95.2022.08.21.11.14.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Aug 2022 11:14:08 -0700 (PDT) From: Shmulik Ladkani X-Google-Original-From: Shmulik Ladkani To: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann Cc: Andrii Nakryiko , Paul Chaignon , Shmulik Ladkani Subject: [PATCH v2 bpf-next 2/3] selftests/bpf: Simplify test_tunnel setup for allowing non-local tunnel traffic Date: Sun, 21 Aug 2022 21:13:44 +0300 Message-Id: <20220821181345.337014-3-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220821181345.337014-1-shmulik.ladkani@gmail.com> References: <20220821181345.337014-1-shmulik.ladkani@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Commit 1115169f47ae ("selftests/bpf: Don't assign outer source IP to host") removed the secondary IP (IP4_ADDR2_VETH1) assigned to veth1, in order to test bpf_skb_set_tunnel_key's functionality when tunnel destination isn't assigned to an interface. The chosen setup for testing the "tunnel to unassigned outer IP" scenario was rather complex: (1) static ARP entries in order to bypass ARP (o/w requests will fail as the target address isn't assigned locally), and (2) a BPF program running on veth1 ingress which manipulates the IP header's daddr to the actual IP assigned to the interface (o/w tunnel traffic won't be accepted locally). This is complex, and adds a dependency on this hidden "dnat"-like eBPF program, that needs to be replicated when new tunnel tests are added. Instead, we can have a much simpler setup: Add the secondary IP as a *local route* in a table pointed by a custom fib rule. No static arp entries are needed, and the special eBPF program that "dnats" the outer destination can be removed. This commit is a revert of 1115169f47ae, with the addition of the local route of IP4_ADDR2_VETH1 (instead of the original address assignment). Signed-off-by: Shmulik Ladkani --- v2: Place the local route for the secondary IP in a custom table pointed by a custom fib rule; this ensures the IP is not considered assigned to a device. --- .../selftests/bpf/prog_tests/test_tunnel.c | 23 ++---- .../selftests/bpf/progs/test_tunnel_kern.c | 80 +++---------------- 2 files changed, 17 insertions(+), 86 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/test_tunnel.c b/tools/testing/selftests/bpf/prog_tests/test_tunnel.c index eea274110267..852da04ff281 100644 --- a/tools/testing/selftests/bpf/prog_tests/test_tunnel.c +++ b/tools/testing/selftests/bpf/prog_tests/test_tunnel.c @@ -82,7 +82,6 @@ #define MAC_TUNL_DEV0 "52:54:00:d9:01:00" #define MAC_TUNL_DEV1 "52:54:00:d9:02:00" -#define MAC_VETH1 "52:54:00:d9:03:00" #define VXLAN_TUNL_DEV0 "vxlan00" #define VXLAN_TUNL_DEV1 "vxlan11" @@ -109,9 +108,15 @@ static int config_device(void) { SYS("ip netns add at_ns0"); - SYS("ip link add veth0 address " MAC_VETH1 " type veth peer name veth1"); + SYS("ip link add veth0 type veth peer name veth1"); SYS("ip link set veth0 netns at_ns0"); SYS("ip addr add " IP4_ADDR1_VETH1 "/24 dev veth1"); + /* Create a custom rule routing IP4_ADDR2_VETH1 as local. + * Do not place it in "local" table, to avoid this IP being considered + * assigned to a device. + */ + SYS("ip rule add to " IP4_ADDR2_VETH1 " table 20"); + SYS("ip route add local " IP4_ADDR2_VETH1 "/32 dev veth1 table 20"); SYS("ip link set dev veth1 up mtu 1500"); SYS("ip netns exec at_ns0 ip addr add " IP4_ADDR_VETH0 "/24 dev veth0"); SYS("ip netns exec at_ns0 ip link set dev veth0 up mtu 1500"); @@ -125,6 +130,7 @@ static void cleanup(void) { SYS_NOFAIL("test -f /var/run/netns/at_ns0 && ip netns delete at_ns0"); SYS_NOFAIL("ip link del veth1 2> /dev/null"); + SYS_NOFAIL("ip rule del to %s table 20 2> /dev/null", IP4_ADDR2_VETH1); SYS_NOFAIL("ip link del %s 2> /dev/null", VXLAN_TUNL_DEV1); SYS_NOFAIL("ip link del %s 2> /dev/null", IP6VXLAN_TUNL_DEV1); } @@ -140,8 +146,6 @@ static int add_vxlan_tunnel(void) VXLAN_TUNL_DEV0, IP4_ADDR_TUNL_DEV0); SYS("ip netns exec at_ns0 ip neigh add %s lladdr %s dev %s", IP4_ADDR_TUNL_DEV1, MAC_TUNL_DEV1, VXLAN_TUNL_DEV0); - SYS("ip netns exec at_ns0 ip neigh add %s lladdr %s dev veth0", - IP4_ADDR2_VETH1, MAC_VETH1); /* root namespace */ SYS("ip link add dev %s type vxlan external gbp dstport 4789", @@ -279,17 +283,6 @@ static void test_vxlan_tunnel(void) if (attach_tc_prog(&tc_hook, get_src_prog_fd, set_src_prog_fd)) goto done; - /* load and attach bpf prog to veth dev tc hook point */ - ifindex = if_nametoindex("veth1"); - if (!ASSERT_NEQ(ifindex, 0, "veth1 ifindex")) - goto done; - tc_hook.ifindex = ifindex; - set_dst_prog_fd = bpf_program__fd(skel->progs.veth_set_outer_dst); - if (!ASSERT_GE(set_dst_prog_fd, 0, "bpf_program__fd")) - goto done; - if (attach_tc_prog(&tc_hook, set_dst_prog_fd, -1)) - goto done; - /* load and attach prog set_md to tunnel dev tc hook point at_ns0 */ nstoken = open_netns("at_ns0"); if (!ASSERT_OK_PTR(nstoken, "setns src")) diff --git a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c index df0673c4ecbe..17f2f325b3f3 100644 --- a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c +++ b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c @@ -14,24 +14,15 @@ #include #include #include -#include #include #include #include #include -#include #include #include #define log_err(__ret) bpf_printk("ERROR line:%d ret:%d\n", __LINE__, __ret) -#define VXLAN_UDP_PORT 4789 - -/* Only IPv4 address assigned to veth1. - * 172.16.1.200 - */ -#define ASSIGNED_ADDR_VETH1 0xac1001c8 - struct geneve_opt { __be16 opt_class; __u8 type; @@ -42,11 +33,6 @@ struct geneve_opt { __u8 opt_data[8]; /* hard-coded to 8 byte */ }; -struct vxlanhdr { - __be32 vx_flags; - __be32 vx_vni; -} __attribute__((packed)); - struct vxlan_metadata { __u32 gbp; }; @@ -383,8 +369,14 @@ int vxlan_get_tunnel_src(struct __sk_buff *skb) int ret; struct bpf_tunnel_key key; struct vxlan_metadata md; - __u32 orig_daddr; __u32 index = 0; + __u32 *local_ip = NULL; + + local_ip = bpf_map_lookup_elem(&local_ip_map, &index); + if (!local_ip) { + log_err(ret); + return TC_ACT_SHOT; + } ret = bpf_skb_get_tunnel_key(skb, &key, sizeof(key), 0); if (ret < 0) { @@ -398,10 +390,11 @@ int vxlan_get_tunnel_src(struct __sk_buff *skb) return TC_ACT_SHOT; } - if (key.local_ipv4 != ASSIGNED_ADDR_VETH1 || md.gbp != 0x800FF) { + if (key.local_ipv4 != *local_ip || md.gbp != 0x800FF) { bpf_printk("vxlan key %d local ip 0x%x remote ip 0x%x gbp 0x%x\n", key.tunnel_id, key.local_ipv4, key.remote_ipv4, md.gbp); + bpf_printk("local_ip 0x%x\n", *local_ip); log_err(ret); return TC_ACT_SHOT; } @@ -409,61 +402,6 @@ int vxlan_get_tunnel_src(struct __sk_buff *skb) return TC_ACT_OK; } -SEC("tc") -int veth_set_outer_dst(struct __sk_buff *skb) -{ - struct ethhdr *eth = (struct ethhdr *)(long)skb->data; - __u32 assigned_ip = bpf_htonl(ASSIGNED_ADDR_VETH1); - void *data_end = (void *)(long)skb->data_end; - struct udphdr *udph; - struct iphdr *iph; - __u32 index = 0; - int ret = 0; - int shrink; - __s64 csum; - - if ((void *)eth + sizeof(*eth) > data_end) { - log_err(ret); - return TC_ACT_SHOT; - } - - if (eth->h_proto != bpf_htons(ETH_P_IP)) - return TC_ACT_OK; - - iph = (struct iphdr *)(eth + 1); - if ((void *)iph + sizeof(*iph) > data_end) { - log_err(ret); - return TC_ACT_SHOT; - } - if (iph->protocol != IPPROTO_UDP) - return TC_ACT_OK; - - udph = (struct udphdr *)(iph + 1); - if ((void *)udph + sizeof(*udph) > data_end) { - log_err(ret); - return TC_ACT_SHOT; - } - if (udph->dest != bpf_htons(VXLAN_UDP_PORT)) - return TC_ACT_OK; - - if (iph->daddr != assigned_ip) { - csum = bpf_csum_diff(&iph->daddr, sizeof(__u32), &assigned_ip, - sizeof(__u32), 0); - if (bpf_skb_store_bytes(skb, ETH_HLEN + offsetof(struct iphdr, daddr), - &assigned_ip, sizeof(__u32), 0) < 0) { - log_err(ret); - return TC_ACT_SHOT; - } - if (bpf_l3_csum_replace(skb, ETH_HLEN + offsetof(struct iphdr, check), - 0, csum, 0) < 0) { - log_err(ret); - return TC_ACT_SHOT; - } - bpf_skb_change_type(skb, PACKET_HOST); - } - return TC_ACT_OK; -} - SEC("tc") int ip6vxlan_set_tunnel_dst(struct __sk_buff *skb) { From patchwork Sun Aug 21 18:13:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 12950039 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29BA0C3F6B0 for ; Sun, 21 Aug 2022 18:14:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231644AbiHUSOU (ORCPT ); Sun, 21 Aug 2022 14:14:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231664AbiHUSOR (ORCPT ); Sun, 21 Aug 2022 14:14:17 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DC46205DF for ; Sun, 21 Aug 2022 11:14:14 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id e20so10236376wri.13 for ; Sun, 21 Aug 2022 11:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metanetworks.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=DyEulj2iG+KHemhu/L5YtT3DCdlueM9rr2hEIi1eYJ8=; b=O52UfMgCZPBGcEJPYLSVLceKH5Qd/Cb/e5fpCsSeqyYX4REv+vY0Z8qrr4yc0VyuV7 NN+vrP112WtYfdUkldXlErmOh/c156TE4CQfvTrb+jNLCQRpI9YYpEvznabXiopMqApy 5bJt0qXDyLZMqqsdAcARjh3jHGLqzyKMDqmmI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=DyEulj2iG+KHemhu/L5YtT3DCdlueM9rr2hEIi1eYJ8=; b=rwy7Y+y5MZw/vs/uFVZQTEV73fJWUlO7/c0exI/QWRz3fHskzWU3tgkUzNyzSE2xV8 Nmz1kxIKHGNPzLJ95zZXeYeXbVPNZNVU9e7O7EMy5Igf74Jc+gBgRVxMX2xY8LcvljyV +2oun5uOox6P9llE67pznoSrXuZhYdwBG4oI5RJyZDfLGrPZD0aSg2W1+A9+/f/2RErU tnuiIzv8K2TErztuloFn3b4DwJi1kaO+pPz15aMY7IzMnhyZ/XAa4BqdNM4DIRLo6ZsL n1fz/87l8VCni8RIxxpjuknbZrrHh4WdE2JtihNL3yHTwFb2sZqo3Yog+qVvIlDHlAVV 6ALg== X-Gm-Message-State: ACgBeo23lTGuzl4wEQ99pnE8uUuYB/39kEOmbZXJKQVUgJpRY9mUR3gR PfvIYDQvW8ymDj4IMG1IGY0PORZjaSKeHK0LDh0B+da+3g+KkSaYPeTejkMDfGrY/CqxwRHUgwl V6Fgk5UVKIUmF/NaknVO881zmLXW/LRuUM0UfKzOe32c4kwnRd29UIGqCF1aoHsJ8IR4smGDl X-Google-Smtp-Source: AA6agR5KEu3jbNIQIONPf+HiLuOrfdoMPdRy0OKLuZTMJGhcfbiGF5H4OWQBGgC+Cm60CnV0iQsgAg== X-Received: by 2002:adf:d1ea:0:b0:225:474b:1061 with SMTP id g10-20020adfd1ea000000b00225474b1061mr3754726wrd.343.1661105652353; Sun, 21 Aug 2022 11:14:12 -0700 (PDT) Received: from blondie.home ([94.230.83.151]) by smtp.gmail.com with ESMTPSA id n17-20020a5d4851000000b0021eff2ecb31sm9509303wrs.95.2022.08.21.11.14.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Aug 2022 11:14:11 -0700 (PDT) From: Shmulik Ladkani X-Google-Original-From: Shmulik Ladkani To: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann Cc: Andrii Nakryiko , Paul Chaignon , Shmulik Ladkani Subject: [PATCH v2 bpf-next 3/3] selftests/bpf: Add geneve with bpf_skb_set_var_tunnel_opt test-case to test_progs Date: Sun, 21 Aug 2022 21:13:45 +0300 Message-Id: <20220821181345.337014-4-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220821181345.337014-1-shmulik.ladkani@gmail.com> References: <20220821181345.337014-1-shmulik.ladkani@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Add geneve test to test_tunnel. The test setup and scheme resembles the existing vxlan test. The test also checks variable length tunnel option assignment using bpf_skb_set_var_tunnel_opt. Signed-off-by: Shmulik Ladkani --- .../selftests/bpf/prog_tests/test_tunnel.c | 108 ++++++++++++++++ .../selftests/bpf/progs/test_tunnel_kern.c | 118 ++++++++++++++++++ 2 files changed, 226 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/test_tunnel.c b/tools/testing/selftests/bpf/prog_tests/test_tunnel.c index 852da04ff281..9aae03c720e9 100644 --- a/tools/testing/selftests/bpf/prog_tests/test_tunnel.c +++ b/tools/testing/selftests/bpf/prog_tests/test_tunnel.c @@ -87,6 +87,8 @@ #define VXLAN_TUNL_DEV1 "vxlan11" #define IP6VXLAN_TUNL_DEV0 "ip6vxlan00" #define IP6VXLAN_TUNL_DEV1 "ip6vxlan11" +#define GENEVE_TUNL_DEV0 "geneve00" +#define GENEVE_TUNL_DEV1 "geneve11" #define PING_ARGS "-i 0.01 -c 3 -w 10 -q" @@ -133,6 +135,38 @@ static void cleanup(void) SYS_NOFAIL("ip rule del to %s table 20 2> /dev/null", IP4_ADDR2_VETH1); SYS_NOFAIL("ip link del %s 2> /dev/null", VXLAN_TUNL_DEV1); SYS_NOFAIL("ip link del %s 2> /dev/null", IP6VXLAN_TUNL_DEV1); + SYS_NOFAIL("ip link del %s 2> /dev/null", GENEVE_TUNL_DEV1); +} + +static int add_geneve_tunnel(void) +{ + /* at_ns0 namespace */ + SYS("ip netns exec at_ns0 ip link add dev %s type geneve external", + GENEVE_TUNL_DEV0); + SYS("ip netns exec at_ns0 ip link set dev %s address %s up", + GENEVE_TUNL_DEV0, MAC_TUNL_DEV0); + SYS("ip netns exec at_ns0 ip addr add dev %s %s/24", + GENEVE_TUNL_DEV0, IP4_ADDR_TUNL_DEV0); + SYS("ip netns exec at_ns0 ip neigh add %s lladdr %s dev %s", + IP4_ADDR_TUNL_DEV1, MAC_TUNL_DEV1, GENEVE_TUNL_DEV0); + + /* root namespace */ + SYS("ip link add dev %s type geneve external", GENEVE_TUNL_DEV1); + SYS("ip link set dev %s address %s up", GENEVE_TUNL_DEV1, MAC_TUNL_DEV1); + SYS("ip addr add dev %s %s/24", GENEVE_TUNL_DEV1, IP4_ADDR_TUNL_DEV1); + SYS("ip neigh add %s lladdr %s dev %s", + IP4_ADDR_TUNL_DEV0, MAC_TUNL_DEV0, GENEVE_TUNL_DEV1); + + return 0; +fail: + return -1; +} + +static void delete_geneve_tunnel(void) +{ + SYS_NOFAIL("ip netns exec at_ns0 ip link delete dev %s", + GENEVE_TUNL_DEV0); + SYS_NOFAIL("ip link delete dev %s", GENEVE_TUNL_DEV1); } static int add_vxlan_tunnel(void) @@ -248,6 +282,79 @@ static int attach_tc_prog(struct bpf_tc_hook *hook, int igr_fd, int egr_fd) return 0; } +static void test_geneve_tunnel(void) +{ + struct test_tunnel_kern *skel = NULL; + struct nstoken *nstoken; + int local_ip_map_fd = -1; + int set_src_prog_fd, get_src_prog_fd; + int set_dst_prog_fd; + int key = 0, ifindex = -1; + uint local_ip; + int err; + DECLARE_LIBBPF_OPTS(bpf_tc_hook, tc_hook, + .attach_point = BPF_TC_INGRESS); + + /* add genve tunnel */ + err = add_geneve_tunnel(); + if (!ASSERT_OK(err, "add geneve tunnel")) + goto done; + + /* load and attach bpf prog to tunnel dev tc hook point */ + skel = test_tunnel_kern__open_and_load(); + if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load")) + goto done; + ifindex = if_nametoindex(GENEVE_TUNL_DEV1); + if (!ASSERT_NEQ(ifindex, 0, "geneve11 ifindex")) + goto done; + tc_hook.ifindex = ifindex; + get_src_prog_fd = bpf_program__fd(skel->progs.geneve_get_tunnel_src); + set_src_prog_fd = bpf_program__fd(skel->progs.geneve_set_tunnel_src); + if (!ASSERT_GE(get_src_prog_fd, 0, "bpf_program__fd")) + goto done; + if (!ASSERT_GE(set_src_prog_fd, 0, "bpf_program__fd")) + goto done; + if (attach_tc_prog(&tc_hook, get_src_prog_fd, set_src_prog_fd)) + goto done; + + /* load and attach prog set_md to tunnel dev tc hook point at_ns0 */ + nstoken = open_netns("at_ns0"); + if (!ASSERT_OK_PTR(nstoken, "setns src")) + goto done; + ifindex = if_nametoindex(GENEVE_TUNL_DEV0); + if (!ASSERT_NEQ(ifindex, 0, "geneve00 ifindex")) + goto done; + tc_hook.ifindex = ifindex; + set_dst_prog_fd = bpf_program__fd(skel->progs.geneve_set_tunnel_dst); + if (!ASSERT_GE(set_dst_prog_fd, 0, "bpf_program__fd")) + goto done; + if (attach_tc_prog(&tc_hook, -1, set_dst_prog_fd)) + goto done; + close_netns(nstoken); + + /* use veth1 ip 1 as tunnel source ip */ + local_ip_map_fd = bpf_map__fd(skel->maps.local_ip_map); + if (!ASSERT_GE(local_ip_map_fd, 0, "bpf_map__fd")) + goto done; + local_ip = IP4_ADDR1_HEX_VETH1; + err = bpf_map_update_elem(local_ip_map_fd, &key, &local_ip, BPF_ANY); + if (!ASSERT_OK(err, "update bpf local_ip_map")) + goto done; + + /* ping test */ + err = test_ping(AF_INET, IP4_ADDR_TUNL_DEV0); + if (!ASSERT_OK(err, "test_ping")) + goto done; + +done: + /* delete geneve tunnel */ + delete_geneve_tunnel(); + if (local_ip_map_fd >= 0) + close(local_ip_map_fd); + if (skel) + test_tunnel_kern__destroy(skel); +} + static void test_vxlan_tunnel(void) { struct test_tunnel_kern *skel = NULL; @@ -408,6 +515,7 @@ static void *test_tunnel_run_tests(void *arg) RUN_TEST(vxlan_tunnel); RUN_TEST(ip6vxlan_tunnel); + RUN_TEST(geneve_tunnel); cleanup(); diff --git a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c index 17f2f325b3f3..f724b1ce48d8 100644 --- a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c +++ b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c @@ -23,6 +23,8 @@ #define log_err(__ret) bpf_printk("ERROR line:%d ret:%d\n", __LINE__, __ret) +#define GENEVE_DYN_OPTS_SIZE 64 + struct geneve_opt { __be16 opt_class; __u8 type; @@ -285,6 +287,122 @@ int ip4ip6erspan_get_tunnel(struct __sk_buff *skb) return TC_ACT_OK; } +SEC("tc") +int geneve_set_tunnel_dst(struct __sk_buff *skb) +{ + int ret; + struct bpf_tunnel_key key; + __u8 opts[GENEVE_DYN_OPTS_SIZE]; + __u32 index = 0; + __u32 *local_ip = NULL; + int opts_len; + + local_ip = bpf_map_lookup_elem(&local_ip_map, &index); + if (!local_ip) { + log_err(ret); + return TC_ACT_SHOT; + } + + __builtin_memset(&key, 0x0, sizeof(key)); + key.local_ipv4 = 0xac100164; /* 172.16.1.100 */ + key.remote_ipv4 = *local_ip; + key.tunnel_id = 2; + key.tunnel_tos = 0; + key.tunnel_ttl = 64; + + ret = bpf_skb_set_tunnel_key(skb, &key, sizeof(key), + BPF_F_ZERO_CSUM_TX); + if (ret < 0) { + log_err(ret); + return TC_ACT_SHOT; + } + + __builtin_memset(opts, 0x0, sizeof(opts)); + /* dynamic number of empty geneve options (4 bytes each). + * total len capped at sizeof(opts) and is multiple of 4 + */ + opts_len = (skb->len % sizeof(opts)) & ~(sizeof(__u32) - 1); + ret = bpf_skb_set_var_tunnel_opt(skb, opts, sizeof(opts), opts_len); + if (ret < 0) { + log_err(ret); + return TC_ACT_SHOT; + } + + return TC_ACT_OK; +} + +SEC("tc") +int geneve_set_tunnel_src(struct __sk_buff *skb) +{ + int ret; + struct bpf_tunnel_key key; + __u32 index = 0; + __u32 *local_ip = NULL; + + local_ip = bpf_map_lookup_elem(&local_ip_map, &index); + if (!local_ip) { + log_err(ret); + return TC_ACT_SHOT; + } + + __builtin_memset(&key, 0x0, sizeof(key)); + key.local_ipv4 = *local_ip; + key.remote_ipv4 = 0xac100164; /* 172.16.1.100 */ + key.tunnel_id = 2; + key.tunnel_tos = 0; + key.tunnel_ttl = 64; + + ret = bpf_skb_set_tunnel_key(skb, &key, sizeof(key), + BPF_F_ZERO_CSUM_TX); + if (ret < 0) { + log_err(ret); + return TC_ACT_SHOT; + } + + return TC_ACT_OK; +} + +SEC("tc") +int geneve_get_tunnel_src(struct __sk_buff *skb) +{ + int ret; + struct bpf_tunnel_key key; + __u8 opts[GENEVE_DYN_OPTS_SIZE]; + int expected_opts_len; + __u32 index = 0; + __u32 *local_ip = NULL; + + local_ip = bpf_map_lookup_elem(&local_ip_map, &index); + if (!local_ip) { + log_err(ret); + return TC_ACT_SHOT; + } + + 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_tunnel_opt(skb, &opts, sizeof(opts)); + if (ret < 0) { + log_err(ret); + return TC_ACT_SHOT; + } + + expected_opts_len = (skb->len % sizeof(opts)) & ~(sizeof(__u32) - 1); + if (key.local_ipv4 != *local_ip || ret != expected_opts_len) { + bpf_printk("geneve key %d local ip 0x%x remote ip 0x%x opts_len %d\n", + key.tunnel_id, key.local_ipv4, + key.remote_ipv4, ret); + bpf_printk("local_ip 0x%x\n", *local_ip); + log_err(ret); + return TC_ACT_SHOT; + } + + return TC_ACT_OK; +} + SEC("tc") int vxlan_set_tunnel_dst(struct __sk_buff *skb) {