From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
James Clark <james.clark@linaro.org>,
Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Kan Liang <kan.liang@linux.intel.com>,
Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Stephane Eranian <eranian@google.com>
Subject: [PATCH 2/6] perf maps: Set the kmaps for newly created/added kernel maps
Date: Thu, 27 Feb 2025 18:54:51 -0300 [thread overview]
Message-ID: <20250227215455.30514-3-acme@kernel.org> (raw)
In-Reply-To: <20250227215455.30514-1-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
When using __maps__insert_sorted() the map kmaps field needs to be
initialized, as we need kernel maps to work with map__kmap().
Fix it by using the newly introduced map__set_kmap() method.
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/lkml/Z74V0hZXrTLM6VIJ@x1
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/maps.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c
index e21d29f5df01c6f7..dec2e04696c9097e 100644
--- a/tools/perf/util/maps.c
+++ b/tools/perf/util/maps.c
@@ -798,6 +798,9 @@ static int __maps__insert_sorted(struct maps *maps, unsigned int first_after_ind
}
RC_CHK_ACCESS(maps)->nr_maps = nr_maps + to_add;
maps__set_maps_by_name_sorted(maps, false);
+ map__set_kmap(new1, maps);
+ map__set_kmap(new2, maps);
+
check_invariants(maps);
return 0;
}
--
2.47.0
next prev parent reply other threads:[~2025-02-27 21:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-27 21:54 [PATCH 0/6] Fixups for kernel maps insertion Arnaldo Carvalho de Melo
2025-02-27 21:54 ` [PATCH 1/6] perf maps: Introduce map__set_kmap() for kernel maps Arnaldo Carvalho de Melo
2025-02-27 23:27 ` Ian Rogers
[not found] ` <CA+JHD924rCBDbK1f_7=0c-Pp_tPj7vcXjaMFQdE_OB6CGOTtUQ@mail.gmail.com>
2025-02-28 1:16 ` Ian Rogers
2025-02-27 21:54 ` Arnaldo Carvalho de Melo [this message]
2025-02-27 21:54 ` [PATCH 3/6] perf machine: Fixup kernel maps ends after adding extra maps Arnaldo Carvalho de Melo
2025-02-27 21:54 ` [PATCH 4/6] perf maps: Fixup maps_by_name when modifying maps_by_address Arnaldo Carvalho de Melo
2025-02-27 21:54 ` [PATCH 5/6] perf maps: Add missing map__set_kmap() when replacing a kernel map Arnaldo Carvalho de Melo
2025-02-27 21:54 ` [PATCH 6/6] perf machine: Fix insertion of PERF_RECORD_KSYMBOL related kernel maps Arnaldo Carvalho de Melo
-- strict thread matches above, loose matches on Subject: below --
2025-02-28 21:17 [PATCH 0/6 v2] Fixups for kernel maps insertion Arnaldo Carvalho de Melo
2025-02-28 21:17 ` [PATCH 2/6] perf maps: Set the kmaps for newly created/added kernel maps Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250227215455.30514-3-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=james.clark@linaro.org \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).