Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2472042lqp; Sun, 24 Mar 2024 22:13:08 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUbm81EyPgDr00MUGCA6Cc9b1C2QcTwWPVUyLmgv089Dq5uXJrFnqwM13IqX0CLDH6X7bnmWqoYnKgUkAr+DHZQ/k5IbVwVPxa4orCiQg== X-Google-Smtp-Source: AGHT+IFSoophx3cy2PWRE02R3HSepRwMUceVVSE6SA7OZ8lmXTbNwcQ1n24RGP5M4oYIkS+2kkMQ X-Received: by 2002:ac8:5783:0:b0:431:3b25:359f with SMTP id v3-20020ac85783000000b004313b25359fmr6400171qta.10.1711343588010; Sun, 24 Mar 2024 22:13:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711343587; cv=pass; d=google.com; s=arc-20160816; b=e0pIp2xXs8LMB3+Hsdo4GJml+X21S1Kj4pAfsGkcpugFequ1nEhoFlfTGAQNlBG8PI otWsE5/p1smNMXOGFxwwUWNTG+OwLg6gYNEK3KJL23aKcf+OC+x9oI3RUmcgRuuS/4GX OhtQUh7/201cd1HpvBQUH9hFGRZmBGJ4h00PD8VEKFikM1PCH8MRxfoP3mYzJqQqdjpU e4BuRVrOHxiLvbyw20WyXZGh/PnFzkyPdPwZ2+GXoqt11kEjZv1fVI1GeE6CjGyjkFP4 00ZXAQU6WRUQ+nFl398EubeJwkdPoWNQYvUTIUSnx6Oz0gIB2fYr5IIuYzfBmTFv0Mjk 4FcQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=2aHR22byNp78mwojcDuBoFRlOtWypa0O5KaY9SOl6PY=; fh=O4bIX/jTmidyAdBxlXZA/Exg7qXJ19Wvl/Lfh9P1/Lg=; b=LaRUUHGnm8NtQzuTw6NzUdzPS9Nm1ddoSdK50FdGfAFBAouTEnM2x12FkFRRFRYdWa wA6E3Igig/eKw3tTrAmPc6ekzAZFEU1VrgZgnPIW7YVLuLoJb/Dupj/BC6ezbhefk5SI 5s5oeFqTya350nU7iIyUxP/dpBFfOC8jNcLVSSfc64rnMr+aJQvw05jQKY2jpo8HV4zp 4/PT0p9nr2oSeS+ehXfvPUqhXaDRmFVNj8OUPJRCRAEv3y8iyXokf1uOns12IlP8l1+0 ODVOnjt/RK/r/krIffKOFH2jUodranxpNsKruQBbBnQBrY72eAAq690CEFM1sTes0PTm btFw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="O4/ZxaO8"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113677-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113677-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id c18-20020ac87d92000000b00431609550f7si164353qtd.96.2024.03.24.22.13.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 22:13:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-113677-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="O4/ZxaO8"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113677-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113677-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id BAFE31C2AF73 for ; Mon, 25 Mar 2024 05:13:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4CA6B1E0623; Sun, 24 Mar 2024 22:52:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="O4/ZxaO8" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 292051D8BA0; Sun, 24 Mar 2024 22:50:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320637; cv=none; b=TfBu2OGIWASp2Pnamfy5n2bb3iXJmkLIQHnDxomceSKpqepmFe6QX8zBW8kVJGe7Yt2lshGQ7etV4Q+LfTDOvW1vpF0JZ09nOUvGgn0FMJkNJc/D6TJ1hT6Q4RglONygg7ByZVMyFHzb6+cYBfFAjxjUM3yT5e9JwGa604CWKvg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320637; c=relaxed/simple; bh=Rk1Q+Aok+VkjPFU/uEYsGNr2WdeCIZyK5WHjnMJWslQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SFjAxv1lVQX5f69g3sNM7KR0GwkLWQ52vT9Wi/K9zGs/ELF9314Xg25XxrGZyXVUrTGinweafa3/SfJADk7x0WPdoxyEswnh64YsaJxvnEXokoSAGysnxRnaRFktvk8EJ8adCWAJyu9bnTOg6dvNtNnf3DWuwVASmIuluHMaWds= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O4/ZxaO8; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48984C433F1; Sun, 24 Mar 2024 22:50:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320637; bh=Rk1Q+Aok+VkjPFU/uEYsGNr2WdeCIZyK5WHjnMJWslQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O4/ZxaO8PMqliNl+7KLodkuLq1XbIWvKzXQZfRh8Ow67nbbY4EQj6dtoUhC0zh5tg c9cPNoHxdOADPutAcKqIJk/zs3RmF7xADoTTRW/LUQ7GS9Jvb+bu+4ID8NpgQtXHRJ yL+9eLCAhLP2vBghXO8jcWrlDe4NJAatriUUI6/S8Bar12orYV0FgTNUDc41FQO4j5 LIjDPyn5DFZeUZVk5YDNFfSXSB+hFCuOsRj1fTzuCbJsV5Dgn9pk8r482C+SKLZIvE 7xNU+z5tZulkiavoAsJW6Fki0RvzBLcqI+1RRkwUjIa4yP0YsO5kTQQWZhQB/LlQsF iDCbaufmFv8kQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shung-Hsi Yu , Jiri Olsa , Martin KaFai Lau , Sasha Levin Subject: [PATCH 6.7 198/713] selftests/bpf: trace_helpers.c: do not use poisoned type Date: Sun, 24 Mar 2024 18:38:44 -0400 Message-ID: <20240324224720.1345309-199-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Shung-Hsi Yu [ Upstream commit a68b50f47bec8bd6a33b07b7e1562db2553981a7 ] After commit c698eaebdf47 ("selftests/bpf: trace_helpers.c: Optimize kallsyms cache") trace_helpers.c now includes libbpf_internal.h, and thus can no longer use the u32 type (among others) since they are poison in libbpf_internal.h. Replace u32 with __u32 to fix the following error when building trace_helpers.c on powerpc: error: attempt to use poisoned "u32" Fixes: c698eaebdf47 ("selftests/bpf: trace_helpers.c: Optimize kallsyms cache") Signed-off-by: Shung-Hsi Yu Acked-by: Jiri Olsa Link: https://lore.kernel.org/r/20240202095559.12900-1-shung-hsi.yu@suse.com Signed-off-by: Martin KaFai Lau Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/trace_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/selftests/bpf/trace_helpers.c index 4faa898ff7fc4..27fd7ed3e4b0c 100644 --- a/tools/testing/selftests/bpf/trace_helpers.c +++ b/tools/testing/selftests/bpf/trace_helpers.c @@ -271,7 +271,7 @@ ssize_t get_uprobe_offset(const void *addr) * addi r2,r2,XXXX */ { - const u32 *insn = (const u32 *)(uintptr_t)addr; + const __u32 *insn = (const __u32 *)(uintptr_t)addr; if ((((*insn & OP_RT_RA_MASK) == ADDIS_R2_R12) || ((*insn & OP_RT_RA_MASK) == LIS_R2)) && -- 2.43.0