From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 476691B79F; Fri, 03 Oct 2025 17:15:28 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id B24E91B796; Fri, 03 Oct 2025 17:15:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-yw1-x1135.google.com (mail-yw1-x1135.google.com [IPv6:2607:f8b0:4864:20::1135]) by atuin.qyliss.net (Postfix) with ESMTPS id 5256C1B790 for ; Fri, 03 Oct 2025 17:15:25 +0000 (UTC) Received: by mail-yw1-x1135.google.com with SMTP id 00721157ae682-71d60110772so26329137b3.0 for ; Fri, 03 Oct 2025 10:15:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759511723; x=1760116523; darn=spectrum-os.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=P3xAJfKbWV86HO1/gxvNRMLoSYwIZmepbJP1gLg2ccg=; b=PLQRM1aWPINOaoJqMDinBn/mkEsi+b7HD4FH2uwiNhbesbqmfnbsya4jDeefYS8+q6 31BFOjdtmv2fcb4IY3p6jVIhwz2CVrfpB20NUuUIP/ws5qGzkO8nqpH8Nadgwd57Sj3B uA5GT6OKZjX74ucPY6QZ/0n6ge7N4GO7b8fD53Z+zhJNK042VS0axkwYNSQv6U3VmURw fPVkEFpm3KlVXHMOQg8kWYKjgY9l6BQUVvYhdPk11Bj55x9gG2Xzz7276nn5rIVvb24F 6MVLEZMcJrexPWsIsDvkL4HN0ds2lVgtolxuw6S5J865QZ82diyh2s9v2XtRr/To7Flw zXnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759511723; x=1760116523; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=P3xAJfKbWV86HO1/gxvNRMLoSYwIZmepbJP1gLg2ccg=; b=jyw61WbHMdsnki2PViEChPAvcLV9NTNBs/4lJFX1UtIlZ0CkMCr6lDZWSle3FZcSeM 2jI7FpygWmRc338qZpvbd6v4L/hscqUWp9YhhnWtZnS/Zc9iirp3pIHq4V8lYQDyBQea bXLrUM6FSiA6FRLvOF5H9Dp+Mfk2YrbywifZwv7hfpYpfzrR+RN0n411KGrA3Fb8hDjZ JncNsBS4LG7WkhHiHR/y1mCYU/yw656NRieMl8qfujaAAQnKl5IekVkAy3WGWB10LW9E PWDwV0lLpyzVM/HZk+ymtsmVRnFCR54+FAk5QAYhZpmEHRDVrvF9UElv6KwPP1LZPHZC IEbA== X-Gm-Message-State: AOJu0YxCfAY9+2SQmf+vD6La6mGDxNvFPLIZDgu7CBQ8jx0yyrGXvXKy fZwd/o/fJbDC0Bzrwn5Su3muxYBIuxC+pBkvRFw8aAlpGI1rRtzJiMH72eI1UMma X-Gm-Gg: ASbGncvi3CqKoOwrwNOW1dO4ZC667sqvPMImcdp9+YgylKN+Nwc7UEeSBMRgZh3uJZB wYG/ZduHPbNvSTN22py7kH3uO7YyZTYvJsS4y3JvLScLPzNXeXTPz0vL0u7742v4go4B9ZcBO76 rouSkScvbvcFIXezeJF0CSWvOpG5jhWnOvIHyJdVx1AVklukrTqBa1rLReaSVUrgIRRVcMkYSr1 YW/bHBDNS3WUks25JqmgevqmmqAm2WXJbTi1/qI9xwy+2gDy++AkXJjDLCrpwQKBTx9/1o4jXhK ZtMvbQeOuINjg+TpYsAfuAKYB2q95167Lpe0BsYtStxdASFzqOUhI+wNP5hg3NFIksvTtzoWcDO WJECYMd9zYEVKEsGo/9jRiRmx1DIFfBPeMb8jSSjbKRZHtO2M5CwNgZra8e3ykBNOfEc8sDfMVe MC6IcoqM6jSJcyMbkaLCpu38f90mhfphgLg0kkyrT7EiVeS4CXfnwKxDxCpplq0OtJ13Y= X-Google-Smtp-Source: AGHT+IHaDm+/YEYjC9dSwa0zUurmKd0ajGU8+VMIVwxHBT/boC06E7BOSQSFgSfOt87txwucUUW/7Q== X-Received: by 2002:a05:690c:7403:b0:739:7377:fdcf with SMTP id 00721157ae682-77f946d9ca3mr56911257b3.27.1759511723099; Fri, 03 Oct 2025 10:15:23 -0700 (PDT) Received: from localhost.localdomain (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with UTF8SMTPSA id 956f58d0204a3-63b846a6a60sm1866778d50.23.2025.10.03.10.15.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Oct 2025 10:15:22 -0700 (PDT) From: Demi Marie Obenour Date: Fri, 03 Oct 2025 13:14:45 -0400 Subject: [PATCH] tools/xdp-forwarder: Fix build MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251003-fix-forwarder-build-v1-1-856b78ae5656@gmail.com> X-B4-Tracking: v=1; b=H4sIAIQE4GgC/x2MWwqAIBAArxL73YIagXaV6MN0q4WwWOkB0d2TP gdm5oFMwpShqx4QOjnzlgrouoKw+DQTciwMRplWK9XgxDdOm1xeIgmOB68RjbWOvPMUnIZS7kJ F+6/98L4fqq8wtGUAAAA= X-Change-ID: 20251003-fix-forwarder-build-2889ea9aec91 To: Spectrum OS Development X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759511684; l=2713; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=rJIL9ByCpF2CmQb+s7zDz5dP7aX3my984+22njotu30=; b=iDO3P9JqBlkXma/Ubo15895TgsMQXI5fvIw5SDQko5fETnGzglRSFjD6s7Tytqj0rInnGC3em nvWGjoET2FKCPsg5kI/z+CCbSPlL6dHcokQ2xHYZ6tJdVdkNQfotm+L X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: RS4USXZQWOLMWJ7TYA37JOBPJAAZCUVU X-Message-ID-Hash: RS4USXZQWOLMWJ7TYA37JOBPJAAZCUVU X-MailFrom: demiobenour@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Alyssa Ross , Demi Marie Obenour X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Clang complains that it can't fine gnu-stubs32.h. Drop the ICMP parsing code to avoid this error. No functional change as the code is not actually used. Signed-off-by: Demi Marie Obenour --- tools/xdp-forwarder/parsing_helpers.h | 57 ----------------------------------- 1 file changed, 57 deletions(-) diff --git a/tools/xdp-forwarder/parsing_helpers.h b/tools/xdp-forwarder/parsing_helpers.h index da099346008bd58485af8308feb4d3391ceef8f5..1ea822100fdb9a75c2d28d34d93e6bb2b5d3ae26 100644 --- a/tools/xdp-forwarder/parsing_helpers.h +++ b/tools/xdp-forwarder/parsing_helpers.h @@ -26,8 +26,6 @@ #include #include #include -#include -#include #include #include @@ -46,16 +44,6 @@ struct vlan_hdr { __be16 h_vlan_encapsulated_proto; }; -/* - * Struct icmphdr_common represents the common part of the icmphdr and icmp6hdr - * structures. - */ -struct icmphdr_common { - __u8 type; - __u8 code; - __sum16 cksum; -}; - /* Allow users of header file to redefine VLAN max depth */ #ifndef VLAN_MAX_DEPTH #define VLAN_MAX_DEPTH 2 @@ -175,51 +163,6 @@ static __always_inline int parse_iphdr(struct hdr_cursor *nh, return iph->protocol; } -static __always_inline int parse_icmp6hdr(struct hdr_cursor *nh, - void *data_end, - struct icmp6hdr **icmp6hdr) -{ - struct icmp6hdr *icmp6h = nh->pos; - - if (icmp6h + 1 > data_end) - return -1; - - nh->pos = icmp6h + 1; - *icmp6hdr = icmp6h; - - return icmp6h->icmp6_type; -} - -static __always_inline int parse_icmphdr(struct hdr_cursor *nh, - void *data_end, - struct icmphdr **icmphdr) -{ - struct icmphdr *icmph = nh->pos; - - if (icmph + 1 > data_end) - return -1; - - nh->pos = icmph + 1; - *icmphdr = icmph; - - return icmph->type; -} - -static __always_inline int parse_icmphdr_common(struct hdr_cursor *nh, - void *data_end, - struct icmphdr_common **icmphdr) -{ - struct icmphdr_common *h = nh->pos; - - if (h + 1 > data_end) - return -1; - - nh->pos = h + 1; - *icmphdr = h; - - return h->type; -} - /* * parse_udphdr: parse the udp header and return the length of the udp payload */ --- base-commit: c5d5786d3dc938af0b279c542d1e43bce381b4b9 change-id: 20251003-fix-forwarder-build-2889ea9aec91 -- Sincerely, Demi Marie Obenour (she/her/hers)