From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.200 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793948669; b=rQSjWUOMuOGM3BPJgrvCYFzY/mi+3n1V3zghFXe8vt2NvuQvxAuiY+G7fmcgOUsf6Ktc XlNB4IvM2IOcoub61CRRzVp5W9RoF+q0oJXLCEMAO3o3tHat4jTHyCqmGqUlrFzcL14U1 zfWv6SyQGHVo0ooQXwaGNPqhrtzxT9kzsXqE+AQ6HflYvginY4DRdBcis9rLtSJoKAN6W khANojoGaAtUifk9o/oR8CWVctzWtZYXPbNGNHoiay6gonY5m9xyhmER1EzTze7LVDi9C 18v0FDlFD4y/AG/o1nOH0L85i/PwAf6gLErOuj10Nfk55NAwj8YjuxEkZiFRiTbZgEw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793948669; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=jPaRO8oHRGj9zo+g5wm6NL8QtaNqCuHhACg6/Ph4t2I=; b=LHFo1AmD3Bdo1QTOx/yKQnllpNWha56lkAkH6bg88OfrGoFmFpDFT6v8T9PbD5shLz3t +bFKUGokgChOnwn70Lx39UQa9fxvaERGxpY35KODCIDZZQYrYzeBNWUJmb6kz/iWHahA7 GoV71BLxZELCExtWAgR10h8Nd7OcyJxvx1QKuNlrlZ7kV1maGGrdXJ5q5x6gv67X63rPo M9mPcV7VR73Zyfhd8/CB8E/0EnmPYHYX8VIWyBQ54mTtchHePhesobt22v+exSYKscOp5 4jXpynBvhM42zfcpN7iVARtn/5R6mbtbg29KOjWFngPcUSWjaq6rEckwP1h3shsWwPw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=I+lqxi8U; arc=none smtp.remote-ip=74.125.82.200 Received: from mail-dy1-f200.google.com (mail-dy1-f200.google.com [74.125.82.200]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC1F9606EE85 for ; Fri, 6 Nov 2026 07:04:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org AC1F9606EE85 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, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=I+lqxi8U Received: by mail-dy1-f200.google.com with SMTP id 5a478bee46e88-33713e5e6daso518490eec.0 for ; Thu, 05 Nov 2026 23:04:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1793948668; x=1794553468; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=jPaRO8oHRGj9zo+g5wm6NL8QtaNqCuHhACg6/Ph4t2I=; b=I+lqxi8UeUTsgak0qPdMOUy2UHOVDa7n/VTCGKsDSqBoNu35G/tXR7aW+fqtMboUFy uT45vAilzUlnQfKuX5ZMs4bBek1+OqDYvveSgMtccMqo3ENkitcKqgiOeWK1OP0eIxfq ANfaiqFPNlRezl1a1Y1a/eOkdrVxeH78jBIDno7n2tkXDRNp3BDPpR6Ai4e2JM7+kSWJ M1CB5//dQ0d1C2MGU1fWbDGuqImRsfIk7J7tdXLrtvhgiITJXDORqTavBJxsYoGbsMvx +WvxJQ2vVLBTlG709Xr4PsT2NWCXaHxRlRFZj4eedGkDx8tWC0Z+0OxfJyCyBXd0aKCn K3uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793948668; x=1794553468; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=jPaRO8oHRGj9zo+g5wm6NL8QtaNqCuHhACg6/Ph4t2I=; b=fgQ23URU29grrpNQngYXSD27MvvSNSi/t2tENtjMTTF/rU0Uz15hhdcJ25iuRmkI07 B+cgFoYeoRPHJLeQSAKkPp00yEcnj+SpkYbhr76Ym2/9cAggYvoJM7XBI34DpC1gnXG5 aKjCOBxDazZD/S8MidqNtp3i0bziQDMxvY0DPRQXKHl6/yVHlBvu65IzqLmPOfK6IKzE NR3PIl+R7NNVdOft8przlVzqf/vbJuqej7c1oSpNlASEFSJedMwRvSYTcSz/tY/fOUl5 Sc5eRCCa0WdgoKQkoudKb5sGn0CXWoh9qFdJpW1FMVn976foQKJeM374+4CVIM1zofrA eZHA== X-Forwarded-Encrypted: i=1; AKwUvBxKs/7zr+M6pUNVRHS4b/hzhbN+/UQVV96uePBorm0pZ7napgPODVlgKhwLMIXJ++WpLyhFI2EsLRZAGik=@vger.kernel.org X-Gm-Message-State: APuU4Z9ZbvSNwuEcqZHljY0Qv41+rb/lMrUbTVCGOgSefl+7mg3RIuoD LKAWXmGxNwtkM5TDf8pEoh/+RCl5cFGqtpdMFAuqzVtEKoNQiMbpzDMYyzInV24oSFlF7YVO9MR 5S8kw1VqT2g== X-Received: from dldyq20-n2.prod.google.com ([2002:a05:701b:4554:20b0:1b2:415b:9bf4]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:170e:b0:18a:8164:ce4 with SMTP id a92af1059eb24-1b25d1e3e6fmr1997788c88.0.1793948667649; Thu, 05 Nov 2026 23:04:27 -0800 (PST) Date: Thu, 5 Nov 2026 23:03:42 -0800 In-Reply-To: <20261106070344.329897-1-irogers@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261106070344.329897-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.455.g6c5a503b38-goog Message-ID: <20261106070344.329897-19-irogers@google.com> Subject: [PATCH v10 18/20] perf maps: Fix lock inversion in maps__load_first() From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, bvanassche@acm.org, elver@google.com, james.clark@linaro.org, jolsa@kernel.org, justinstitt@google.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, llvm@lists.linux.dev, mingo@redhat.com, morbo@google.com, nathan@kernel.org, ndesaulniers@google.com, peterz@infradead.org Content-Type: text/plain; charset="UTF-8" In maps__load_first(), take a reference to the first map and drop maps__lock(maps) before calling map__load() to avoid a read-to-write self-deadlock when loading kernel maps inserts extra trampoline maps. Signed-off-by: Ian Rogers --- tools/perf/util/maps.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c index f808df2fe77b..7ca33e5218e7 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -1459,10 +1459,15 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map) void maps__load_first(struct maps *maps) { - down_read(maps__lock(maps)); + struct map *first = NULL; + down_read(maps__lock(maps)); if (maps__nr_maps(maps) > 0) - map__load(maps__maps_by_address(maps)[0]); - + first = map__get(maps__maps_by_address(maps)[0]); up_read(maps__lock(maps)); + + if (first) { + map__load(first); + map__put(first); + } } -- 2.56.0.455.g6c5a503b38-goog