From nobody Sun Dec 28 17:30:28 2025 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 3C932C4167B for ; Thu, 7 Dec 2023 01:19:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443035AbjLGBTM (ORCPT ); Wed, 6 Dec 2023 20:19:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442987AbjLGBSl (ORCPT ); Wed, 6 Dec 2023 20:18:41 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8578D1FD8 for ; Wed, 6 Dec 2023 17:18:15 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5d351694be7so1636547b3.3 for ; Wed, 06 Dec 2023 17:18:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701911894; x=1702516694; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=uJG3uwAA/nSL7IkSfLWDFQ2uIzS+c6TzT8pbE94oS2I=; b=QUYPU1nepX6XgvTp3WSz/qAjTWrBjE+forNlVwRJe6yf5bdp4bpOpWjl3KjH4L6geD sRE9u/F7kMxf66tIIErTZU/PEwXki2BpAzzJQRohbqj82BMETZkHFn4jZ7hp9pFNMrHX fqSNiv77QyXMmfOBz1AQKP/tc1q2L2eSjjjJD9L9PRlEcD2XXFaamNGHScFhghvPeA/e PqiFJkvZF1zEpjAtP9V5LsQpEHz8JwJ3VmLcJZMQCQjpuWJDf4rCdt5lDwApwtjWz3VJ jvdFMSw5z190boZWCO5O8hCBYqLE60DWvNcPKvVM7SNsJtwC4f0nt7d1zG1sUfHjF+qr UenA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701911894; x=1702516694; 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=uJG3uwAA/nSL7IkSfLWDFQ2uIzS+c6TzT8pbE94oS2I=; b=ZCkEGwKw/uuxd4HZ1wZwmqSyv+9pO7hOlToSlB7a7dosE2V7kPh7GbrnM30xqCfjdv iSyYe+OHh4ItGNzj29cNUv+aQzGq8XuCxqnIs7IKBMdOIJDSAY/hEYhRFt5PmPHD6M3a GlL9IWTCRiZckIci0SKQe4nBrnyJfwfantdot0TR9HLCU91c59ay3Nt9V/kk7dTchmjv GLLdDNR+mfO0K7BRXWwSuzmeMfeCJRPfVybCuVdQ+vNLmMWJJv1rMm0zPp99gO+o+0PL UxY9nk0G98rUQmvsKovCvrfSk2P4RTFrW3BbG5yetyhBFi9/gKTEGVjZZKfJzMOlhzSr pyew== X-Gm-Message-State: AOJu0Yxjm1QD+LGorhDIjSfZyvqGMNo2gnjj2eZRbjXJRGR9fvqzLUvy 1Dv4E6gfkK8sbn7ja91ULX0ppLY03Btz X-Google-Smtp-Source: AGHT+IF0a7ketmt5BUFG2QBffvucaW4XUe/DUnqODHbALoqI9bNPUz4fkpLpUoajFV79lavu5D/8zgA8ff51 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:35bf:293e:7696:34e9]) (user=irogers job=sendgmr) by 2002:a05:690c:3244:b0:5ca:5fcd:7063 with SMTP id fg4-20020a05690c324400b005ca5fcd7063mr32175ywb.3.1701911893941; Wed, 06 Dec 2023 17:18:13 -0800 (PST) Date: Wed, 6 Dec 2023 17:16:54 -0800 In-Reply-To: <20231207011722.1220634-1-irogers@google.com> Message-Id: <20231207011722.1220634-21-irogers@google.com> Mime-Version: 1.0 References: <20231207011722.1220634-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog Subject: [PATCH v6 20/47] perf maps: Add find next entry to give entry after the given map From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Nick Terrell , Kan Liang , Andi Kleen , Kajol Jain , Athira Rajeev , Huacai Chen , Masami Hiramatsu , Vincent Whitchurch , "Steinar H. Gunderson" , Liam Howlett , Miguel Ojeda , Colin Ian King , Dmitrii Dolgov <9erthalion6@gmail.com>, Yang Jihong , Ming Wang , James Clark , K Prateek Nayak , Sean Christopherson , Leo Yan , Ravi Bangoria , German Gomez , Changbin Du , Paolo Bonzini , Li Dong , Sandipan Das , liuwenyu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Guilherme Amadio Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use to remove map_rb_node use from machine.c. Signed-off-by: Ian Rogers --- tools/perf/util/machine.c | 7 +++---- tools/perf/util/maps.c | 11 +++++++++++ tools/perf/util/maps.h | 2 ++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 38bf7108821d..b397a769006f 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1762,12 +1762,11 @@ int machine__create_kernel_maps(struct machine *mac= hine) =20 if (end =3D=3D ~0ULL) { /* update end address of the kernel map using adjacent module address */ - struct map_rb_node *rb_node =3D maps__find_node(machine__kernel_maps(mac= hine), - machine__kernel_map(machine)); - struct map_rb_node *next =3D map_rb_node__next(rb_node); + struct map *next =3D maps__find_next_entry(machine__kernel_maps(machine), + machine__kernel_map(machine)); =20 if (next) - machine__set_kernel_mmap(machine, start, map__start(next->map)); + machine__set_kernel_mmap(machine, start, map__start(next)); } =20 out_put: diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c index 024a6c9f72c4..5b898a0e97b2 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -663,6 +663,17 @@ struct map *maps__find_by_name(struct maps *maps, cons= t char *name) return map; } =20 +struct map *maps__find_next_entry(struct maps *maps, struct map *map) +{ + struct map_rb_node *rb_node =3D maps__find_node(maps, map); + struct map_rb_node *next =3D map_rb_node__next(rb_node); + + if (next) + return next->map; + + return NULL; +} + void maps__fixup_end(struct maps *maps) { struct map_rb_node *prev =3D NULL, *curr; diff --git a/tools/perf/util/maps.h b/tools/perf/util/maps.h index b7ab3ec61b7c..84b42c8456e8 100644 --- a/tools/perf/util/maps.h +++ b/tools/perf/util/maps.h @@ -136,6 +136,8 @@ int maps__fixup_overlap_and_insert(struct maps *maps, s= truct map *new); =20 struct map *maps__find_by_name(struct maps *maps, const char *name); =20 +struct map *maps__find_next_entry(struct maps *maps, struct map *map); + int maps__merge_in(struct maps *kmaps, struct map *new_map); =20 void __maps__sort_by_name(struct maps *maps); --=20 2.43.0.rc2.451.g8631bc7472-goog