From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 7A4348013F for ; Mon, 31 Aug 2026 23:43:36 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 67VNgMER032028; Tue, 1 Sep 2026 02:42:22 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 67VNgMER032028 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="aOt880QJ" Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 67VNgKWR032004 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 1 Sep 2026 02:42:20 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 67VNgKWR032004 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-482f763db88so2148753f8f.2 for ; Mon, 31 Aug 2026 16:42:20 -0700 (PDT) X-Gm-Message-State: AFuF++lyktJiAT+hNRZ/NMLtzRD2a9oDRYf9mX6dtBoETrjAT9YpyNAN FSFChIk5kR/QWx9ATHY5SIQKsAgDpoxfTD0nw7Zxm0gPBgo4WWYYWdgHSZ/ID6s/CulnmLc1jRe NEpKyQtPxfLuGc0gN6pdoAsTEnXbzEjbxU7BNMA6ms6klwSX0ehM3Gg== X-Gm-Gg: AR+sD10+d4KISyzIdHPXFgmT0FIchQn4xox+Im6lRiT6m13EyLtu1aX11JsNOLghveM m27k0mCxSdLyux0I30WIuN5rbDQJkkFkvWo23eJAjT6Os3eD3SRo3x4IsjIQD5b2YqCKhg5rKHf 2d1j1b7GVE6ADAlYjmHuOTmDtDCgT3adsBAQa8rDJG77GN1c3XPdDU+qsxlrCo/ZGw4tR0j2Zsm j5bu7jGEHZKtJbsAJzzyxmJAdtrIh0WhtfIwZ3ScnUTJYI5Sbs6rQi0aQPP96594tTD2EvstfT0 Gvrkz2v/ZlXG/LcGVj/cX6SD9WVgnJITb5FDuWaIYUB65QqAIOb4lkhgwvreMCAFFhvCFHkA4DF 17lueTIPYWHqgZWllKmMSl+ST6g== X-Received: by 2002:a05:600c:1d8c:b0:499:4e47:eaf2 with SMTP id 5b1f17b1804b1-49cdc417b87mr82142515e9.6.1788219740234; Mon, 31 Aug 2026 16:42:20 -0700 (PDT) X-Received: by 2002:a05:600c:1d8c:b0:499:4e47:eaf2 with SMTP id 5b1f17b1804b1-49cdc417b87mr82142025e9.6.1788219739829; Mon, 31 Aug 2026 16:42:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1788219739; cv=none; d=google.com; s=arc-20260327; b=fMiOQAYAiL2A7u6GrGH+tzrsHeGycdo+GMWFF+GzTQEQ5D9IzeyLSMP/qL4i5WC9NJ dVK/CT/mhYXzSIANVpa26nTKfW9u9CCdCRR1ofrpofILH8xQBKpeR3R6sz1laR2QCi51 icBhZKxAz6hsX3ZOEUEsLh6z/rQhxT2aLGHUTGnwvWVKxHN2XvVDZnjoPNY8NUlYC2tO OvZLqE/Oe7bgdXNuKK6vyfudSa2D94AFmtIxmdf13lB9A5VqXFkXF2adY52D9x4KUSap 5VNqYYzC5IOrUfrnCnU6BGR/d2mfUDSQs84GW8+3EahjIDz8NNQIc0iUAJu+p+0qaeY+ /AxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=fAJkWHsZX9RCrDeRT4rKS7s6QD8tr/PtRb15Ba7Ypo0=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=ADXOpOojoztpTtrOEYR3y3isLhpxJQMwJrwRltsjMSNxA1MlBV3JWu6huABk9NqfBR 3sS3sp4r9U4o7RreOMJ2OroMB96JaEa/XzyZHBQr4TcNcc46TmjniHyajE++hJfwh9/O ahdFlBZCCMILn8Je9WIX9+22BzbNZbLxXeRY1GqdbAdGdNv+yaDssMSdEMrEJx0BJRCm pIr4PO+je5k5v1UVD96pc3h7N1VmI9j7wkPaVagx/8V0g16UCnEdEgKOLQwEwd+DYQGl XBkzRMAgOOKpPkT09y4Hr7wQbhnlsX/RVZKyX/x8loHkz5EL4Z0nA4yCBOsvT7f5NHMr j/zg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=aOt880QJ; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-48442d71d0bsi940326f8f.185.2026.08.31.16.42.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 16:42:19 -0700 (PDT) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=aOt880QJ; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=fAJkWHsZX9RCrDeRT4rKS7s6QD8tr/PtRb15Ba7Ypo0=; b=aOt880QJ9alZ /dUomjgpSWNjL8DqE0g6s6FfqduSsBFMhksNWQm61TehYz2UJUrSkvfICwoAex+ZvyIEPe+DcB1ob 7PANnMndq3OQTGHUvJpo471+oJEUPO3b+3OFH8oroDMqOeSL6gV4arpJgBbr9q73cxfaCwzfftkDn Ab2mAP02qbRQguqRneJyayuZPoL1O6gkqcc4phtiPUfyzRjdq9/aLO/F0nOLFoI2Ki0JCTJDep7MX 9nRsX3vEwUVmJuXnvelcwrKiKleYJjRIrWdxiImNkO4oy0ed1mQO2beAsjfYvrMhCcKd0HjGpBRcx wbaxw/LeGWcnp4JNbIp0Sw==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1x1BbU-00Alra-1w; Tue, 01 Sep 2026 01:42:10 +0200 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Tue, 1 Sep 2026 02:41:48 +0300 Message-ID: <20260831234217.1649428-1-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH vz10 v2 1/5] ms/selftests/bpf: Use local type for bpf_fou_encap in test_tunnel_kern X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org From: Gregory Bell Replace the forward-declared struct bpf_fou_encap with the existing bpf_fou_encap___local type in the bpf_skb_set_fou_encap and bpf_skb_get_fou_encap declarations. This removes the need for the forward declaration and the explicit casts at each call. Fixes: d17f9b370df6 ("selftests/bpf: Fix compilation failure when CONFIG_NET_FOU!=y") Signed-off-by: Gregory Bell Link: https://lore.kernel.org/r/20260417154122.2558890-3-grbell@redhat.com Signed-off-by: Alexei Starovoitov (cherry picked from commit afb0450be061907a0f5d36bd8b010ca30eda3d3b) https://virtuozzo.atlassian.net/browse/VSTOR-139677 Feature: fix selftests Signed-off-by: Eva Kurchatova --- .../testing/selftests/bpf/progs/test_tunnel_kern.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c index 32127f1cd687..30f1de458669 100644 --- a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c +++ b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c @@ -6,6 +6,7 @@ * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. */ +#define BPF_NO_KFUNC_PROTOTYPES #include "vmlinux.h" #include #include @@ -36,12 +37,10 @@ enum bpf_fou_encap_type___local { FOU_BPF_ENCAP_GUE___local, }; -struct bpf_fou_encap; - int bpf_skb_set_fou_encap(struct __sk_buff *skb_ctx, - struct bpf_fou_encap *encap, int type) __ksym; + struct bpf_fou_encap___local *encap, int type) __ksym; int bpf_skb_get_fou_encap(struct __sk_buff *skb_ctx, - struct bpf_fou_encap *encap) __ksym; + struct bpf_fou_encap___local *encap) __ksym; struct xfrm_state * bpf_xdp_get_xfrm_state(struct xdp_md *ctx, struct bpf_xfrm_state_opts *opts, u32 opts__sz) __ksym; @@ -781,7 +780,7 @@ int ipip_gue_set_tunnel(struct __sk_buff *skb) encap.sport = 0; encap.dport = bpf_htons(5555); - ret = bpf_skb_set_fou_encap(skb, (struct bpf_fou_encap *)&encap, + ret = bpf_skb_set_fou_encap(skb, &encap, bpf_core_enum_value(enum bpf_fou_encap_type___local, FOU_BPF_ENCAP_GUE___local)); if (ret < 0) { @@ -820,7 +819,7 @@ int ipip_fou_set_tunnel(struct __sk_buff *skb) encap.sport = 0; encap.dport = bpf_htons(5555); - ret = bpf_skb_set_fou_encap(skb, (struct bpf_fou_encap *)&encap, + ret = bpf_skb_set_fou_encap(skb, &encap, FOU_BPF_ENCAP_FOU___local); if (ret < 0) { log_err(ret); @@ -843,7 +842,7 @@ int ipip_encap_get_tunnel(struct __sk_buff *skb) return TC_ACT_SHOT; } - ret = bpf_skb_get_fou_encap(skb, (struct bpf_fou_encap *)&encap); + ret = bpf_skb_get_fou_encap(skb, &encap); if (ret < 0) { log_err(ret); return TC_ACT_SHOT; -- 2.55.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel