Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2131544pxv; Sun, 11 Jul 2021 03:44:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylkjqhFU0R3PgkR+sAgHga7vcNboo7FOJMRnjCQYqqFZsFLZ9npc73k/X0Dj8QAnPqpRbq X-Received: by 2002:a17:906:edc9:: with SMTP id sb9mr31759420ejb.99.1626000261495; Sun, 11 Jul 2021 03:44:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626000261; cv=none; d=google.com; s=arc-20160816; b=XWKUdVyQbHaVvbfwjjPZrly/MTNPI5+3X2FQWExlseGbQWhEVQff0vCQkmqMylKhmX HY0olMT6sdlrBanoAqZJkQTt+6bHaLR2P6krBlrYZExkHlcx2oFXUdVnHOWRIO/9dBsw atgJpPzxupMhrlSaclkpV3qCWy2eRhiS1u/kVCw0uviG8ZM5BUnthSunMbLZ14qtgcAY OUCsKipSP0EykSzx4ZP17pRVmU2f/AaHtDNyhmfWvMKyej4KBmdRQpnZ4UIBHNMoYXp5 sncLZunm6jKuMcUXJ/VmJIMO2qzliioCEroHpqmBXHZIrsfNk1GbzNu0IXM3v1L8gb5v g7RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8WBHdMiNLmIcoS32XEem64SidgwwayFr5+ViHTdRenk=; b=cncMdrRViFuj4PsCRiS5XZ4kQkZn994nNNGwtmHQaYZoxWT/dW3pAZ6iLtsQui75U9 +W2/sG/wR7V8fRKqKu9kdLVrdK4/HozVGgp9E00/axMyhwybtsOR5Wghl3Na929QDmmv KSfqqv46C7FhZkmcnkRrbTqjQH0Zly/Ss6eA0woPXsQL+7nvu+tEPHT0uOxM1/y7OB7U HR/nN9sjs2jne77y4eN3AMNH7u58iBlnRqxucYiMzYvVoL9LBptEQIj73wUVXALEOilp xOdVwOl+HszEmDp1jWcPHZzZeM3Ql6bCGG/Vea8uQZ/3r0JSk+HR82MippDjHBHbADM7 0xTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EIaNg9j2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l1si212855ejb.491.2021.07.11.03.43.59; Sun, 11 Jul 2021 03:44:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EIaNg9j2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232624AbhGKKof (ORCPT + 99 others); Sun, 11 Jul 2021 06:44:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232647AbhGKKod (ORCPT ); Sun, 11 Jul 2021 06:44:33 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45664C0613E5 for ; Sun, 11 Jul 2021 03:41:46 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id n10so313614plk.1 for ; Sun, 11 Jul 2021 03:41:46 -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=8WBHdMiNLmIcoS32XEem64SidgwwayFr5+ViHTdRenk=; b=EIaNg9j2rZ8VjBp2Ru1d3pbSkzhH1TZGwMBQfIAMo9StPWmImfULZiZbCEhoWb80D6 XOmzRSfywoys3eaekT+MNj07FnSbXjLmmR+V4CDh3S+xj3o4EupJ9UczuEBvfnd7YRde C7FZRp0gPB/eZP5ESKYFs99ZO7tLuYCoVo5mHJJDHYpS1VOjOBu5GucU0deXi/4U+Get FxjvDcGB16CkxYN1fOQS7M9bh0zYZ5K6IpDa3npaZI3HVhNIGq2dVIUKujKcwqKJ+Edv vFJ620Ba68Mpo5Lp2x9xkmUh2VQ/LtGD5W9KcTVpZrS3FI8Fh9EM0aryln9sT8/fWGc+ QhnA== 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=8WBHdMiNLmIcoS32XEem64SidgwwayFr5+ViHTdRenk=; b=VfrL8DTVEwudCpY4faPJzfVpucesN34leXi1Y6/N4oY/mfS73TH8PkF1HB+O5APhCF v8sQtktoAdmu6lIqJWQa97dMdo29Yba/wbaFRLs0y1WMNYv7RYww/zWDUW7hh13xT1KK bGc6/m0XkD5PZyHBU78csyLEcW81RX55wrznWipBQXNBuMiB+FN3I4DekydTGf393wyN USVV/8dYebrbSseiDMayEMJN17GX8gtDxbvo+h8xMhKo4mCV9fmnMyJit4pC4Mgq2qYR VlrIOz9xfQSK6rFZHF7kgeyz6nlB4NK2c8VbGxpUlvoRRsVWt2Kr+8l9jH8K1DSKZuzQ kgHA== X-Gm-Message-State: AOAM530D1frFPD2SyQbPwOiDOZR0R17DFjXGYZb6wxrhKrn9JygXRGcl cfo5WF+74C6U+J8Ha8wQt+DhZw== X-Received: by 2002:a17:90b:4a90:: with SMTP id lp16mr47619927pjb.137.1626000105798; Sun, 11 Jul 2021 03:41:45 -0700 (PDT) Received: from localhost ([103.127.241.250]) by smtp.gmail.com with ESMTPSA id 3sm4169592pfm.25.2021.07.11.03.41.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jul 2021 03:41:45 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Thomas Gleixner , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Mathieu Poirier , Suzuki K Poulose , Mike Leach , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v4 10/11] perf env: Set flag for kernel is 64-bit mode Date: Sun, 11 Jul 2021 18:41:04 +0800 Message-Id: <20210711104105.505728-11-leo.yan@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210711104105.505728-1-leo.yan@linaro.org> References: <20210711104105.505728-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 from this info. This patch adds a global variable "kernel_is_64_bit", it's initialized when a session setups environment, its value is decided by checking the architecture string. Signed-off-by: Leo Yan --- tools/perf/util/env.c | 17 ++++++++++++++++- tools/perf/util/env.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index ebc5e9ad35db..345635a2e842 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -11,6 +11,7 @@ #include #include +int kernel_is_64_bit; struct perf_env perf_env; #ifdef HAVE_LIBBPF_SUPPORT @@ -172,6 +173,19 @@ static void perf_env__purge_bpf(struct perf_env *env __maybe_unused) } #endif // HAVE_LIBBPF_SUPPORT +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)) + kernel_is_64_bit = 1; + else + kernel_is_64_bit = 0; +} + void perf_env__exit(struct perf_env *env) { int i; @@ -217,13 +231,14 @@ 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 + perf_env__init_kernel_mode(env); } 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..cc989ff49740 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -139,6 +139,7 @@ enum perf_compress_type { struct bpf_prog_info_node; struct btf_node; +extern int kernel_is_64_bit; extern struct perf_env perf_env; void perf_env__exit(struct perf_env *env); -- 2.25.1