From nobody Sun Feb 8 23:03:54 2026 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 EFDA6C77B7A for ; Thu, 25 May 2023 07:12:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234573AbjEYHMv (ORCPT ); Thu, 25 May 2023 03:12:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238954AbjEYHMR (ORCPT ); Thu, 25 May 2023 03:12:17 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E86DE74 for ; Thu, 25 May 2023 00:12:10 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-ba82ed6e450so538142276.2 for ; Thu, 25 May 2023 00:12:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684998730; x=1687590730; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=SUCIph9jK5qjiaVbzBCW9jd0y4OBlbaAbGAhyKWQXwI=; b=Ud1pJbb8PouEaxMx39Qsb0pgXQhuacyg9dE15yBm5r7rhKMfmT/wtYE2bXvB9haeyo BUBUKC8ETaG4qAGi43orR7MBCDD3xmJ0ggNCx/vfVb0gwfAPQnuhooRT2CMQb9SDBlej aeuAnMX/JNhCmbxg7K4mABEvgSx55qB0QBWlNojB1OzD6HniNhvVSXqsOrZTo2JeLiQ2 AqnarGa9CWEnF2Ot0/Ipz5Slnp3JLrSRn6xuYI+mxDu6NEXLWJOn+9Ql5p4km3xx2FO7 eeZs0v7UgYnrvrpw64ig+vyli3RyuBx44SDd8pzAjOE244wfPz1Sld6TGQMAJGA8zoNr W88g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684998730; x=1687590730; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SUCIph9jK5qjiaVbzBCW9jd0y4OBlbaAbGAhyKWQXwI=; b=EaDWpTbUH/z/215+Tk7EyZmxchr38CPBkRIEDwwnTp7wHFnq/gDgktHnQJtadZT5Ws sRL5YnIFWAqH4N98l41udu758+JoBGD7LkKkoNXjJq1isRHbOyyNCkdTioEpEx2rKCPU mbxbQPDJw3RnJXl9u0do+yMtY+fqr63Wxfr2a7IsVoBDtHKjXuPHwmftbq+sipUONaSZ dciRrI+yyGr3MTg3jUTYgnDYAHfUOMLx0dJmgmMN5SB59QaZWezXJGI6Rb4eIohR4c8g H+Ok6WNelBRf7c1F+q1Ofl0O0GR4ABsPxe1K28DSi3nQGl2HtxB9nIaRO4BVNje6flyd YAtw== X-Gm-Message-State: AC+VfDxnkioxirxW7UqDvBJO9pfOZ0ep5dA6rqhuakBYGcUBqB4lA5U8 S1LZ8vqnYrs9EBqMF67k+RLN84jlFatd X-Google-Smtp-Source: ACHHUZ68HRyMlyMUL7VBgU/YBf0IxbbVeqtg8y5j3FkwNP9nVcYZcks0CIY+Vf/g6P81tElQnzKI+NlxoEYW X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:7aa7:3d2d:76ae:8e96]) (user=irogers job=sendgmr) by 2002:a05:6902:118e:b0:ba7:5bec:7772 with SMTP id m14-20020a056902118e00b00ba75bec7772mr1217518ybu.5.1684998729741; Thu, 25 May 2023 00:12:09 -0700 (PDT) Date: Thu, 25 May 2023 00:11:22 -0700 In-Reply-To: <20230525071133.2066610-1-irogers@google.com> Message-Id: <20230525071133.2066610-6-irogers@google.com> Mime-Version: 1.0 References: <20230525071133.2066610-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog Subject: [PATCH v1 05/16] perf trace beauty: Make MSR arrays const From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , "Masami Hiramatsu (Google)" , "Steven Rostedt (Google)" , Ross Zwisler , Leo Yan , Tiezhu Yang , Yang Jihong , Andi Kleen , Kan Liang , Ravi Bangoria , Sean Christopherson , K Prateek Nayak , Paolo Bonzini , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Allows the movement of 46,072 bytes from .data to .data.rel.ro. Signed-off-by: Ian Rogers --- tools/perf/trace/beauty/beauty.h | 2 +- tools/perf/trace/beauty/tracepoints/x86_msr.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/trace/beauty/beauty.h b/tools/perf/trace/beauty/bea= uty.h index 4c59edddd6a8..3d12bf0f6d07 100644 --- a/tools/perf/trace/beauty/beauty.h +++ b/tools/perf/trace/beauty/beauty.h @@ -11,7 +11,7 @@ struct strarray { u64 offset; int nr_entries; const char *prefix; - const char **entries; + const char * const *entries; }; =20 #define DEFINE_STRARRAY(array, _prefix) struct strarray strarray__##array = =3D { \ diff --git a/tools/perf/trace/beauty/tracepoints/x86_msr.sh b/tools/perf/tr= ace/beauty/tracepoints/x86_msr.sh index 0078689963e0..fa3c4418e856 100755 --- a/tools/perf/trace/beauty/tracepoints/x86_msr.sh +++ b/tools/perf/trace/beauty/tracepoints/x86_msr.sh @@ -13,7 +13,7 @@ x86_msr_index=3D${arch_x86_header_dir}/msr-index.h # Just the ones starting with 0x00000 so as to have a simple # array. =20 -printf "static const char *x86_MSRs[] =3D {\n" +printf "static const char * const x86_MSRs[] =3D {\n" regex=3D'^[[:space:]]*#[[:space:]]*define[[:space:]]+MSR_([[:alnum:]][[:al= num:]_]+)[[:space:]]+(0x00000[[:xdigit:]]+)[[:space:]]*.*' grep -E $regex ${x86_msr_index} | grep -E -v 'MSR_(ATOM|P[46]|IA32_(TSC_DE= ADLINE|UCODE_REV)|IDT_FCR4)' | \ sed -r "s/$regex/\2 \1/g" | sort -n | \ @@ -24,7 +24,7 @@ printf "};\n\n" regex=3D'^[[:space:]]*#[[:space:]]*define[[:space:]]+MSR_([[:alnum:]][[:al= num:]_]+)[[:space:]]+(0xc0000[[:xdigit:]]+)[[:space:]]*.*' printf "#define x86_64_specific_MSRs_offset " grep -E $regex ${x86_msr_index} | sed -r "s/$regex/\2/g" | sort -n | head = -1 -printf "static const char *x86_64_specific_MSRs[] =3D {\n" +printf "static const char * const x86_64_specific_MSRs[] =3D {\n" grep -E $regex ${x86_msr_index} | \ sed -r "s/$regex/\2 \1/g" | grep -E -vw 'K6_WHCR' | sort -n | \ xargs printf "\t[%s - x86_64_specific_MSRs_offset] =3D \"%s\",\n" @@ -33,7 +33,7 @@ printf "};\n\n" regex=3D'^[[:space:]]*#[[:space:]]*define[[:space:]]+MSR_([[:alnum:]][[:al= num:]_]+)[[:space:]]+(0xc0010[[:xdigit:]]+)[[:space:]]*.*' printf "#define x86_AMD_V_KVM_MSRs_offset " grep -E $regex ${x86_msr_index} | sed -r "s/$regex/\2/g" | sort -n | head = -1 -printf "static const char *x86_AMD_V_KVM_MSRs[] =3D {\n" +printf "static const char * const x86_AMD_V_KVM_MSRs[] =3D {\n" grep -E $regex ${x86_msr_index} | \ sed -r "s/$regex/\2 \1/g" | sort -n | \ xargs printf "\t[%s - x86_AMD_V_KVM_MSRs_offset] =3D \"%s\",\n" --=20 2.40.1.698.g37aff9b760-goog