Message ID | 20240207223639.3139601-5-irogers@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-57263-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2546336dyb; Wed, 7 Feb 2024 14:38:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHXhenKI6Fh/M4oJ6KiGbMtVtDbr7w8uyhkl+hg/ClR07PNOZaZyme8iNMiqPWNpVRUjd2F X-Received: by 2002:a0c:f584:0:b0:68c:b64a:dc88 with SMTP id k4-20020a0cf584000000b0068cb64adc88mr5855930qvm.41.1707345524835; Wed, 07 Feb 2024 14:38:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707345524; cv=pass; d=google.com; s=arc-20160816; b=WXAYnPrYrCshAppfFiDLBhkjj5ZmS7T2mEeCIpJ15IERH3kBysGiWxN5UfRk7c/u6z lcyUyTnf8RBEtZocGm8X7+YtHnqRKhs+cnNqGSI90h87az5L90mXYTswbyBRqdOJy1lO SRwf5IdbbUTB8WP3PryfDmwUUslV72MTSEWXhk48eOkFU/cPT8Z27N1XQAC9NIsqZfYf SEvEhB0xyDzAvX1bWFXO+Q2wvveukiKmjw8xgyMwUK1OMZRIcGdOnaneuHkqDZRR4TD8 82qJ1GaMTebjvCOLEwjpY99UpTBZQJfASoyM352t+mJiAp2C7l264pv9mIsmGC1cTPsG rLdg== 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=Ay5pESXQDW6zysG3DCALcAImBiyx5FS+UI74K+BRnd8=; fh=s1iSawccJXeuQW8HaegLMk2YNcRz09J6fH6nAWB0Y9E=; b=AIq1hLdcn8MYQtQ61hpzJuQDsbQnWAAnuOykNDqtLFR+GG4oxZfvBIm8NNLys1TwMo Lug9NwjZVLcQnP6gu7xOQ5BFRfpxnn4bRQm7zbGBx0R3OGhu9vbT6Ib90LNI4hAcDzrX yMI+hAivl+qxsm39y6eAEQf/HvpZBFd1nUNNaql6G1hJRG7uUsC2jO+Egv5M246MipGU WzSkyQfVmHt5cywLILHW+JDFgJaMxFaFcyPfUsJT1E3/cYJ5ZrgjpI2LyuOPti00zPPu +cECY6VYjpFSPdCvka6d6EWT4HKYKLDylWW7OIEUxpY4aieEWLLoUh/I7f/3VOUweHuy au8w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=dQsXdthF; 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-57263-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-57263-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Forwarded-Encrypted: i=2; AJvYcCWAI1zuUyCqseWLMK9aOvT2qv82d83R4R11HcXleKkx2g12s7kolXg08Q7Ok/RG9NQV4bPIcfxcHnETU3VqXZC2t5/Y7A== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id c8-20020ad44308000000b0068c891918e6si1988874qvs.93.2024.02.07.14.38.44 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 14:38:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-57263-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=dQsXdthF; 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-57263-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-57263-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 7C21E1C236D4 for <ouuuleilei@gmail.com>; Wed, 7 Feb 2024 22:38:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8825869301; Wed, 7 Feb 2024 22:37:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dQsXdthF" Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.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 57FE620325 for <linux-kernel@vger.kernel.org>; Wed, 7 Feb 2024 22:37:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707345439; cv=none; b=OlyBu+6glP72dwSxhBd5ADFCfMDduB8Dnble1nrBn8zwkiv4dy1EmkUVpWNhr9mUWh+DSYl86reA9MbqsZFW9/l4KHupMMAdBf2hVp4dy5dSPCMIeTELXG9cYjk5c68k2K1olGL5XxwrvdEewSU83VrtT6VDc62iIAMgplwlMOU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707345439; c=relaxed/simple; bh=5X1qsUi3skYX0+XJLWX/k8pq64P7f+cfj6l98r2VoJ8=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=FofxzU4jIvWztczqte7xK5USDpMjrdnFPVCjH1xde7lsyhCEDcw6gx4O7eHIQyslo84LsKxhnsqiQ8Vq4DOM96pd+jfOT+tT4PJndN9+bL4ZhgsbO2eYB9RZizE+1uXCeExmwfk73eZHIv7KmFSY9aD44poTzBtYXxhGPO5CeCg= 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=dQsXdthF; arc=none smtp.client-ip=209.85.219.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-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc6bad01539so1673034276.3 for <linux-kernel@vger.kernel.org>; Wed, 07 Feb 2024 14:37:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707345435; x=1707950235; 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=Ay5pESXQDW6zysG3DCALcAImBiyx5FS+UI74K+BRnd8=; b=dQsXdthF7lP2EUNImu/ot0FOmbNBfIXa3gz4jhwCDy48qoxUU/n06nNnBW06ewwqB2 Svu6OZZoJqWdZdvhrh4U1QWvoNQjaRcEry0Iao/ARGbGn9axVs1PQnh9SveHx/365CPl HyN3yqNNXnf4x0nDTJ+s54A4JKc7G3KJrXZVGvBLkVCdBs6eJ84QdE2kwyomIX/oVJs9 7oY5KeRaTuccN2DexDY+8Dw+l7Eq9VhlGUi9QtWJDBi3+dHE3UypRfn890j06zJ7ri2Y B0SgmJn68FzCicJU5Xl9ITwK3FVB0TubEQ0iuDTKO3OmEkSmq4YUk5UK05WYPIElsLSz FbOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707345435; x=1707950235; 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=Ay5pESXQDW6zysG3DCALcAImBiyx5FS+UI74K+BRnd8=; b=r18ltK7XMOCSW6YMWex6Hi6tK8SpZ2p9sAmbs8tILHhMa+aFQ9H7a/DnbWlcGxuQk7 tpSXh7OeKZEN2aOhDRg/e1nf6ml7VfZ4joQfOFY10ed5MW5pjow8O0pCHOao8V0WabBU GMxF79w2pRD3R5i5X/JlUc+4tg9WB3mo7VxptrOFvMvvTPjWbbeyJfeGiKfVoNUBt4qJ QtmRuho+JmMW+vWDJMWetsZV0WSUzi3uduc7UYOpIyuJ5i4lVB26olIAQ6zKF9OcRCsS Ki2y32j3IZmzZN2s8EibDb4+I11UiBcTUrDzE548OrbDRwbuo24+1oazvdWgKuDXf1Fc +wAA== X-Gm-Message-State: AOJu0YwaFoQ/Fj0YpfD57Hh9sA6Al43rXEZsj4thzetrjgUiBt+FfRHc jiBNUiI0f3rACrhIccRk4fOO1HwUsatq5Dp1TKqwrunYpu2PmpxZJcQDIRwOUUYxk98AGaAwwva Lq1cIkA== X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b420:757c:5706:d53b]) (user=irogers job=sendgmr) by 2002:a05:6902:2205:b0:dbe:387d:a8ef with SMTP id dm5-20020a056902220500b00dbe387da8efmr230404ybb.1.1707345435298; Wed, 07 Feb 2024 14:37:15 -0800 (PST) Date: Wed, 7 Feb 2024 14:36:37 -0800 In-Reply-To: <20240207223639.3139601-1-irogers@google.com> Message-Id: <20240207223639.3139601-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: <20240207223639.3139601-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.594.gd9cf4e227d-goog Subject: [PATCH v2 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>, Miguel Ojeda <ojeda@kernel.org>, Liam Howlett <liam.howlett@oracle.com>, Colin Ian King <colin.i.king@gmail.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>, Yang Jihong <yangjihong1@huawei.com>, Tiezhu Yang <yangtiezhu@loongson.cn>, James Clark <james.clark@arm.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: 1790281541163591794 X-GMAIL-MSGID: 1790281541163591794 |
Series |
maps memory improvements and fixes
|
|
Commit Message
Ian Rogers
Feb. 7, 2024, 10:36 p.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 f4855e2bfd6e..e577909456be 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -956,7 +956,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;