From patchwork Wed Dec 21 05:58:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 13078461 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 C81C4C10F1B for ; Wed, 21 Dec 2022 05:59:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229889AbiLUF71 (ORCPT ); Wed, 21 Dec 2022 00:59:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229448AbiLUF70 (ORCPT ); Wed, 21 Dec 2022 00:59:26 -0500 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7728E79; Tue, 20 Dec 2022 21:59:25 -0800 (PST) Received: by mail-il1-x134.google.com with SMTP id y3so7477676ilq.0; Tue, 20 Dec 2022 21:59:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+NTAcqyZi4W+uNvx0HYCH7K/UWAkMHmtbGpytiWnrUo=; b=mcfDIPPmOH7rWQnM/v7aWKAHCv1U9AFPS5zUZ8YXKmag/b8GKqwNKNC/yy5NJhjL+z uzR4TewO2g8iUvMc3pfULNoMkr8qk6OYIBnK3AseWiqf2ob2vUm0bsGrnCHMfAhgHxOq qm6B48yUax7tBSEYK43LwIxlEc0LmcykT9MswAZC3H7Y0z0lOqWzDQLi5Fti4JZ8Vrp6 IsNiN23KZ+8Cy5XuaI3vGzi+7NpvfnhSS/Xz/478DwfEBBUiTgDu5qzfiDDzinnTin6Z yiKfOMdGjMMORM+999yLlTPapp2KHTgg27WxAjBWhkcSTLoNtgATpVrONS3r+drdib1a gIuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+NTAcqyZi4W+uNvx0HYCH7K/UWAkMHmtbGpytiWnrUo=; b=AxeD/qKzIvdTPtFYVf7oExfaUxLh7ObV2+x6ks60HZmAHzKRsLlUFbsZtqKZ7etdF8 gm7m0/MHgKHyir7yJHCdCdJrcLtobWDYHgrsQ0/EmYLA0V1PCxEH7CyZwa4eW/rQiTf/ JTF5tMBnl/c8MW+aMbubmaYTSz6lYqNARWloFK4Hofmt4gxqrGUcZEbkge75+Tx5SkNh mBdKHHpUbAlPYylaBoQxdtaUP3tvn3WZ69cKDqnY1hepxbwS+GTDi8FfWtQkh22mvdlW GTOBkpg6Eqw2DHiX/t0dQ583hzY9Kj1q9iO65OvNwa0n91vTbxtrRgF/7YDL1mAFsc/q p5Jw== X-Gm-Message-State: AFqh2kqoifJ7yAjOToYZAkOpx6C5gNard4dbCNZPSZ9FiiCfs6dpQZqR 2SU9tUJd/yo1M+fdqybx5WPKn+ICL9D4Lphj X-Google-Smtp-Source: AMrXdXtBCBTWGUjxKkQYB6+2tmxDLbf/zN22r8j0Rz9PtPcXywOIqLZzy2hPRCdemJ3ZZJZncyzOAw== X-Received: by 2002:a92:ce07:0:b0:300:1cc8:7ec7 with SMTP id b7-20020a92ce07000000b003001cc87ec7mr577234ilo.12.1671602365053; Tue, 20 Dec 2022 21:59:25 -0800 (PST) Received: from james-x399.localdomain (71-33-132-231.hlrn.qwest.net. [71.33.132.231]) by smtp.gmail.com with ESMTPSA id b3-20020a029583000000b003748d3552e1sm5282647jai.154.2022.12.20.21.59.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 21:59:24 -0800 (PST) From: James Hilliard To: bpf@vger.kernel.org Cc: James Hilliard , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , Nathan Chancellor , Nick Desaulniers , Tom Rix , Eduard Zingerman , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH bpf-next] selftests/bpf: move struct definitions out of function params Date: Tue, 20 Dec 2022 22:58:48 -0700 Message-Id: <20221221055856.2786043-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Anonymous structs can't be declared inside function parameter definitions in current c standards, however clang doesn't detect this condition currently while GCC does. Details: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108189 Fixes errors like: progs/btf_dump_test_case_bitfields.c:85:7: error: anonymous struct declared inside parameter list will not be visible outside of this definition or declaration [-Werror] 85 | int f(struct { | ^~~~~~ Signed-off-by: James Hilliard Acked-by: Stanislav Fomichev --- .../bpf/progs/btf_dump_test_case_bitfields.c | 9 ++++-- .../progs/btf_dump_test_case_namespacing.c | 10 ++++--- .../bpf/progs/btf_dump_test_case_packing.c | 10 ++++--- .../bpf/progs/btf_dump_test_case_padding.c | 10 ++++--- .../bpf/progs/btf_dump_test_case_syntax.c | 30 +++++++++++++------ 5 files changed, 46 insertions(+), 23 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/btf_dump_test_case_bitfields.c b/tools/testing/selftests/bpf/progs/btf_dump_test_case_bitfields.c index e01690618e1e..c75f6bd06a49 100644 --- a/tools/testing/selftests/bpf/progs/btf_dump_test_case_bitfields.c +++ b/tools/testing/selftests/bpf/progs/btf_dump_test_case_bitfields.c @@ -82,11 +82,16 @@ struct bitfield_flushed { long b: 16; }; -int f(struct { +/* ----- START-EXPECTED-OUTPUT ----- */ +struct root_struct { struct bitfields_only_mixed_types _1; struct bitfield_mixed_with_others _2; struct bitfield_flushed _3; -} *_) +}; + +/* ------ END-EXPECTED-OUTPUT ------ */ + +int f(struct root_struct *_) { return 0; } diff --git a/tools/testing/selftests/bpf/progs/btf_dump_test_case_namespacing.c b/tools/testing/selftests/bpf/progs/btf_dump_test_case_namespacing.c index 92a4ad428710..d7cf2a8487c9 100644 --- a/tools/testing/selftests/bpf/progs/btf_dump_test_case_namespacing.c +++ b/tools/testing/selftests/bpf/progs/btf_dump_test_case_namespacing.c @@ -49,9 +49,7 @@ typedef int Y; typedef int Z; -/*------ END-EXPECTED-OUTPUT ------ */ - -int f(struct { +struct root_struct { struct S _1; S _2; union U _3; @@ -67,7 +65,11 @@ int f(struct { X xx; Y yy; Z zz; -} *_) +}; + +/*------ END-EXPECTED-OUTPUT ------ */ + +int f(struct root_struct *_) { return 0; } diff --git a/tools/testing/selftests/bpf/progs/btf_dump_test_case_packing.c b/tools/testing/selftests/bpf/progs/btf_dump_test_case_packing.c index 7998f27df7dd..e039ceb50c43 100644 --- a/tools/testing/selftests/bpf/progs/btf_dump_test_case_packing.c +++ b/tools/testing/selftests/bpf/progs/btf_dump_test_case_packing.c @@ -132,9 +132,7 @@ struct outer_packed_struct { struct nested_packed_struct b; } __attribute__((packed)); -/* ------ END-EXPECTED-OUTPUT ------ */ - -int f(struct { +struct root_struct { struct packed_trailing_space _1; struct non_packed_trailing_space _2; struct packed_fields _3; @@ -147,7 +145,11 @@ int f(struct { struct usb_host_endpoint _10; struct outer_nonpacked_struct _11; struct outer_packed_struct _12; -} *_) +}; + +/* ------ END-EXPECTED-OUTPUT ------ */ + +int f(struct root_struct *_) { return 0; } diff --git a/tools/testing/selftests/bpf/progs/btf_dump_test_case_padding.c b/tools/testing/selftests/bpf/progs/btf_dump_test_case_padding.c index 79276fbe454a..2ca46ad8d66a 100644 --- a/tools/testing/selftests/bpf/progs/btf_dump_test_case_padding.c +++ b/tools/testing/selftests/bpf/progs/btf_dump_test_case_padding.c @@ -220,9 +220,7 @@ struct outer_mixed_but_unpacked { struct nested_packed b2; }; -/* ------ END-EXPECTED-OUTPUT ------ */ - -int f(struct { +struct root_struct { struct padded_implicitly _1; struct padded_explicitly _2; struct padded_a_lot _3; @@ -243,7 +241,11 @@ int f(struct { struct ib_wc _201; struct acpi_object_method _202; struct outer_mixed_but_unpacked _203; -} *_) +} __attribute__((packed)); + +/* ------ END-EXPECTED-OUTPUT ------ */ + +int f(struct root_struct *_) { return 0; } diff --git a/tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c b/tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c index 26fffb02ed10..3e31df7cecc6 100644 --- a/tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c +++ b/tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c @@ -104,24 +104,24 @@ typedef void (*printf_fn_t)(const char *, ...); * typedef const fn_output_inner_t fn_ptr_arr2_t[5]; */ /* ----- START-EXPECTED-OUTPUT ----- */ -typedef char * const * (*fn_ptr2_t)(struct { - int a; -}, int (*)(int)); +struct struct_a; + +typedef char * const * (*fn_ptr2_t)(struct struct_a, int (*)(int)); + +struct struct_c; + +struct struct_h; typedef struct { int a; - void (*b)(int, struct { - int c; - }, union { + void (*b)(int, struct struct_c, union { char d; int e[5]; }); } (*fn_complex_t)(union { void *f; char g[16]; -}, struct { - int h; -}); +}, struct struct_h); typedef void (* (*signal_t)(int, void (*)(int)))(int); @@ -272,6 +272,18 @@ struct root_struct { struct float_struct _15; }; +struct struct_a { + int a; +}; + +struct struct_h { + int h; +}; + +struct struct_c { + int c; +}; + /* ------ END-EXPECTED-OUTPUT ------ */ int f(struct root_struct *s)