From nobody Fri Dec 26 21:32:42 2025 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1B131BDC3 for ; Wed, 3 Jan 2024 05:07:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="EgSXVP6K" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-5e795672280so168009437b3.3 for ; Tue, 02 Jan 2024 21:07:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1704258462; x=1704863262; 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=BEGzevrbqHg5RiDKme+cCF5Daz42z3NbWaYDMj+LMoA=; b=EgSXVP6KptpTFRxv9mO62c8Ow+PVcVdgoH8crppWESSd9JxbHnrqIGdcPnqqVGc79Q doqWqmZ6KUaYgMXbcP1fLDbfuyhIluyTmlXvTvZH+EdcsLWFoM0B8sTgE8sJTyQqcI9X 94bra0bksnFrUpKoUFD+kuEVxeT1AbosZCq5VibpNkXOrEFd4+yXqULLAEc7SnfyCkQG TM+p4Mj+dG9JFlyLQ4maewYpgkmPz0pbKuEYkSSqJa95CYzV/nAMTPCxy8EmxtGNi5rq Juf2K83arxl99DIrafz9VD/o+pDWN0/3dq3iJt5I9CkkpemnrJF8jbT5hMgYvuS+7z+B Swuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704258462; x=1704863262; 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=BEGzevrbqHg5RiDKme+cCF5Daz42z3NbWaYDMj+LMoA=; b=eDUkYP40IxGZcoZLC7IWnx9cHnKWOMXQo2ooVpzAXPfZ295h+x4EpxxAmv7A5w/zVF aYZEwtZCSz+7ETu4GrAz+zMcNmBj7pBAr9E/uYHSlfbcfirUzTbleUoHoaTMOpQTYzsu skpdMrYcsp80smqn3xhL4eCaGsm2Bj/tehfEEZfMDu5b9Ky+jJOPlkEsj/3NGxneZdfB E5QTu9ceEkdFF1rotDbSZ5z5iDxossWZ1Sc8gMPq/TxQc1TDDpVDVuakfOIHqIxJicHx sWLNrp5lZthMilvNWMLR4YvJro2ifhhIvBVD+bsyBdwH2jtps6h8zLebNpFYCo41RQ7v v9FQ== X-Gm-Message-State: AOJu0YyjuyYw9cWiikwBhQtYzGNrvsVn3CXa3iaTRMhnEVy/AmKZxPzh 6TxmOIznRpemrMiDGjEnee14hStoRzWDyXSdazI= X-Google-Smtp-Source: AGHT+IG//M652ACLOzgs/6r6bWJ2H0x65gz1wWOt/OXZi3Ikubw2w6n6CX8Q/h1Yiv/euPMQbDWiiE395HLv X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:e2bd:f1f6:8ea6:8d6c]) (user=irogers job=sendgmr) by 2002:a25:664a:0:b0:db5:4766:e363 with SMTP id z10-20020a25664a000000b00db54766e363mr7355237ybm.6.1704258461853; Tue, 02 Jan 2024 21:07:41 -0800 (PST) Date: Tue, 2 Jan 2024 21:06:34 -0800 In-Reply-To: <20240103050635.391888-1-irogers@google.com> Message-Id: <20240103050635.391888-25-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240103050635.391888-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Subject: [PATCH v7 24/25] perf dso: Reference counting related fixes 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Ensure gets and puts are better aligned fixing reference couting checking problems. Signed-off-by: Ian Rogers --- tools/perf/util/machine.c | 4 ++-- tools/perf/util/map.c | 1 + tools/perf/util/symbol-elf.c | 38 +++++++++++++++++------------------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 49b8ccd5affe..2dbb7b06b117 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -682,7 +682,7 @@ static int machine__process_ksymbol_register(struct mac= hine *machine, struct perf_sample *sample __maybe_unused) { struct symbol *sym; - struct dso *dso; + struct dso *dso =3D NULL; struct map *map =3D maps__find(machine__kernel_maps(machine), event->ksym= bol.addr); int err =3D 0; =20 @@ -695,7 +695,6 @@ static int machine__process_ksymbol_register(struct mac= hine *machine, } dso__set_kernel(dso, DSO_SPACE__KERNEL); map =3D map__new2(0, dso); - dso__put(dso); if (!map) { err =3D -ENOMEM; goto out; @@ -734,6 +733,7 @@ static int machine__process_ksymbol_register(struct mac= hine *machine, dso__insert_symbol(dso, sym); out: map__put(map); + dso__put(dso); return err; } =20 diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 14fb8cf65b13..4480134ef4ea 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -200,6 +200,7 @@ struct map *map__new(struct machine *machine, u64 start= , u64 len, dso__set_build_id(dso, dso__bid(header_bid_dso)); dso__set_header_build_id(dso, 1); } + dso__put(header_bid_dso); } dso__put(dso); } diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index de73f9fb3fe4..4c00463abb7e 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -1366,7 +1366,7 @@ void __weak arch__sym_update(struct symbol *s __maybe= _unused, static int dso__process_kernel_symbol(struct dso *dso, struct map *map, GElf_Sym *sym, GElf_Shdr *shdr, struct maps *kmaps, struct kmap *kmap, - struct dso **curr_dsop, struct map **curr_mapp, + struct dso **curr_dsop, const char *section_name, bool adjust_kernel_syms, bool kmodule, bool *remap_kernel) { @@ -1416,8 +1416,8 @@ static int dso__process_kernel_symbol(struct dso *dso= , struct map *map, map__set_pgoff(map, shdr->sh_offset); } =20 - *curr_mapp =3D map; - *curr_dsop =3D dso; + dso__put(*curr_dsop); + *curr_dsop =3D dso__get(dso); return 0; } =20 @@ -1442,10 +1442,10 @@ static int dso__process_kernel_symbol(struct dso *d= so, struct map *map, dso__set_binary_type(curr_dso, dso__binary_type(dso)); dso__set_adjust_symbols(curr_dso, dso__adjust_symbols(dso)); curr_map =3D map__new2(start, curr_dso); - dso__put(curr_dso); - if (curr_map =3D=3D NULL) + if (curr_map =3D=3D NULL) { + dso__put(curr_dso); return -1; - + } if (dso__kernel(curr_dso)) map__kmap(curr_map)->kmaps =3D kmaps; =20 @@ -1459,21 +1459,15 @@ static int dso__process_kernel_symbol(struct dso *d= so, struct map *map, dso__set_symtab_type(curr_dso, dso__symtab_type(dso)); if (maps__insert(kmaps, curr_map)) return -1; - /* - * Add it before we drop the reference to curr_map, i.e. while - * we still are sure to have a reference to this DSO via - * *curr_map->dso. - */ dsos__add(&maps__machine(kmaps)->dsos, curr_dso); - /* kmaps already got it */ - map__put(curr_map); dso__set_loaded(curr_dso); - *curr_mapp =3D curr_map; + dso__put(*curr_dsop); *curr_dsop =3D curr_dso; } else { - *curr_dsop =3D map__dso(curr_map); - map__put(curr_map); + dso__put(*curr_dsop); + *curr_dsop =3D dso__get(map__dso(curr_map)); } + map__put(curr_map); =20 return 0; } @@ -1484,8 +1478,7 @@ dso__load_sym_internal(struct dso *dso, struct map *m= ap, struct symsrc *syms_ss, { struct kmap *kmap =3D dso__kernel(dso) ? map__kmap(map) : NULL; struct maps *kmaps =3D kmap ? map__kmaps(map) : NULL; - struct map *curr_map =3D map; - struct dso *curr_dso =3D dso; + struct dso *curr_dso; Elf_Data *symstrs, *secstrs, *secstrs_run, *secstrs_sym; uint32_t nr_syms; int err =3D -1; @@ -1586,6 +1579,7 @@ dso__load_sym_internal(struct dso *dso, struct map *m= ap, struct symsrc *syms_ss, remap_kernel =3D true; adjust_kernel_syms =3D dso__adjust_symbols(dso); } + curr_dso =3D dso__get(dso); elf_symtab__for_each_symbol(syms, nr_syms, idx, sym) { struct symbol *f; const char *elf_name =3D elf_sym__name(&sym, symstrs); @@ -1674,8 +1668,11 @@ dso__load_sym_internal(struct dso *dso, struct map *= map, struct symsrc *syms_ss, --sym.st_value; =20 if (dso__kernel(dso)) { - if (dso__process_kernel_symbol(dso, map, &sym, &shdr, kmaps, kmap, &cur= r_dso, &curr_map, - section_name, adjust_kernel_syms, kmodule, &remap_kernel)) + if (dso__process_kernel_symbol(dso, map, &sym, &shdr, + kmaps, kmap, &curr_dso, + section_name, + adjust_kernel_syms, + kmodule, &remap_kernel)) goto out_elf_end; } else if ((used_opd && runtime_ss->adjust_symbols) || (!used_opd && syms_ss->adjust_symbols)) { @@ -1724,6 +1721,7 @@ dso__load_sym_internal(struct dso *dso, struct map *m= ap, struct symsrc *syms_ss, __symbols__insert(dso__symbols(curr_dso), f, dso__kernel(dso)); nr++; } + dso__put(curr_dso); =20 /* * For misannotated, zeroed, ASM function sizes. --=20 2.43.0.472.g3155946c3a-goog