From patchwork Fri Feb 2 06:15:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 195585 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp237691dyc; Thu, 1 Feb 2024 22:16:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IE8O+7iGQ6h0Q5ZS5q7F8Q1LbjVHSe5UieA9lrexE7FWXyoG0LGd1tdJQWXDIQdHIG9+wEP X-Received: by 2002:a05:6122:270f:b0:4bd:6486:16fc with SMTP id ej15-20020a056122270f00b004bd648616fcmr4568854vkb.6.1706854615606; Thu, 01 Feb 2024 22:16:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706854615; cv=pass; d=google.com; s=arc-20160816; b=qzB//LqBvNjYsi6LADLhzH5e8BNOefhrB6sFVbrjIPSKiAJXDCmygWAuoihJTHNBVN w6EoudltrIu8qffXlwPFTCip0AsOhj+79lRvbPWSa4CE6mz6B1wYHqWCU0nHLPcdGrl1 sln/dlO5bQvVPoAFvloQnF47oaZOqwQruAd/VW/1WBfPor8ecGPOTFtDyx9XQWVg3SRX Tk/ChCVScmBiQOKHflvXLpCd29fhCZyBk/UN17pU+PjYEFiYXgNewzuzMTzZ7lTIFF10 UhaRiAtFT5bJiiP78lN5HPp9DM7LTmGZ40dS4ORPYwgigJzt7laYhGPjvcZSohtkGzqM XroA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:from:subject:references:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:in-reply-to:date :dkim-signature; bh=v+u9iEAq0iCqu7yfngDUriNlQosa5LnNT/PlXHwuCTs=; fh=rXDPq/tuEA94yPRDJ0iBlWImNx/VNixPTkJzFveysjE=; b=G2udiK8rdS8ypffq1AJ+KN4TBfc5l24f13V7YCFeJXNA6MN8FPXXgyBm9y5BMNAUuw 92GwBEl3mxPhNYDf3tQ7JQibeN9BCTmBGMoVCfx7VwN3LsAiOMsUeSKGzEXLfNBOYrsu +vp8Oy+OfNV4vOPpObzhbHxjXuVKB9y8wh2wdbS1w6SxfB6aCby2Cdp0Gm5AEUC9abCu CSETOYks8dIQKOw6cjTTfaGfLZpvMDkZV1RuxC2D+yKm4V+Kt9odtodUou58RcfmYh2d 4MlT+7l6/mpg6mU4S8MbGWLF92EBgvGYevYlSVRx/u/uBpToCYGLQGiqjgcKf5Zy4idF XT0w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=zkts1HOe; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-49242-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49242-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Forwarded-Encrypted: i=1; AJvYcCWg9phLZfJnD/7QZpIM3323q6K7NCozHLSYRxK17ydHNxAHObXGmAQF1KFFCkiv6fEndIOR2leqoIZbEkruStz0CAFryg== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id k9-20020a0cebc9000000b0068c507c1d46si1260686qvq.419.2024.02.01.22.16.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 22:16:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49242-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=zkts1HOe; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-49242-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49242-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 564381C21AA9 for ; Fri, 2 Feb 2024 06:16:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 52C2F17C70; Fri, 2 Feb 2024 06:16:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="zkts1HOe" Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 5504217549 for ; Fri, 2 Feb 2024 06:15:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706854556; cv=none; b=mIZbSH9gcMad8fkRG4G59+BU4oXZgxnnZTA46aPJhpnEPUsaqcOmN3lwyTgbbxjWFFtjdLPKq0SwlYIIHLdeWCbr9kyZu0KeWdbU4fbIneV/qVBWzDIPHKnN6uDz3+Ju53DOp966bxuHBn2UJLUpp4ibFY2p3UF+sha4YCF4LJw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706854556; c=relaxed/simple; bh=2j1qjZFTeJGHeOMFeX3LjyFdA0NCYp4OZGkvalboIXM=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=gbrGBWWLzgAdXcMZr3OSfYMF1ZaFs3AwvSXrY0TXwqJ0C1K5UuY4zJfYW7NIVYrcugH1hNZwV8bW7KoUiRK1bN8gVR0Pk3qGYeDkDWAsi8Dr93/5KIcQzZD1KzqOzenXCScjUYvOIzBcRoI/PubC7vZJGeFFkPTk2ivgB8l7514= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=zkts1HOe; arc=none smtp.client-ip=209.85.128.201 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 Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6040aaa4e79so28874117b3.3 for ; Thu, 01 Feb 2024 22:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706854553; x=1707459353; 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=v+u9iEAq0iCqu7yfngDUriNlQosa5LnNT/PlXHwuCTs=; b=zkts1HOeRUJyXCo1yh1SbJNjcbiyEpnCiNMYmBZl8RkkwLmsErP1wLMNbUGpou5j5m GUs1F2T3Acs6HaDw+QNlh++8YlO/KHLPKp3gIr4hVtXLzcCO3M30IBgm3Aa2EfeNRpXe KtGdd2ls0PyMpmHDeo9SeXtfORL/H5CKUhZsfsTZIY1byXlzLGfZRVHcYXMWodV2K2LW plU7Ke0/hNFMiczV+xOvZ7tlcPhklnxcyRbhRBpuh9kNxAWP8CXSBogpoqI0Rrfay7yv C3NJI42//3Y39ChvAsAr15FBbM4p7WDX+zSVTvjUZT2eQMiil8e38e2OvZj3WjVkai3S Vv0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706854553; x=1707459353; 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=v+u9iEAq0iCqu7yfngDUriNlQosa5LnNT/PlXHwuCTs=; b=K65H7zVL995o1TFPpFFhpThCD8nh/NHrKCpP+PUt26J6avK4tm6T+dWks2r2tDo9Pp 1x09z8IamvLddL6K55DBVNWKh6dbMt/iEjlC+OMFqfxPSJRueuaBagyRjb2mVRCxffOA DgKc63V388gG/JyGxXI8xbGfN54hasnBNCBxkJ9iOMIYW1F85cAWQH2CcYv0ea7yN7I/ B68woNGXj9H1eIYqSo/Km6Zu6h2zD6Bb8z8jnuxo/3VfjoAvLbmqVrDjPAHtabXOtbOD 3tSSyFGzagKlFTihGLZjRlm6tfp4jcyHQkXGG+Xelqes4lkhq3Kom9wPBwclkASX3PE3 61UA== X-Gm-Message-State: AOJu0YzcsLQMFdCamLGbV7+vILWBzpOQVNjntnMi+ls7ZSj6+VTPx4MN qCGLXIAP667fMmF2IJN5gUNoPKintn8cV0+ELoa/VQTlrglpHDE+qQ4HIQIfLM/hHXNsMuPDJZd kxE+TFQ== X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:a85f:db1d:a66b:7f53]) (user=irogers job=sendgmr) by 2002:a05:6902:260c:b0:dc2:3426:c9ee with SMTP id dw12-20020a056902260c00b00dc23426c9eemr67227ybb.11.1706854553371; Thu, 01 Feb 2024 22:15:53 -0800 (PST) Date: Thu, 1 Feb 2024 22:15:10 -0800 In-Reply-To: <20240202061532.1939474-1-irogers@google.com> Message-Id: <20240202061532.1939474-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240202061532.1939474-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.594.gd9cf4e227d-goog Subject: [PATCH v8 03/25] perf maps: Get map before returning in maps__find_by_name 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 , "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 , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Guilherme Amadio X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789766785438429420 X-GMAIL-MSGID: 1789766785438429420 Finding a map is done under a lock, returning the map without a reference count means it can be removed without notice and causing uses after free. Grab a reference count to the map within the lock region and return this. Fix up locations that need a map__put following this. Also fix some reference counted pointer comparisons. Signed-off-by: Ian Rogers --- tools/perf/tests/vmlinux-kallsyms.c | 5 +++-- tools/perf/util/machine.c | 6 ++++-- tools/perf/util/maps.c | 6 +++--- tools/perf/util/probe-event.c | 1 + tools/perf/util/symbol-elf.c | 4 +++- tools/perf/util/symbol.c | 18 +++++++++++------- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/tools/perf/tests/vmlinux-kallsyms.c b/tools/perf/tests/vmlinux-kallsyms.c index e808e6fc8f76..fecbf851bb2e 100644 --- a/tools/perf/tests/vmlinux-kallsyms.c +++ b/tools/perf/tests/vmlinux-kallsyms.c @@ -131,9 +131,10 @@ static int test__vmlinux_matches_kallsyms_cb1(struct map *map, void *data) struct map *pair = maps__find_by_name(args->kallsyms.kmaps, (dso->kernel ? dso->short_name : dso->name)); - if (pair) + if (pair) { map__set_priv(pair, 1); - else { + map__put(pair); + } else { if (!args->header_printed) { pr_info("WARN: Maps only in vmlinux:\n"); args->header_printed = true; diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index e8eb9f0b073f..7031f6fddcae 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1537,8 +1537,10 @@ static int maps__set_module_path(struct maps *maps, const char *path, struct kmo return 0; long_name = strdup(path); - if (long_name == NULL) + if (long_name == NULL) { + map__put(map); return -ENOMEM; + } dso = map__dso(map); dso__set_long_name(dso, long_name, true); @@ -1552,7 +1554,7 @@ static int maps__set_module_path(struct maps *maps, const char *path, struct kmo dso->symtab_type++; dso->comp = m->comp; } - + map__put(map); return 0; } diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c index 252a3b1f8f81..489072bebb5b 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -899,7 +899,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name) struct dso *dso = map__dso(maps__maps_by_name(maps)[i]); if (dso && strcmp(dso->short_name, name) == 0) { - result = maps__maps_by_name(maps)[i]; // TODO: map__get + result = map__get(maps__maps_by_name(maps)[i]); done = true; } } @@ -911,7 +911,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name) sizeof(*mapp), map__strcmp_name); if (mapp) { - result = *mapp; // TODO: map__get + result = map__get(*mapp); i = mapp - maps__maps_by_name(maps); RC_CHK_ACCESS(maps)->last_search_by_name_idx = i; } @@ -936,7 +936,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name) struct dso *dso = map__dso(pos); if (dso && strcmp(dso->short_name, name) == 0) { - result = pos; // TODO: map__get + result = map__get(pos); break; } } diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index a1a796043691..be71abe8b9b0 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -358,6 +358,7 @@ static int kernel_get_module_dso(const char *module, struct dso **pdso) map = maps__find_by_name(machine__kernel_maps(host_machine), module_name); if (map) { dso = map__dso(map); + map__put(map); goto found; } pr_debug("Failed to find module %s.\n", module); diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 4b934ed3bfd1..5990e3fabdb5 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -1470,8 +1470,10 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map, dso__set_loaded(curr_dso); *curr_mapp = curr_map; *curr_dsop = curr_dso; - } else + } else { *curr_dsop = map__dso(curr_map); + map__put(curr_map); + } return 0; } diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 1710b89e207c..0785a54e832e 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -814,7 +814,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, struct map *initial_map) { struct machine *machine; - struct map *curr_map = initial_map; + struct map *curr_map = map__get(initial_map); struct symbol *pos; int count = 0, moved = 0; struct rb_root_cached *root = &dso->symbols; @@ -858,13 +858,14 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, dso__set_loaded(curr_map_dso); } + map__zput(curr_map); curr_map = maps__find_by_name(kmaps, module); if (curr_map == NULL) { pr_debug("%s/proc/{kallsyms,modules} " "inconsistency while looking " "for \"%s\" module!\n", machine->root_dir, module); - curr_map = initial_map; + curr_map = map__get(initial_map); goto discard_symbol; } curr_map_dso = map__dso(curr_map); @@ -888,7 +889,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, * symbols at this point. */ goto discard_symbol; - } else if (curr_map != initial_map) { + } else if (!RC_CHK_EQUAL(curr_map, initial_map)) { char dso_name[PATH_MAX]; struct dso *ndso; @@ -899,7 +900,8 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, } if (count == 0) { - curr_map = initial_map; + map__zput(curr_map); + curr_map = map__get(initial_map); goto add_symbol; } @@ -913,6 +915,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, kernel_range++); ndso = dso__new(dso_name); + map__zput(curr_map); if (ndso == NULL) return -1; @@ -926,6 +929,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, map__set_mapping_type(curr_map, MAPPING_TYPE__IDENTITY); if (maps__insert(kmaps, curr_map)) { + map__zput(curr_map); dso__put(ndso); return -1; } @@ -936,7 +940,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, pos->end -= delta; } add_symbol: - if (curr_map != initial_map) { + if (!RC_CHK_EQUAL(curr_map, initial_map)) { struct dso *curr_map_dso = map__dso(curr_map); rb_erase_cached(&pos->rb_node, root); @@ -951,12 +955,12 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, symbol__delete(pos); } - if (curr_map != initial_map && + if (!RC_CHK_EQUAL(curr_map, initial_map) && dso->kernel == DSO_SPACE__KERNEL_GUEST && machine__is_default_guest(maps__machine(kmaps))) { dso__set_loaded(map__dso(curr_map)); } - + map__put(curr_map); return count + moved; }