Message ID | 20240210031746.4057262-5-irogers@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-60267-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp1272155dyd; Fri, 9 Feb 2024 19:19:47 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXK32bu349MWQv4ke6x2ChRX+OhY0HP+FaMopOW+UlFkIsC+n9ge7XTh+wdWNDXK9f1uNx/GldXTD/UK6qqQLmLrXitHg== X-Google-Smtp-Source: AGHT+IE8ROoZVMSpxiKsP8shM2bb/kgGCSiE2qROUredcz67tz4LzPBIF3hGBtiS06xlPGleWiG1 X-Received: by 2002:a5b:c:0:b0:dc2:40d8:ac5e with SMTP id a12-20020a5b000c000000b00dc240d8ac5emr1061759ybp.1.1707535187197; Fri, 09 Feb 2024 19:19:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707535187; cv=pass; d=google.com; s=arc-20160816; b=RHeuSQqo4azeXKwxvAGuRliT9vC6119g6Hm7tbH+2gZ9Uq0WpM7cgHBQ/XkI6l0D5s wrpRQ9+JTEHU8muF0jHHWth1pYilW2zSV+YshftZpEC72K7g1Bwcrasqqr4NDip/2tPn vD4v3B3knDiNN0W57FnUV8eGRCAu/kJqNeOuaA/JM21Qv4cU8A87NS+dgYZ0SKFsnkcP LnsF+8ucoqhUlBA21AkRfANdshPImHtiCtrISfqsGx8IbQf+WBd+x3wxys+tgc3b8pkx HGHJdRn5tIJunK7tXDKGydy6in/IFLBQuCIJBJVuYEsbh2T78FPoiHA9Biq1BZvzGKeC NWoA== 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=cCmA44GmuSEQ6KR355fhhypmUscD3id2lD2Aj801jbU=; fh=bPAlA8nl88MsQtG3ufiIM0cOQil5I6btQlVz6r/UOJE=; b=WwXqH4MuBtXNKYiyO31btkRIQNc6fENawhJQhF/OlNSOdESFwqDEg9Txc0I1yMVqij U7iqSUDkQrySwXRvUp6y6iH/w8MtNFLuzHJmyWR4y3vkn0b68DjeJ669OTwZdexNcQsq /QaZ+XBMWoYm6Vj3r315TjIwvjf2QbvjU3vVGHzaRCEhLcboblNi3esroT5XVj1wEJZR kpipePxBW8vIlZUIfHOCjxTCzosJPq56dwTzr4JVmYsQX7hLg3wH0F49y0ylYzZcapwJ KGbhcp0ZDKSAxUaGfvNRBE8ZfXzqwvxiuM/gmBxmZs4oupy9eKDQcNi4Xx7veoqz+euH +/kA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=ZnYdjP3H; 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-60267-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60267-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Forwarded-Encrypted: i=2; AJvYcCUUDXMxeXE3VTvRD1R02ribIvLo9ZE+egz8LIIIq28n/BVpHSW/88kRhpXuMfygzy49DvJrn/z2GvBt3G2wq6NTPfBNtg== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id jq15-20020ad45fcf000000b0068c8b401467si3562509qvb.597.2024.02.09.19.19.47 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 19:19:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60267-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=ZnYdjP3H; 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-60267-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60267-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 E2FA61C249FB for <ouuuleilei@gmail.com>; Sat, 10 Feb 2024 03:19:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 98B803613A; Sat, 10 Feb 2024 03:18:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ZnYdjP3H" 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 B0D932134B for <linux-kernel@vger.kernel.org>; Sat, 10 Feb 2024 03:18:06 +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=1707535089; cv=none; b=nTkEtvwOn0szViifTSwDtL/nZKYY7LLy+6mY5dOv1Gr5FbvNj9p4iUAc5Ho2aElMe1HDbxXcrNQKilBGBy1eBqmgyPGb7tSahNpnb6x5boUOG+ZcA2ll9iYHOkx4KcEkmtOqV+ks8DLau4Tuql1ovAomC05RUDWADtjgrnChA28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707535089; c=relaxed/simple; bh=NlbGPHUjvYPN2VcnjTROsgfVOvtX5wfc2jhlMdVGruM=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=mCbibVHKMI42wukzGXomVR9kksJ10jjdc6QROUMsIPOIq8TNin/tJfshrb/HUogpuIZC7/nlhcFDKvSRtiq35zg0YxrMudFmZybn6tPl+mznHU/MeSKUGCy0DF30mlAjtyEJbfns5KxqKsGCva/+a8sdHJN/K0CYm4u/7o6oEcg= 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=ZnYdjP3H; 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-5efe82b835fso40458267b3.0 for <linux-kernel@vger.kernel.org>; Fri, 09 Feb 2024 19:18:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707535085; x=1708139885; 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=cCmA44GmuSEQ6KR355fhhypmUscD3id2lD2Aj801jbU=; b=ZnYdjP3HtTkPU+JzmqOwUWgjDDX8DA/CozgrchtAixilebiDQGVKBnXI9Ji17tUQ2r g/SQFMyiDWjZaXi6VHnsIBKSWiy4Oj9aw5/FgDgfAVbDl3HkJ5mfZuNBogE1lb6Idg2+ 9jjfqLMhIzaeT4bgKjpXe9Hx+KL1B9DB6tplU1O+9OqZOABB/Fc6AZxpeJ/+/PJBWtjY tSa4i77a/+wplygoZ9OQuJ64g/QA1j4fYIdtUJioTkML3VUYHMTXkgky8DuBNoiUXJXV EMYlSal2aiF+SxqLzadbqLo6eQPvsIMigVgWUr3sItk9OJy6HI2xM0YCG7HP8TQnbes/ tdLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707535085; x=1708139885; 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=cCmA44GmuSEQ6KR355fhhypmUscD3id2lD2Aj801jbU=; b=d7AXglc7Ei2U2d9BnBlxLb5jRE1JBg01V4GtLcUBZzPWsSvcV/1ejJmr1oeJ0GI/Eh MuKZi2hZglRgQibZCsT4y5kOwQ6pvyg1xn5Oyn2ZNeXnHDnG0aLK9d3+JQ6REkTNK0s+ xtUIvdlm9PtPVlFIW9/N7deXMRVCF7+WQPz+GtqV6AxDoagEd4O9GNapXYgoSK2Ao65g Ouc5RPpdZAzNxzgGzp6mNkT5qEk8TuEDAwBz6R0i8FM8eGA10b3ffIak3uJO8ocYpkz9 4PHt/+BfX4cy1SECgV2FPQiM3G3xHHJyl/aup4MeQGqBz3+sB+uFNBhc+HVlczTaYQKV tKng== X-Forwarded-Encrypted: i=1; AJvYcCXPad2SJlDbcvXUJcReid9D+jPqdr/aoOV7nhmSTwrEhV/Y/Irq91LmYikUBaUwOxwKlcs5fQSMvHEwv5iwUqauB3eIIptpkdj/VvBV X-Gm-Message-State: AOJu0YxgUaSEy8Tz9oyK/lpQb/GAnhBRZCPfbNKh4lfEgpCzM88NhvWM LlekIkGnCipncC5lKgdXO8EGrUDux50Sx1LWl0kXh6c62akNLsvxbf+bi0XbhTW2SAaa9WKaNfS UWxdUBg== X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:877:241d:8c35:1c5b]) (user=irogers job=sendgmr) by 2002:a25:ce05:0:b0:dc7:31f3:9f98 with SMTP id x5-20020a25ce05000000b00dc731f39f98mr241172ybe.9.1707535085769; Fri, 09 Feb 2024 19:18:05 -0800 (PST) Date: Fri, 9 Feb 2024 19:17:44 -0800 In-Reply-To: <20240210031746.4057262-1-irogers@google.com> Message-Id: <20240210031746.4057262-5-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> Mime-Version: 1.0 References: <20240210031746.4057262-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Subject: [PATCH v3 4/6] perf maps: Get map before returning in maps__find_next_entry From: Ian Rogers <irogers@google.com> To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>, Adrian Hunter <adrian.hunter@intel.com>, Song Liu <song@kernel.org>, Colin Ian King <colin.i.king@gmail.com>, Liam Howlett <liam.howlett@oracle.com>, K Prateek Nayak <kprateek.nayak@amd.com>, Artem Savkov <asavkov@redhat.com>, Changbin Du <changbin.du@huawei.com>, Masami Hiramatsu <mhiramat@kernel.org>, Athira Rajeev <atrajeev@linux.vnet.ibm.com>, Alexey Dobriyan <adobriyan@gmail.com>, James Clark <james.clark@arm.com>, Vincent Whitchurch <vincent.whitchurch@axis.com>, Leo Yan <leo.yan@linaro.org>, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790480416389497460 X-GMAIL-MSGID: 1790480416389497460 |
Series |
[v3,1/6] perf maps: Switch from rbtree to lazily sorted array for addresses
|
|
Commit Message
Ian Rogers
Feb. 10, 2024, 3:17 a.m. UTC
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. Signed-off-by: Ian Rogers <irogers@google.com> Acked-by: Namhyung Kim <namhyung@kernel.org> --- tools/perf/util/machine.c | 4 +++- tools/perf/util/maps.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 7031f6fddcae..4911734411b5 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1761,8 +1761,10 @@ int machine__create_kernel_maps(struct machine *machine) struct map *next = maps__find_next_entry(machine__kernel_maps(machine), machine__kernel_map(machine)); - if (next) + if (next) { machine__set_kernel_mmap(machine, start, map__start(next)); + map__put(next); + } } out_put: diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c index ea8fa684e8c6..df0c8041899e 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -962,7 +962,7 @@ struct map *maps__find_next_entry(struct maps *maps, struct map *map) down_read(maps__lock(maps)); i = maps__by_address_index(maps, map); if (i < maps__nr_maps(maps)) - result = maps__maps_by_address(maps)[i]; // TODO: map__get + result = map__get(maps__maps_by_address(maps)[i]); up_read(maps__lock(maps)); return result;