perf trace: Make some large static arrays const to move it to .data.rel.ro
Allows the movement of 33,128 bytes from .data to .data.rel.ro. Signed-off-by: Ian Rogers <irogers@google.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: K Prateek Nayak <kprateek.nayak@amd.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Ross Zwisler <zwisler@chromium.org> Cc: Sean Christopherson <seanjc@google.com> Cc: Steven Rostedt (VMware) <rostedt@goodmis.org> Cc: Tiezhu Yang <yangtiezhu@loongson.cn> Cc: Yang Jihong <yangjihong1@huawei.com> Link: https://lore.kernel.org/r/20230526183401.2326121-5-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
7c1d862eda
commit
60995604d1
@ -914,7 +914,7 @@ static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size,
|
||||
#include "trace/beauty/socket_type.c"
|
||||
#include "trace/beauty/waitid_options.c"
|
||||
|
||||
static struct syscall_fmt syscall_fmts[] = {
|
||||
static const struct syscall_fmt syscall_fmts[] = {
|
||||
{ .name = "access",
|
||||
.arg = { [1] = { .scnprintf = SCA_ACCMODE, /* mode */ }, }, },
|
||||
{ .name = "arch_prctl",
|
||||
@ -1176,18 +1176,21 @@ static int syscall_fmt__cmp(const void *name, const void *fmtp)
|
||||
return strcmp(name, fmt->name);
|
||||
}
|
||||
|
||||
static struct syscall_fmt *__syscall_fmt__find(struct syscall_fmt *fmts, const int nmemb, const char *name)
|
||||
static const struct syscall_fmt *__syscall_fmt__find(const struct syscall_fmt *fmts,
|
||||
const int nmemb,
|
||||
const char *name)
|
||||
{
|
||||
return bsearch(name, fmts, nmemb, sizeof(struct syscall_fmt), syscall_fmt__cmp);
|
||||
}
|
||||
|
||||
static struct syscall_fmt *syscall_fmt__find(const char *name)
|
||||
static const struct syscall_fmt *syscall_fmt__find(const char *name)
|
||||
{
|
||||
const int nmemb = ARRAY_SIZE(syscall_fmts);
|
||||
return __syscall_fmt__find(syscall_fmts, nmemb, name);
|
||||
}
|
||||
|
||||
static struct syscall_fmt *__syscall_fmt__find_by_alias(struct syscall_fmt *fmts, const int nmemb, const char *alias)
|
||||
static const struct syscall_fmt *__syscall_fmt__find_by_alias(const struct syscall_fmt *fmts,
|
||||
const int nmemb, const char *alias)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -1199,7 +1202,7 @@ static struct syscall_fmt *__syscall_fmt__find_by_alias(struct syscall_fmt *fmts
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static struct syscall_fmt *syscall_fmt__find_by_alias(const char *alias)
|
||||
static const struct syscall_fmt *syscall_fmt__find_by_alias(const char *alias)
|
||||
{
|
||||
const int nmemb = ARRAY_SIZE(syscall_fmts);
|
||||
return __syscall_fmt__find_by_alias(syscall_fmts, nmemb, alias);
|
||||
@ -1224,7 +1227,7 @@ struct syscall {
|
||||
bool nonexistent;
|
||||
struct tep_format_field *args;
|
||||
const char *name;
|
||||
struct syscall_fmt *fmt;
|
||||
const struct syscall_fmt *fmt;
|
||||
struct syscall_arg_fmt *arg_fmt;
|
||||
};
|
||||
|
||||
@ -1673,7 +1676,7 @@ static int syscall__alloc_arg_fmts(struct syscall *sc, int nr_args)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct syscall_arg_fmt syscall_arg_fmts__by_name[] = {
|
||||
static const struct syscall_arg_fmt syscall_arg_fmts__by_name[] = {
|
||||
{ .name = "msr", .scnprintf = SCA_X86_MSR, .strtoul = STUL_X86_MSR, },
|
||||
{ .name = "vector", .scnprintf = SCA_X86_IRQ_VECTORS, .strtoul = STUL_X86_IRQ_VECTORS, },
|
||||
};
|
||||
@ -1684,13 +1687,14 @@ static int syscall_arg_fmt__cmp(const void *name, const void *fmtp)
|
||||
return strcmp(name, fmt->name);
|
||||
}
|
||||
|
||||
static struct syscall_arg_fmt *
|
||||
__syscall_arg_fmt__find_by_name(struct syscall_arg_fmt *fmts, const int nmemb, const char *name)
|
||||
static const struct syscall_arg_fmt *
|
||||
__syscall_arg_fmt__find_by_name(const struct syscall_arg_fmt *fmts, const int nmemb,
|
||||
const char *name)
|
||||
{
|
||||
return bsearch(name, fmts, nmemb, sizeof(struct syscall_arg_fmt), syscall_arg_fmt__cmp);
|
||||
}
|
||||
|
||||
static struct syscall_arg_fmt *syscall_arg_fmt__find_by_name(const char *name)
|
||||
static const struct syscall_arg_fmt *syscall_arg_fmt__find_by_name(const char *name)
|
||||
{
|
||||
const int nmemb = ARRAY_SIZE(syscall_arg_fmts__by_name);
|
||||
return __syscall_arg_fmt__find_by_name(syscall_arg_fmts__by_name, nmemb, name);
|
||||
@ -1735,8 +1739,9 @@ syscall_arg_fmt__init_array(struct syscall_arg_fmt *arg, struct tep_format_field
|
||||
* 7 unsigned long
|
||||
*/
|
||||
arg->scnprintf = SCA_FD;
|
||||
} else {
|
||||
struct syscall_arg_fmt *fmt = syscall_arg_fmt__find_by_name(field->name);
|
||||
} else {
|
||||
const struct syscall_arg_fmt *fmt =
|
||||
syscall_arg_fmt__find_by_name(field->name);
|
||||
|
||||
if (fmt) {
|
||||
arg->scnprintf = fmt->scnprintf;
|
||||
@ -4458,7 +4463,7 @@ static void evsel__set_syscall_arg_fmt(struct evsel *evsel, const char *name)
|
||||
struct syscall_arg_fmt *fmt = evsel__syscall_arg_fmt(evsel);
|
||||
|
||||
if (fmt) {
|
||||
struct syscall_fmt *scfmt = syscall_fmt__find(name);
|
||||
const struct syscall_fmt *scfmt = syscall_fmt__find(name);
|
||||
|
||||
if (scfmt) {
|
||||
int skip = 0;
|
||||
@ -4525,7 +4530,7 @@ static int trace__parse_events_option(const struct option *opt, const char *str,
|
||||
int len = strlen(str) + 1, err = -1, list, idx;
|
||||
char *strace_groups_dir = system_path(STRACE_GROUPS_DIR);
|
||||
char group_name[PATH_MAX];
|
||||
struct syscall_fmt *fmt;
|
||||
const struct syscall_fmt *fmt;
|
||||
|
||||
if (strace_groups_dir == NULL)
|
||||
return -1;
|
||||
|
Loading…
x
Reference in New Issue
Block a user