From patchwork Mon Aug 9 11:27:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 12426243 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2381C432BE for ; Mon, 9 Aug 2021 11:30:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 7BF4B601FD for ; Mon, 9 Aug 2021 11:30:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7BF4B601FD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XnRafiekCDfI3ul+XIWrN7bhnrCftpXap+6eppHFhVQ=; b=qZZ0gWHyaaH8U2 LxOlu0vzjUMJ8S9GHt+nEsT3f9sY7e9ZTNfE9W6v1KMlNJZwrY3+7ISltN3TOW35/zH/FxvedCuNO rlxNPLZnqiavRUxw8jPcePFHTqHzoBGEFbFW/QzRdErsl69M9s+Ht3EI4mngiq36Dxi5pEcn8vQFp cvMEKvKZC8EsBNdDn08aG1L7BVeWxoeYff13E/KWN+zTqhKo8o15AYHdPDzXseMxFdfQ7KwbT2B5E Ft93vMB9nf7FOcqE+oxFUYr9zKdhxrgZ1MScN/AsUnW8iwgCMXRJXw0S2SPZCNcpOstyQAsJqYNax q9NPlvzHkkpkwBZlW0Vw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mD3Ri-000MKe-9P; Mon, 09 Aug 2021 11:27:54 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mD3RS-000MGR-Ow for linux-arm-kernel@lists.infradead.org; Mon, 09 Aug 2021 11:27:40 +0000 Received: by mail-pj1-x1034.google.com with SMTP id pj14-20020a17090b4f4eb029017786cf98f9so29837391pjb.2 for ; Mon, 09 Aug 2021 04:27:38 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=/3VLoyUUFLgGGIpwzBZniAYs6R20cyWHMNHgFMGrgsI=; b=yoqwI5vsX5wlcGT223si8LwTa1uAsMG6307HtfcLZz/1TcnoZzdwJ8EY1D+3EaRYk4 nO2FvLrZR9I0nbdck2yzBThuGqegbgtgk6fQ6ieEjS4vc43NKuOu8TVIvHO3SvAtR/0N zOmRHMOWNkQBhAMmakeM7ALPJ8STlw+uEv2nyXY2b6kJIN73wyX1xSBbArZ6zGSnDEXN nTkqjJ+W1LveX4MhMGTZHDULFJTTI1mbOOKv0BmhYf6js1K840zLLIVdS+J5DkIM0FZ0 799pBxr0xz1D2G8CqHaCvqu71CYo/8v1gFx0OdjUsUQxj53IcwPiIpDdaEV5fIjx0Cjq BQvw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=/3VLoyUUFLgGGIpwzBZniAYs6R20cyWHMNHgFMGrgsI=; b=pTQK/VI6GkTscTMDmJvOLmfywvbqLJHUEbIT970rgq34jkUt9x/g7+OvOuWmyfqUj6 dyHn+pU+Urny9oQIpYSWnTPS5JmmNyyPQUCSr1xDhPgVriv3XZInJT0EAet1J8qjZHKS taJQI0Mk8hDn5UkELfKKXpQGX8+1hJNsKgF3D8Dx94qSI3O1u/G03quKQaoK2R1zV7Pw NjsAkDRaUjyQB210psdHzaAvKAWSz3YZv295LJwFbUGwBetHCjjxJYvbtc+3GdoJh+Do KCpkACREXTBOKfiV32NmNoDTO/q0FPwsj4CuHs8YsiNsLs6iVlGK2IdIivT3jqKJ9rY9 bqAQ== X-Gm-Message-State: AOAM532zRojXbV6QkBe9AvwjtJXFH15han0lXMbbnTgS0TxC6gldWJuj G15bphmV8wRqdXzS6SMu+W2eCw== X-Google-Smtp-Source: ABdhPJz72xJUcKouE4PzDu7moJ6A3YlxKWnVOiFrEhLX2UI/6z0N+uCgXJev6X4O86udz1RAbqtlaw== X-Received: by 2002:aa7:8752:0:b029:3bd:82f0:3bf9 with SMTP id g18-20020aa787520000b02903bd82f03bf9mr23655808pfo.75.1628508458189; Mon, 09 Aug 2021 04:27:38 -0700 (PDT) Received: from localhost ([210.0.159.74]) by smtp.gmail.com with ESMTPSA id k11sm23841483pgc.30.2021.08.09.04.27.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Aug 2021 04:27:37 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Peter Zijlstra , Adrian Hunter , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Will Deacon , Russell King , Catalin Marinas , Mathieu Poirier , Suzuki K Poulose , Mike Leach , John Garry , Andi Kleen , Riccardo Mancini , Jin Yao , Li Huafei , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan , Arnaldo Carvalho de Melo Subject: [PATCH v1 1/3] perf env: Track kernel 64-bit mode in environment Date: Mon, 9 Aug 2021 19:27:25 +0800 Message-Id: <20210809112727.596876-2-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210809112727.596876-1-leo.yan@linaro.org> References: <20210809112727.596876-1-leo.yan@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210809_042738_890274_E3FC67A4 X-CRM114-Status: GOOD ( 18.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org It's useful to know that the kernel is running in 32-bit or 64-bit mode. E.g. We can decide if perf tool is running in compat mode based on the info. This patch adds an item "kernel_is_64_bit" into session's environment structure perf_env, its value is initialized based on the architecture string. Suggested-by: Arnaldo Carvalho de Melo Signed-off-by: Leo Yan --- tools/perf/util/env.c | 24 +++++++++++++++++++++++- tools/perf/util/env.h | 3 +++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index ab341050be46..8f7ff0035c41 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -219,13 +219,35 @@ void perf_env__exit(struct perf_env *env) zfree(&env->hybrid_cpc_nodes); } -void perf_env__init(struct perf_env *env __maybe_unused) +void perf_env__init(struct perf_env *env) { #ifdef HAVE_LIBBPF_SUPPORT env->bpf_progs.infos = RB_ROOT; env->bpf_progs.btfs = RB_ROOT; init_rwsem(&env->bpf_progs.lock); #endif + env->kernel_is_64_bit = -1; +} + +static void perf_env__init_kernel_mode(struct perf_env *env) +{ + const char *arch = perf_env__raw_arch(env); + + if (!strncmp(arch, "x86_64", 6) || !strncmp(arch, "aarch64", 7) || + !strncmp(arch, "arm64", 5) || !strncmp(arch, "mips64", 6) || + !strncmp(arch, "parisc64", 8) || !strncmp(arch, "riscv64", 7) || + !strncmp(arch, "s390x", 5) || !strncmp(arch, "sparc64", 7)) + env->kernel_is_64_bit = 1; + else + env->kernel_is_64_bit = 0; +} + +int perf_env__kernel_is_64_bit(struct perf_env *env) +{ + if (env->kernel_is_64_bit == -1) + perf_env__init_kernel_mode(env); + + return env->kernel_is_64_bit; } int perf_env__set_cmdline(struct perf_env *env, int argc, const char *argv[]) diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index 6824a7423a2d..1f5175820a05 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -61,6 +61,7 @@ struct perf_env { unsigned long long total_mem; unsigned int msr_pmu_type; unsigned int max_branches; + int kernel_is_64_bit; int nr_cmdline; int nr_sibling_cores; @@ -143,6 +144,8 @@ extern struct perf_env perf_env; void perf_env__exit(struct perf_env *env); +int perf_env__kernel_is_64_bit(struct perf_env *env); + int perf_env__set_cmdline(struct perf_env *env, int argc, const char *argv[]); int perf_env__read_cpuid(struct perf_env *env);