From nobody Sun Dec 28 17:28:54 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 E464CC4167B for ; Thu, 7 Dec 2023 01:18:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442970AbjLGBSD (ORCPT ); Wed, 6 Dec 2023 20:18:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442098AbjLGBRq (ORCPT ); Wed, 6 Dec 2023 20:17:46 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0156C10F8 for ; Wed, 6 Dec 2023 17:17:47 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5d3eafe3d17so1061777b3.1 for ; Wed, 06 Dec 2023 17:17:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701911866; x=1702516666; 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=AO9qbVdz92aeOF04iN3sGAA+G8iEwxSn4ALkZn1Ljr4=; b=Zgutos3xtH5+U2/BS+FcOeiKpwHPGi2oOXAFzwDqk4105+AxXsU/AymCQlaNemjyK1 IvwbHyf/okcc0jTHW5WFtHu0jJeUQPRZxfIrvzSm8ZlJxwMfM+Mja/NmO0af+i9Yb/5U sz32+03aMZSqt+YeP416/mt3fS3uWtZDKkCZXwrWJkA59KCtIbwwf6PaK6CiSjx4fiV4 hEanIFEPEp65UStVNGdcLT4MVfCrJutdRljADCh6nGuG7hUYZbPQoHWOBY6ZI5sQeNX6 cBEuhJYpkAufuLXqNvR3uoZueLEI+oRFCfMzz1870vQr8P7XX6LaFJUx6ajZr1K7QAMI k5xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701911866; x=1702516666; 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=AO9qbVdz92aeOF04iN3sGAA+G8iEwxSn4ALkZn1Ljr4=; b=F9iP/9axjCiOEJXIRnyn+m8HXKeQoSCbcrZBD4nKQrkQ/W7sWG4xxdgWd5tTzACqAr QouLtzYZOSXOtqp4TipVyCzg40sxRkDpuuo3gUoOAz4oPIsFV9nwp2GDT5OyR4MSRmeO h6P3db9Epvj2e7Dw/IlJlk41OjA6pYecg/FB+3CvmzZC4aya8wOQjgya0n3q5sLrlySG v492oDr4EXaAdFbj0/1oeFgR13P1Y3MdkDX23feL/fSAtQzDNol0M5aA6FIyomIogbx5 6+4CJJGpdery6EjsvusDa1aaHYmtx1QVbJi3oxAuoobaIGTJVcRCs3MA4TyEDEAaZub5 TYaQ== X-Gm-Message-State: AOJu0YzJ77KquXDIzB8JJzewEzVakt7ledERwLsdNoD04pIdCWbdPFK8 qPacKa62U/+w0Z2Yf2P89YYho/7M0/7B X-Google-Smtp-Source: AGHT+IFZShnoES+NZiyREpT/gFpeijKkhzAYIhu+beyX8tCaB7kyYLyiBn92ban+fdsdihdux7Lj+fuWL7yd X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:35bf:293e:7696:34e9]) (user=irogers job=sendgmr) by 2002:a25:3144:0:b0:db5:4a00:a153 with SMTP id x65-20020a253144000000b00db54a00a153mr42999ybx.4.1701911866495; Wed, 06 Dec 2023 17:17:46 -0800 (PST) Date: Wed, 6 Dec 2023 17:16:42 -0800 In-Reply-To: <20231207011722.1220634-1-irogers@google.com> Message-Id: <20231207011722.1220634-9-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 08/47] perf symbol: Use function to add missing maps lock 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" Switch do_validate_kcore_modules from loop macro maps__for_each_entry to maps__for_each_map function that takes a callback. The function holds the maps lock, which should be held during iteration. Signed-off-by: Ian Rogers --- tools/perf/util/symbol.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 1cc42b8d8afb..72f03b875478 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -1114,33 +1114,35 @@ int compare_proc_modules(const char *from, const ch= ar *to) return ret; } =20 +static int do_validate_kcore_modules_cb(struct map *old_map, void *data) +{ + struct rb_root *modules =3D data; + struct module_info *mi; + struct dso *dso; + + if (!__map__is_kmodule(old_map)) + return 0; + + dso =3D map__dso(old_map); + /* Module must be in memory at the same address */ + mi =3D find_module(dso->short_name, modules); + if (!mi || mi->start !=3D map__start(old_map)) + return -EINVAL; + + return 0; +} + static int do_validate_kcore_modules(const char *filename, struct maps *km= aps) { struct rb_root modules =3D RB_ROOT; - struct map_rb_node *old_node; int err; =20 err =3D read_proc_modules(filename, &modules); if (err) return err; =20 - maps__for_each_entry(kmaps, old_node) { - struct map *old_map =3D old_node->map; - struct module_info *mi; - struct dso *dso; + err =3D maps__for_each_map(kmaps, do_validate_kcore_modules_cb, &modules); =20 - if (!__map__is_kmodule(old_map)) { - continue; - } - dso =3D map__dso(old_map); - /* Module must be in memory at the same address */ - mi =3D find_module(dso->short_name, &modules); - if (!mi || mi->start !=3D map__start(old_map)) { - err =3D -EINVAL; - goto out; - } - } -out: delete_modules(&modules); return err; } --=20 2.43.0.rc2.451.g8631bc7472-goog