From patchwork Wed Aug 12 14:39:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 11710921 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF3D216B1 for ; Wed, 12 Aug 2020 14:40:36 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C7ED120756 for ; Wed, 12 Aug 2020 14:40:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kXGtHQXz"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="APXFtXgE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C7ED120756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=sLd6Ne9WCZZSPA3aGZO5quNdGUaftMQgSkOXexHhx4E=; b=kXGtHQXziOv0vf4pXT0oKqp/AX ANXIJkze0ZU7azZvaQnwTWyAP+x0yPFiP81DCafgATL42BK+YhLoN5zdPuWSjc68Lgp4lo/90oSdM YvYgV7NfPwQkcrS/8+DRUAYYUHadORBmYWIUk4derM89ERF3qQHAKtHZu8ghAyFYB+5XBSJYrt01z jm7ROc8phk/joQxU2h29PossF6w/itfkYy6PRHf74UT5qLuCWhlOveNd/mxrriGUMLh+1giPRO1tw 5EJuxZwmuiEvM6iFpooAUB+v/ywfq4DkIDv4nV9q0c8n0n3fCDGCSMuf1Dcsc73boz/GjQWOOrlbV X7pyExiw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k5rvV-000576-NW; Wed, 12 Aug 2020 14:40:25 +0000 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k5rvT-00056R-AC for linux-arm-kernel@lists.infradead.org; Wed, 12 Aug 2020 14:40:24 +0000 Received: by mail-ej1-x644.google.com with SMTP id f24so2536128ejx.6 for ; Wed, 12 Aug 2020 07:40:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Usp7GMaZ0ABjxaU9mNoLDit8I1PgMcstrZVKWuqDiks=; b=APXFtXgEHkcenWyb/RRr60FadFCgHl7GQfc90NdJITjEYAmbxGyp9UMbkGqH1Us3Hb j3H+G7S4HahI/+odTHTtoICJZeTk2aYrd1q7YLr4jZCqtxTlevjOluS0t/dUMpSSgvb/ X9wRiSy+CRLrsPwwjMHsT1HTCXE5oaBSkn/7kDCbpAG1Nopqw/aLBOGtHLJYVJmGY7YC xsQX1crwYi7Chfy9o3pdXNmaZ6wxLjZwtyyS+hXeneSh8mB2UrD1tkzzpyz1rh/BRrAn 8A3tOTWIdEliKmUIiFJXV/cxqqa0FNp3xWO4e/zuOP31/ckV9nPlxuXnOyqsbC4ezSkI jbUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Usp7GMaZ0ABjxaU9mNoLDit8I1PgMcstrZVKWuqDiks=; b=WGuANnXcVjPqbYnFwChNFliNSq+g2Hh93G14C6zsWH6x4YMZh5S9KHf4T0rbsxLK6k NTE8dN3bh5y5mr+7fil3x+toUJUceOSu4RUESygNrUI1ZUApZmiDfP0BMnOyOqKWL5yX 3lhkY3jD0GrWGTqaENN8F4Ba6XRzaPhMvGEvEky6oXhFQoVuudxc+di6vqwJx7kW9oJr jWNzx3tbbLXlJLYQk6tivAgItZndXQmSV8JXTyevbS08X9ShyAiVPE2KZy+N3/jG0a2D 5GCHpt3Xh0gisbwd7B+ELZz0dkUmjdsw67RvM0b6GuASVTSm2Sy7mRZkcb/37IBGD3uk cjpg== X-Gm-Message-State: AOAM5324pxAAP6WpVjUA9xiQ7bFF61vX1gAAJJp1bel0FIHoUMOBuVn7 i6Nq6zbWuwQLQC5Lz4Dm6WcOxA== X-Google-Smtp-Source: ABdhPJyhWGPAXEmTSKjkSNXSl5qCnpv2gqmTLmKnclGw/AJr+WOI0sS4p0Dn5Z4EOv5sTOFbOMTqWQ== X-Received: by 2002:a17:906:6d54:: with SMTP id a20mr58789ejt.501.1597243222097; Wed, 12 Aug 2020 07:40:22 -0700 (PDT) Received: from localhost.localdomain ([2001:1715:4e26:a7e0:116c:c27a:3e7f:5eaf]) by smtp.gmail.com with ESMTPSA id b2sm1677617ejg.70.2020.08.12.07.40.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2020 07:40:21 -0700 (PDT) From: Jean-Philippe Brucker To: ast@kernel.org, daniel@iogearbox.net Subject: [PATCH bpf v2] libbpf: Handle GCC built-in types for Arm NEON Date: Wed, 12 Aug 2020 16:39:10 +0200 Message-Id: <20200812143909.3293280-1-jean-philippe@linaro.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200812_104023_675718_E016C59B X-CRM114-Status: GOOD ( 20.20 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:644 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jean-Philippe Brucker , songliubraving@fb.com, Jakov Petrina , john.fastabend@gmail.com, kpsingh@chromium.org, yhs@fb.com, bpf@vger.kernel.org, andriin@fb.com, kafai@fb.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org When building Arm NEON (SIMD) code from lib/raid6/neon.uc, GCC emits DWARF information using a base type "__Poly8_t", which is internal to GCC and not recognized by Clang. This causes build failures when building with Clang a vmlinux.h generated from an arm64 kernel that was built with GCC. vmlinux.h:47284:9: error: unknown type name '__Poly8_t' typedef __Poly8_t poly8x16_t[16]; ^~~~~~~~~ The polyX_t types are defined as unsigned integers in the "Arm C Language Extension" document (101028_Q220_00_en). Emit typedefs based on standard integer types for the GCC internal types, similar to those emitted by Clang. Including linux/kernel.h to use ARRAY_SIZE() incidentally redefined max(), causing a build bug due to different types, hence the seemingly unrelated change. Reported-by: Jakov Petrina Signed-off-by: Jean-Philippe Brucker Acked-by: Andrii Nakryiko --- v2: * Tried to clarify the commit message a bit. * Made __Poly64_t an unsigned long long, for portability. * Improve names. --- tools/lib/bpf/btf_dump.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/btf_dump.c b/tools/lib/bpf/btf_dump.c index cf711168d34a..ac81f3f8957a 100644 --- a/tools/lib/bpf/btf_dump.c +++ b/tools/lib/bpf/btf_dump.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "btf.h" #include "hashmap.h" #include "libbpf.h" @@ -549,6 +550,9 @@ static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr) } } +static void btf_dump_emit_missing_aliases(struct btf_dump *d, __u32 id, + const struct btf_type *t); + static void btf_dump_emit_struct_fwd(struct btf_dump *d, __u32 id, const struct btf_type *t); static void btf_dump_emit_struct_def(struct btf_dump *d, __u32 id, @@ -671,6 +675,9 @@ static void btf_dump_emit_type(struct btf_dump *d, __u32 id, __u32 cont_id) switch (kind) { case BTF_KIND_INT: + /* Emit type alias definitions if necessary */ + btf_dump_emit_missing_aliases(d, id, t); + tstate->emit_state = EMITTED; break; case BTF_KIND_ENUM: @@ -870,7 +877,7 @@ static void btf_dump_emit_struct_def(struct btf_dump *d, btf_dump_printf(d, ": %d", m_sz); off = m_off + m_sz; } else { - m_sz = max(0, btf__resolve_size(d->btf, m->type)); + m_sz = max(0LL, btf__resolve_size(d->btf, m->type)); off = m_off + m_sz * 8; } btf_dump_printf(d, ";"); @@ -890,6 +897,32 @@ static void btf_dump_emit_struct_def(struct btf_dump *d, btf_dump_printf(d, " __attribute__((packed))"); } +static const char *missing_base_types[][2] = { + /* + * GCC emits typedefs to its internal __PolyX_t types when compiling Arm + * SIMD intrinsics. Alias them to standard base types. + */ + { "__Poly8_t", "unsigned char" }, + { "__Poly16_t", "unsigned short" }, + { "__Poly64_t", "unsigned long long" }, + { "__Poly128_t", "unsigned __int128" }, +}; + +static void btf_dump_emit_missing_aliases(struct btf_dump *d, __u32 id, + const struct btf_type *t) +{ + const char *name = btf_dump_type_name(d, id); + int i; + + for (i = 0; i < ARRAY_SIZE(missing_base_types); i++) { + if (strcmp(name, missing_base_types[i][0]) == 0) { + btf_dump_printf(d, "typedef %s %s;\n\n", + missing_base_types[i][1], name); + break; + } + } +} + static void btf_dump_emit_enum_fwd(struct btf_dump *d, __u32 id, const struct btf_type *t) {