From nobody Sun Dec 28 17:29:10 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 3FD3FC4167B for ; Thu, 7 Dec 2023 01:18:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442174AbjLGBSF (ORCPT ); Wed, 6 Dec 2023 20:18:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442165AbjLGBRt (ORCPT ); Wed, 6 Dec 2023 20:17:49 -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 5D618170D for ; Wed, 6 Dec 2023 17:17:50 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5d351694be7so1632847b3.3 for ; Wed, 06 Dec 2023 17:17:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701911869; x=1702516669; 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=3o96R63h4tW+QyyZZjx6MH+ZM3C6AiBinWxkS0w0I9s=; b=tuX7o+t72YJGCKVUcUGeCW35uDhnwPXNbY23vmltyo64hrqXI3iu3kK5Mmbp6F2A+6 7eX+YTw5x6TmjAPj9x7XFm3me7K9P2LwWIq7hc9LOjCxViyElwIAO+YkfhGB+XQe4qPa GUhTQ2J5CSIjaUl6tTDC8snSjwuEVa1EoxGNI/hsL687epJyFvKaWy/iIGQXmKBLnKMz xuO7QDvUZfUjxmf7JTNFH+piSzYmsxA8/JzYS11MCQnSI25a0ecu2ksKvhLHb2YeAWbe /PTL7a/LS2VWt8AvQK5ho1DCI76LpkVVn3Vhhm5qtObMjzlKDudwR0k6U5cUNVpcygMO 7l+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701911869; x=1702516669; 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=3o96R63h4tW+QyyZZjx6MH+ZM3C6AiBinWxkS0w0I9s=; b=t/OnTlMNlRmEeWhp2o/5yjqELqR+2jv4S3ELbCHR1ac9ouihwsKsXnlZ7DHumqxe+W uMGyNFVSJHxUFMyj5s4fy9fXp9EXU8sw9n2b9LQbALam9l1n4JqubVF03h2seEpXhPh1 LrbyFoSDIRyGGw+1QQfbmBKCFQ3drRqfXbhg6PoyMuGe7TcJVrxrkk5HxRIhlsVlwjIS 28n7PUD4MCQs+W4E4QkJcFWHUaLtkXkYtYGXZ3a+jPr0MednLjHL16mqr7aRRqAebARt 6xCUjo7gKtRvJwV+m7wxK2yVakrbhL61udyuuNIn5B5+DncxmJnARHUqQeDMg8v6p+Xq DTIQ== X-Gm-Message-State: AOJu0YwzximU0JHx09zDBwmHCpvjOlvwEljgj8Nvw+1duzs+iypnDVOw R62RSQyP2nYLA07cs5BHfzFs7Kc37piD X-Google-Smtp-Source: AGHT+IEldmR3/X81EpZlxZMbgINR4XFgb3uPK8wJLVSwf1670CHlBeFUHwbRDDtLnNjPUaqRivWe4dYfxrO5 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:35bf:293e:7696:34e9]) (user=irogers job=sendgmr) by 2002:a81:be16:0:b0:5ca:20f3:ca21 with SMTP id i22-20020a81be16000000b005ca20f3ca21mr31031ywn.1.1701911868933; Wed, 06 Dec 2023 17:17:48 -0800 (PST) Date: Wed, 6 Dec 2023 17:16:43 -0800 In-Reply-To: <20231207011722.1220634-1-irogers@google.com> Message-Id: <20231207011722.1220634-10-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 09/47] perf synthetic-events: 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 perf_event__synthesize_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/synthetic-events.c | 118 ++++++++++++++++------------- 1 file changed, 67 insertions(+), 51 deletions(-) diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index a0579c7d7b9e..3712186353fb 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -665,18 +665,74 @@ int perf_event__synthesize_cgroups(struct perf_tool *= tool __maybe_unused, } #endif =20 +struct perf_event__synthesize_modules_maps_cb_args { + struct perf_tool *tool; + perf_event__handler_t process; + struct machine *machine; + union perf_event *event; +}; + +static int perf_event__synthesize_modules_maps_cb(struct map *map, void *d= ata) +{ + struct perf_event__synthesize_modules_maps_cb_args *args =3D data; + union perf_event *event =3D args->event; + struct dso *dso; + size_t size; + + if (!__map__is_kmodule(map)) + return 0; + + dso =3D map__dso(map); + if (symbol_conf.buildid_mmap2) { + size =3D PERF_ALIGN(dso->long_name_len + 1, sizeof(u64)); + event->mmap2.header.type =3D PERF_RECORD_MMAP2; + event->mmap2.header.size =3D (sizeof(event->mmap2) - + (sizeof(event->mmap2.filename) - size)); + memset(event->mmap2.filename + size, 0, args->machine->id_hdr_size); + event->mmap2.header.size +=3D args->machine->id_hdr_size; + event->mmap2.start =3D map__start(map); + event->mmap2.len =3D map__size(map); + event->mmap2.pid =3D args->machine->pid; + + memcpy(event->mmap2.filename, dso->long_name, dso->long_name_len + 1); + + perf_record_mmap2__read_build_id(&event->mmap2, args->machine, false); + } else { + size =3D PERF_ALIGN(dso->long_name_len + 1, sizeof(u64)); + event->mmap.header.type =3D PERF_RECORD_MMAP; + event->mmap.header.size =3D (sizeof(event->mmap) - + (sizeof(event->mmap.filename) - size)); + memset(event->mmap.filename + size, 0, args->machine->id_hdr_size); + event->mmap.header.size +=3D args->machine->id_hdr_size; + event->mmap.start =3D map__start(map); + event->mmap.len =3D map__size(map); + event->mmap.pid =3D args->machine->pid; + + memcpy(event->mmap.filename, dso->long_name, dso->long_name_len + 1); + } + + if (perf_tool__process_synth_event(args->tool, event, args->machine, args= ->process) !=3D 0) + return -1; + + return 0; +} + int perf_event__synthesize_modules(struct perf_tool *tool, perf_event__han= dler_t process, struct machine *machine) { - int rc =3D 0; - struct map_rb_node *pos; + int rc; struct maps *maps =3D machine__kernel_maps(machine); - union perf_event *event; - size_t size =3D symbol_conf.buildid_mmap2 ? - sizeof(event->mmap2) : sizeof(event->mmap); + struct perf_event__synthesize_modules_maps_cb_args args =3D { + .tool =3D tool, + .process =3D process, + .machine =3D machine, + }; + size_t size =3D symbol_conf.buildid_mmap2 + ? sizeof(args.event->mmap2) + : sizeof(args.event->mmap); =20 - event =3D zalloc(size + machine->id_hdr_size); - if (event =3D=3D NULL) { + args.event =3D zalloc(size + machine->id_hdr_size); + if (args.event =3D=3D NULL) { pr_debug("Not enough memory synthesizing mmap event " "for kernel modules\n"); return -1; @@ -687,53 +743,13 @@ int perf_event__synthesize_modules(struct perf_tool *= tool, perf_event__handler_t * __perf_event_mmap */ if (machine__is_host(machine)) - event->header.misc =3D PERF_RECORD_MISC_KERNEL; + args.event->header.misc =3D PERF_RECORD_MISC_KERNEL; else - event->header.misc =3D PERF_RECORD_MISC_GUEST_KERNEL; - - maps__for_each_entry(maps, pos) { - struct map *map =3D pos->map; - struct dso *dso; + args.event->header.misc =3D PERF_RECORD_MISC_GUEST_KERNEL; =20 - if (!__map__is_kmodule(map)) - continue; + rc =3D maps__for_each_map(maps, perf_event__synthesize_modules_maps_cb, &= args); =20 - dso =3D map__dso(map); - if (symbol_conf.buildid_mmap2) { - size =3D PERF_ALIGN(dso->long_name_len + 1, sizeof(u64)); - event->mmap2.header.type =3D PERF_RECORD_MMAP2; - event->mmap2.header.size =3D (sizeof(event->mmap2) - - (sizeof(event->mmap2.filename) - size)); - memset(event->mmap2.filename + size, 0, machine->id_hdr_size); - event->mmap2.header.size +=3D machine->id_hdr_size; - event->mmap2.start =3D map__start(map); - event->mmap2.len =3D map__size(map); - event->mmap2.pid =3D machine->pid; - - memcpy(event->mmap2.filename, dso->long_name, dso->long_name_len + 1); - - perf_record_mmap2__read_build_id(&event->mmap2, machine, false); - } else { - size =3D PERF_ALIGN(dso->long_name_len + 1, sizeof(u64)); - event->mmap.header.type =3D PERF_RECORD_MMAP; - event->mmap.header.size =3D (sizeof(event->mmap) - - (sizeof(event->mmap.filename) - size)); - memset(event->mmap.filename + size, 0, machine->id_hdr_size); - event->mmap.header.size +=3D machine->id_hdr_size; - event->mmap.start =3D map__start(map); - event->mmap.len =3D map__size(map); - event->mmap.pid =3D machine->pid; - - memcpy(event->mmap.filename, dso->long_name, dso->long_name_len + 1); - } - - if (perf_tool__process_synth_event(tool, event, machine, process) !=3D 0= ) { - rc =3D -1; - break; - } - } - - free(event); + free(args.event); return rc; } =20 --=20 2.43.0.rc2.451.g8631bc7472-goog