From patchwork Wed Aug 24 04:41:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 12952901 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 F22B0C32793 for ; Wed, 24 Aug 2022 04:41:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234421AbiHXEle (ORCPT ); Wed, 24 Aug 2022 00:41:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234682AbiHXEld (ORCPT ); Wed, 24 Aug 2022 00:41:33 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF04A8D3E4 for ; Tue, 23 Aug 2022 21:41:30 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id bq11so12712118wrb.12 for ; Tue, 23 Aug 2022 21:41:30 -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=MkzqQL0WPvxh3UGJC6duQh0T4DlbEBaV/R9lCTytzv4=; b=KSHEyUs63M9L6Nukzf+V6xuzqazkFFrrs0s0RFwjB1dnEeSEeFPVrKUzx4kEosTBRi kAXuzExELL5oP8MceFFEhB8YrDqBiJ6OYCp1HjkyQ+QKBUCBQKb49p/d3Q3xP3Y+DwlE sUTwkiaT0Cpy8GtdF3qCKia+caEQrGhAmGe2g= 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=MkzqQL0WPvxh3UGJC6duQh0T4DlbEBaV/R9lCTytzv4=; b=Ccww+dlBv/01BSIcOPclbBBkwHeDXf2MJowKEe8/ijBqDsLuboE8CDwDogySxtmrrU wYaJBXU26GnudbuAbHToS4sknOHM9SbXtq3sRPzNcy/aZVZ0UsBY6FB+jKoqCkhR+aA8 XC+ApU8QQSE5lr+l8SMS48Q4XSupKhA7+LjBhxdfGoHuQ6xzwPf0EwhZCWQMYt9j57uq G+jSzj7Oh73EDMV3zvJfvjRY4jZhuhi3dfFaGUs3kKJHiVz+634i52TNj1szOiFvk8DM NKEK1G1ZIMOSlqd8VuXstY7yv95THgmIMxTJCehvVx18hI0YRJH2JdudMH3YhVsFv61w Ml+Q== X-Gm-Message-State: ACgBeo2rVKJwnbbhVMPxLQCHbeMRHii9E8HFAHAC8SAzMHYi7WsiuMJV xJChA8Scn90JLxkvaWDBNK0DfphC5Izxw3Df/SdbSsqbmMRQAND0pMrZXFZGSi7bgq9DnbL1ix1 xxGvdUOCJulIK95yrfA9+7Nq2jMUajqVh+n+klZ/HCN0unrTJ1bpWOCogazs8iqDqckKC2f6X X-Google-Smtp-Source: AA6agR5EJ58ZII4qZc3n3gksD5kC4MjtwZ/bAgB6QUmDW/PNhJx59qTJ4DVb5FtwlIlxbkRwMS09wg== X-Received: by 2002:a05:6000:1541:b0:222:cf65:18d7 with SMTP id 1-20020a056000154100b00222cf6518d7mr14663044wry.659.1661316088951; Tue, 23 Aug 2022 21:41:28 -0700 (PDT) Received: from blondie.home ([94.230.83.151]) by smtp.gmail.com with ESMTPSA id m9-20020adfe0c9000000b00225206dd595sm15572735wri.86.2022.08.23.21.41.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 21:41:28 -0700 (PDT) From: Shmulik Ladkani X-Google-Original-From: Shmulik Ladkani To: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , John Fastabend , Joanne Koong Cc: Andrii Nakryiko , Paul Chaignon , Shmulik Ladkani Subject: [PATCH v5 bpf-next 1/4] bpf: Add 'bpf_dynptr_get_data' helper Date: Wed, 24 Aug 2022 07:41:14 +0300 Message-Id: <20220824044117.137658-2-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220824044117.137658-1-shmulik.ladkani@gmail.com> References: <20220824044117.137658-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 The task of calculating bpf_dynptr_kern's available size, and the current (offset) data pointer is common for BPF functions working with ARG_PTR_TO_DYNPTR parameters. Introduce 'bpf_dynptr_get_data' which returns the current data (with properer offset), and the number of usable bytes it has. This will void callers from directly calculating bpf_dynptr_kern's data, offset and size. Signed-off-by: Shmulik Ladkani --- v5: - fix bpf_dynptr_get_data's incorrect usage of bpf_dynptr_kern's size spotted by Joanne Koong --- include/linux/bpf.h | 1 + kernel/bpf/helpers.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 99fc7a64564f..d84d37bda87f 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -2577,6 +2577,7 @@ void bpf_dynptr_init(struct bpf_dynptr_kern *ptr, void *data, enum bpf_dynptr_type type, u32 offset, u32 size); void bpf_dynptr_set_null(struct bpf_dynptr_kern *ptr); int bpf_dynptr_check_size(u32 size); +void *bpf_dynptr_get_data(struct bpf_dynptr_kern *ptr, u32 *avail_bytes); #ifdef CONFIG_BPF_LSM void bpf_cgroup_atype_get(u32 attach_btf_id, int cgroup_atype); diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index fc08035f14ed..96ff93941cae 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -1427,6 +1427,14 @@ void bpf_dynptr_init(struct bpf_dynptr_kern *ptr, void *data, bpf_dynptr_set_type(ptr, type); } +void *bpf_dynptr_get_data(struct bpf_dynptr_kern *ptr, u32 *avail_bytes) +{ + if (!ptr->data) + return NULL; + *avail_bytes = bpf_dynptr_get_size(ptr); + return ptr->data + ptr->offset; +} + void bpf_dynptr_set_null(struct bpf_dynptr_kern *ptr) { memset(ptr, 0, sizeof(*ptr)); From patchwork Wed Aug 24 04:41:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 12952902 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 C38C0C00140 for ; Wed, 24 Aug 2022 04:41:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234677AbiHXElf (ORCPT ); Wed, 24 Aug 2022 00:41:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234355AbiHXEld (ORCPT ); Wed, 24 Aug 2022 00:41:33 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 353B08C461 for ; Tue, 23 Aug 2022 21:41:32 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id z16so484800wrh.10 for ; Tue, 23 Aug 2022 21:41:32 -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=W825PLkD6tqlv7oJQm9o6RpZLdaeGEnTuZlblGJf40I=; b=GZbIfr62Cyve9O7jAU0IS1veKMgJg6YXmKcNK8SzczOKLK1lBlu4VZrfSUV8MRDLcf r+PZbqzQdDw0gKMXlz+LE8kGbdIQ6CIzDLJv8l3eUlCMxWgKAJEUWiiFvXO6FsPzKC4d i8e3f8uYbCIVAjPBjp+fQBkDL8oPEIAOI+vSk= 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=W825PLkD6tqlv7oJQm9o6RpZLdaeGEnTuZlblGJf40I=; b=zgga5Vj/Te1EblPJBjCIlKagmDGcBzOtYqAZIfJUMk+AaorMdEnFr8LWOpsoUi7W1s 8BGhDrvHMzGbldTm+gXQR4cHmsU0un9R1eFUgD1fkdBwBzUp+6qP3tSC3W253IeY08pS HH+BNQdMQmNjV8j3mCrMZdxtrii/T2AbWqskFTgrqed77t9PPc60IbGlOwrF5vbbudfq 7s/7JBaOKctymrZDdh5IRViaLWA8MPPBDaeJPnbSVVUbuNYWMwRLgDNX13OMLvC4dY5V PeoRrNbUGIW247ILjOk7SVB9GM7yxwaM0BwgHz1qUeSbXMnjDvk91H803ehttnIFHJH1 ZEMA== X-Gm-Message-State: ACgBeo2XWM/AEokoZe0ypc5Mxotxi0jTzMdkHtO3MRUOz1wUVqLM6o+k E5mic4jge11YZ2PBURvuTBY52qVRT2a7XKlGO9K3Z+n5ymxYSfIMlMbwgbvEuYs8D3myfRTKc3C iHvqmYBye+BhHNqZ78Y+9HATt06D+xSKI9tiHKaeIVEKvefxXpovinRv/KWRDhgli+gg4bVmg X-Google-Smtp-Source: AA6agR69CAfqnooKRuYJy9+wFPms6D8v4ObTTyyZbV1fCuStdg/JNUtCr3k+gLCio5giPwQSKd30Wg== X-Received: by 2002:a5d:6d04:0:b0:225:5a6e:7607 with SMTP id e4-20020a5d6d04000000b002255a6e7607mr6850983wrq.336.1661316090331; Tue, 23 Aug 2022 21:41:30 -0700 (PDT) Received: from blondie.home ([94.230.83.151]) by smtp.gmail.com with ESMTPSA id m9-20020adfe0c9000000b00225206dd595sm15572735wri.86.2022.08.23.21.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 21:41:29 -0700 (PDT) From: Shmulik Ladkani X-Google-Original-From: Shmulik Ladkani To: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , John Fastabend , Joanne Koong Cc: Andrii Nakryiko , Paul Chaignon , Shmulik Ladkani Subject: [PATCH v5 bpf-next 2/4] bpf: Support setting variable-length tunnel options Date: Wed, 24 Aug 2022 07:41:15 +0300 Message-Id: <20220824044117.137658-3-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220824044117.137658-1-shmulik.ladkani@gmail.com> References: <20220824044117.137658-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) 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 imposssible without knowing sender's exact geneve options length, which unfortunately is dymamic. Introduce 'bpf_skb_set_tunnel_opt_dynptr'. This is a variant of 'bpf_skb_set_tunnel_opt' which gets a bpf dynamic pointer (ARG_PTR_TO_DYNPTR) parameter 'ptr' whose data points to the options buffer, and 'len', the byte length of options data caller wishes to copy into ip_tunnnel_info. 'len' must never exceed the dynptr's internal size, o/w EINVAL is returned. Signed-off-by: Shmulik Ladkani --- v3: Avoid 'inline' for the __bpf_skb_set_tunopt helper function v4: change API to be based on bpf_dynptr, suggested by John Fastabend --- include/uapi/linux/bpf.h | 12 ++++++++++++ net/core/filter.c | 36 ++++++++++++++++++++++++++++++++-- tools/include/uapi/linux/bpf.h | 12 ++++++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 644600dbb114..c7b313e30635 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -5367,6 +5367,17 @@ union bpf_attr { * Return * Current *ktime*. * + * long bpf_skb_set_tunnel_opt_dynptr(struct sk_buff *skb, struct bpf_dynptr *opt, u32 len) + * Description + * Set tunnel options metadata for the packet associated to *skb* + * to the variable length *len* bytes of option data pointed to + * by the *opt* dynptr. + * + * 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), \ @@ -5578,6 +5589,7 @@ union bpf_attr { FN(tcp_raw_check_syncookie_ipv4), \ FN(tcp_raw_check_syncookie_ipv6), \ FN(ktime_get_tai_ns), \ + FN(skb_set_tunnel_opt_dynptr), \ /* */ /* 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 63e25d8ce501..1407c87ba6ac 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4669,8 +4669,7 @@ 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 u64 __bpf_skb_set_tunopt(struct sk_buff *skb, const u8 *from, u32 size) { struct ip_tunnel_info *info = skb_tunnel_info(skb); const struct metadata_dst *md = this_cpu_ptr(md_dst); @@ -4685,6 +4684,26 @@ BPF_CALL_3(bpf_skb_set_tunnel_opt, struct sk_buff *, skb, 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); +} + +BPF_CALL_3(bpf_skb_set_tunnel_opt_dynptr, struct sk_buff *, skb, + struct bpf_dynptr_kern *, ptr, u32, len) +{ + const u8 *from; + u32 avail; + + from = bpf_dynptr_get_data(ptr, &avail); + if (unlikely(!from)) + return -EFAULT; + if (unlikely(len > avail)) + return -EINVAL; + return __bpf_skb_set_tunopt(skb, from, len); +} + static const struct bpf_func_proto bpf_skb_set_tunnel_opt_proto = { .func = bpf_skb_set_tunnel_opt, .gpl_only = false, @@ -4694,6 +4713,15 @@ 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_tunnel_opt_dynptr_proto = { + .func = bpf_skb_set_tunnel_opt_dynptr, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_CTX, + .arg2_type = ARG_PTR_TO_DYNPTR | DYNPTR_TYPE_LOCAL, + .arg3_type = ARG_ANYTHING, +}; + static const struct bpf_func_proto * bpf_get_skb_set_tunnel_proto(enum bpf_func_id which) { @@ -4714,6 +4742,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_tunnel_opt_dynptr: + return &bpf_skb_set_tunnel_opt_dynptr_proto; default: return NULL; } @@ -7808,6 +7838,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_tunnel_opt_dynptr: return bpf_get_skb_set_tunnel_proto(func_id); case BPF_FUNC_redirect: return &bpf_redirect_proto; @@ -8155,6 +8186,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_tunnel_opt_dynptr: 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 4fb685591035..6a032a8a5fef 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -5367,6 +5367,17 @@ union bpf_attr { * Return * Current *ktime*. * + * long bpf_skb_set_tunnel_opt_dynptr(struct sk_buff *skb, struct bpf_dynptr *opt, u32 len) + * Description + * Set tunnel options metadata for the packet associated to *skb* + * to the variable length *len* bytes of option data pointed to + * by the *opt* dynptr. + * + * 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), \ @@ -5578,6 +5589,7 @@ union bpf_attr { FN(tcp_raw_check_syncookie_ipv4), \ FN(tcp_raw_check_syncookie_ipv6), \ FN(ktime_get_tai_ns), \ + FN(skb_set_tunnel_opt_dynptr), \ /* */ /* integer value in 'imm' field of BPF_CALL instruction selects which helper From patchwork Wed Aug 24 04:41:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 12952903 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 DBCBCC38145 for ; Wed, 24 Aug 2022 04:41:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234479AbiHXElg (ORCPT ); Wed, 24 Aug 2022 00:41:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234533AbiHXEle (ORCPT ); Wed, 24 Aug 2022 00:41:34 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94B5A8C456 for ; Tue, 23 Aug 2022 21:41:33 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id d5so8160033wms.5 for ; Tue, 23 Aug 2022 21:41:33 -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=Yjuebj+YhyDRyRFpl3rlNEoWoSGqxs6V/h0zoDuNJtJn+hJeUT0+20dBhHeYBK5+Y+ t+9RCDiBtiOrP+BP7t98k16rYnyhYP2a8Cei+UY6Zy85L84AGL8Fi5xcK0i0DERZEA44 bdf4yJbYccbsbX33JxEuCs4Xr1UtMqxn5Etk8= 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=TmJg5YKMjnGVexZNC/xu/NXrtBjL7TaKzt5x73j7a0MVTpFoo6f8gteb8gbpTvXb6J dUb+bFTt4X3bNrIdheAa64Zf7gbUGsZ8VlqbxZ96+Zf+H0DQ6RNBeHHx1GyNzo4EKikQ 5iJbOvbyP7Z0wYPLdn2+0xsNA5sMwhng078ZHkO3xmGiSXjRQA/ivg+LT5qCjgBfodLb vuTtWW1sU+/ZrZv8kp4rmDcsEZaqr2hwPE0t6XtoP4ZCSCM41wVX24gGaNA5QiYeRXiA dPpB9TyMWWL3djTVitlEMAKJM3xRnSzP/+vS0M8x2kz2Q+5DWknr5OHsfzLQmvcpEZ5Z 737Q== X-Gm-Message-State: ACgBeo33qKxt94DXK7WwI0DCTlUgW+xezD73QAkh2bGIRTj+A9qr/QIK gtttWe7iBLLho3vJHgo7tugZauLB9/bzW5Ac9NlZkgQXTY6fk291LYm5LojpB/2VrhI1GvIw5ha GoxbLdn0j+OiRL1bG6z33yasqD95EXKSVh6v1zytcwb6Tw2bRm0bWu6GbavPJ5UkG2zWEtLJT X-Google-Smtp-Source: AA6agR5KEwo2goWQhkJi4bf1SjIDfZRrgsN4uGc5S0n1oVsDZzi/5rGc8ouNUtz51192LDzaxbNK2g== X-Received: by 2002:a05:600c:3b16:b0:3a6:169:d7f8 with SMTP id m22-20020a05600c3b1600b003a60169d7f8mr3924332wms.129.1661316091773; Tue, 23 Aug 2022 21:41:31 -0700 (PDT) Received: from blondie.home ([94.230.83.151]) by smtp.gmail.com with ESMTPSA id m9-20020adfe0c9000000b00225206dd595sm15572735wri.86.2022.08.23.21.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 21:41:31 -0700 (PDT) From: Shmulik Ladkani X-Google-Original-From: Shmulik Ladkani To: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , John Fastabend , Joanne Koong Cc: Andrii Nakryiko , Paul Chaignon , Shmulik Ladkani Subject: [PATCH v5 bpf-next 3/4] selftests/bpf: Simplify test_tunnel setup for allowing non-local tunnel traffic Date: Wed, 24 Aug 2022 07:41:16 +0300 Message-Id: <20220824044117.137658-4-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220824044117.137658-1-shmulik.ladkani@gmail.com> References: <20220824044117.137658-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 Wed Aug 24 04:41:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 12952904 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 03B39C32792 for ; Wed, 24 Aug 2022 04:41:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234428AbiHXEli (ORCPT ); Wed, 24 Aug 2022 00:41:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234712AbiHXElg (ORCPT ); Wed, 24 Aug 2022 00:41:36 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4396F8768F for ; Tue, 23 Aug 2022 21:41:35 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id n7so19284092wrv.4 for ; Tue, 23 Aug 2022 21:41:35 -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=7ZvfwZAo6SHSwMY3FBdyxyLJs+X0ltDO9TRbREQ4XUM=; b=BRBHIjzeAPEc83lDSgk/FjcJln9xMGGQkFTXdiqveNQsCb6p/oD67mAGnDXuUWumcT dpngKCm9dCqKkJOFX4ohPXJ9ktDukhOYH7w4F6zR7cucJYwU/6oZUXwEKPlIayCy5kMO gfU9AYNIF+NcYzJlLN1H5wJ0mpqn1xSxcxyWo= 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=7ZvfwZAo6SHSwMY3FBdyxyLJs+X0ltDO9TRbREQ4XUM=; b=2cGT4RNdwSZI8aDUWJFurndCqeffO0A5OjCYJrkBlFFgPviyj0x/cras22sHrWC8ts FQf8ma4Xq6iOXowAhUHLkPJCloZ5tnm/n0Ber8tDwzIuByrCLVIwtCylLUgEVcfkKVP1 IITSyElSADK51xcdrcz/bDfhs35B5zdDJPawIkGsBp7b0DN/FU7OfdVthcTZkfAzWpBy dfUhGWUUM6D/1Q4lORWt0aLdHepfrFCQJ6cgoKfdEbh5bx4B8bOtJkovwbmMwCOVrF4K Xry0+OoumjOmBXOlO44NGZROWlzHGWkvxm4o9gWKmBiunnwnfKEPI92dofL1rPlMvv9j 4sFQ== X-Gm-Message-State: ACgBeo1kcnX/Q6mbRW1E0mvgxPAuJL2MEv60uICil5i9qekaXgljr/2t d/s9cp62s3dXZukhr/nJ+CRsl/i5t41SN36y5ok/8mleC6CIeBVLfnQifyhJ6I78g9eH++W/B7k 9C+fZ6qIXfLVeCLUfpxzT/9JK/mWNDI9KrXdmUuBpQFQ3+CFYCE5ADiGTZX5Mfzkb+/Lp59r+ X-Google-Smtp-Source: AA6agR6d4peiaopOmWvL6evO9LZ26VjwFp49JWmh90dtBpi4Y7HdkYz7OxOItqYMAHIxc4oN5kHFTw== X-Received: by 2002:a5d:4d8f:0:b0:225:589f:6079 with SMTP id b15-20020a5d4d8f000000b00225589f6079mr7183629wru.495.1661316093236; Tue, 23 Aug 2022 21:41:33 -0700 (PDT) Received: from blondie.home ([94.230.83.151]) by smtp.gmail.com with ESMTPSA id m9-20020adfe0c9000000b00225206dd595sm15572735wri.86.2022.08.23.21.41.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 21:41:32 -0700 (PDT) From: Shmulik Ladkani X-Google-Original-From: Shmulik Ladkani To: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , John Fastabend , Joanne Koong Cc: Andrii Nakryiko , Paul Chaignon , Shmulik Ladkani Subject: [PATCH v5 bpf-next 4/4] selftests/bpf: Add geneve with bpf_skb_set_tunnel_opt_dynptr test-case to test_progs Date: Wed, 24 Aug 2022 07:41:17 +0300 Message-Id: <20220824044117.137658-5-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220824044117.137658-1-shmulik.ladkani@gmail.com> References: <20220824044117.137658-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_tunnel_opt_dynptr. Signed-off-by: Shmulik Ladkani --- .../selftests/bpf/prog_tests/test_tunnel.c | 108 ++++++++++++++ .../selftests/bpf/progs/test_tunnel_kern.c | 136 ++++++++++++++++++ 2 files changed, 244 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..dfd274d2f65d 100644 --- a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c +++ b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c @@ -23,6 +23,17 @@ #define log_err(__ret) bpf_printk("ERROR line:%d ret:%d\n", __LINE__, __ret) +struct tun_opts_raw { + __u8 data[64]; +}; + +struct { + __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY); + __uint(max_entries, 1); + __type(key, __u32); + __type(value, struct tun_opts_raw); +} geneve_opts SEC(".maps"); + struct geneve_opt { __be16 opt_class; __u8 type; @@ -285,6 +296,131 @@ 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; + struct tun_opts_raw *opts; + struct bpf_dynptr dptr; + __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(-1); + return TC_ACT_SHOT; + } + + index = 0; + opts = bpf_map_lookup_elem(&geneve_opts, &index); + if (!opts) { + log_err(-1); + 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)); + bpf_dynptr_from_mem(opts, sizeof(*opts), 0, &dptr); + /* 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_tunnel_opt_dynptr(skb, &dptr, 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; + struct tun_opts_raw opts; + 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) {