From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.72 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794941383; b=I6cMZZ6yeeUGdc8MdckAMexkUFC9N7uLrH6Bvjin5zjYY+tqdYUfg+aVl/XHqHV4Uqa2 /VyuQmFNh6ivrrHK2akKyhNkJIGFGmY1W+BuwTWk521Fa3YYMzzcQ0t5a84XnJ2puiY5i t0RXsaGK6aRhAxGvCLl+d0frKhzb9l/Zb0cBQC8sGHqXMOnXdpIoaCt/lkMfRCccw4P/h hvAoCtfI/k720wLUzyV2E137U4cZOPk5ERs/MhxQf3NFLGl3Ti2J//PCCVp6cCeM728RE 1ExuM/RhlPOz3rvqwn9tawi6Q/tloyCBFtviFopC+I3/uXyBRwlK59Bg5eOCZjcWeuw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794941383; 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=cIns1XYte8UDzFFuNR3YrTGqD06ckSGcPH9S6KlBvtI=; b=TGwXt4jkunF3Al3/BETMdmSuTaQf9APkSBpsyfhxv7vp+qn0OwcvCosIRMwnYtTZebzi j4xGXeiI0nVetSj06L0+gXzs38KH/cewZOBNfzJs/AquI93fGnE+tT/vpDO58HtKtL6te Toqk7FUxzPwnmtasR5V4z8KP3bpwTIKniOvemRoOx67hIbRzxaCqyKnzU2HS/e4E9LkMn yzemfs/+Hvx1fh1o+5YJOF+6j+nbrYyNjpJV3hSrY58BAVnEpbpSYvVMrAt1ZJJFnuSjz dtvDJYXKahSJIkYl4jqHv4B9K2ROwG/3n9G9lhKPT2OhJ5TqJGLncrzx2gbjvdWT6xw== 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=KcbUTXKi; arc=none smtp.remote-ip=74.125.82.72 Received: from mail-dl1-f72.google.com (mail-dl1-f72.google.com [74.125.82.72]) (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 5F816606A8A5 for ; Tue, 17 Nov 2026 18:49:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 5F816606A8A5 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.a=rsa-sha256 header.s=20260707 header.b=KcbUTXKi Received: by mail-dl1-f72.google.com with SMTP id a92af1059eb24-1af203073e0so125484c88.1 for ; Tue, 17 Nov 2026 10:49:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794941382; x=1795546182; 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=cIns1XYte8UDzFFuNR3YrTGqD06ckSGcPH9S6KlBvtI=; b=KcbUTXKiIISiQrhN+tqjfw1wJazs8I7PQbXSul5QQlF1kzy4m0NuqCWIgN1i564ung 4l7FlyypuqV0Y+yN94ccN6uOl2l5ib1xGYkH0+uXjYXDv7+B3QntNL5SC2iaVh30sHpC uE8EOmNHaRR18FRUIe7qiaYxhOBryuRk3FnYoyvHFs05VoDtX7X8BgG2l7Y7sJLCDwkL xHekpRuYhrX/WcpIF5MImCHO+A3SGVoLCLpvopBKLy+49qNGU89tkryY+5Cs9F4ELbvA Pon2OPPGZsGq3f4a1idekt5CO8ApS2jHd4CkGLuVy16K8ElFIkvjghefzx7/vRtobkNQ uSIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794941382; x=1795546182; 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=cIns1XYte8UDzFFuNR3YrTGqD06ckSGcPH9S6KlBvtI=; b=joOe7e/9WGtzdTqm89JtVATbgctLHG8ScSyoE2ziIZZhgfNI7jsLo8uNiS2oE6T3iv HwNI4NVM8kOPkSI8/pyBxTwZtWlWEb3cFKaAbFwByXt4uCiy/VfJe9ns/u8CDLKjkuyw wn/t7YhUfSmYKETZ8+3nAQyxd/xz3ZXKN+ixZAO9GEsSwIjaMq9nzDiPKvTb7K+c3ZXh PN/X/r3oiyeMV2wHI3Pfutm4po+EI4y3Xg7JBIudPy+sPk3WfGz+fKXDw8c5TK5jWGMQ W4rvi1dx23hkcZZiELPuc5DyhDWb0fNYYRpRWzVTIcJ+5tW2PlcvoYU/4ifPeUs+URc8 g7sw== X-Forwarded-Encrypted: i=1; AL+hErE9QtKZHgtOYiUNisMwhB9QasLn2eGyZ4Nf3h8FZIJPuNBWrydt8ZTht7H6jsrsBbkfE1IacQbEkRXHVUWRyYM3@vger.kernel.org X-Gm-Message-State: APuU4Z+WEJC5NbE9EZu50TIfaXvbK1m5bMZgLaZvN0rAH2Z26XOb5UHu OwN4eX8iX4p68Obo0gLptDD7xUhWywamSsp6E+d0fCMCAigf+9Ie6hz11KUwhKqDPcVD4VVfp+e AHI5QUR/AZw== X-Received: from dleh20.prod.google.com ([2002:a05:701b:4354:b0:1b3:befc:72bc]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:701b:20ce:20b0:1b3:af3a:e78f with SMTP id a92af1059eb24-1b543be37damr377223c88.27.1794941381255; Tue, 17 Nov 2026 10:49:41 -0800 (PST) Date: Tue, 17 Nov 2026 10:48:40 -0800 In-Reply-To: <20261117184844.99889-1-irogers@google.com> X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261117184844.99889-1-irogers@google.com> X-Mailer: git-send-email 2.56.1.703.gf848ed807c-goog Message-ID: <20261117184844.99889-20-irogers@google.com> Subject: [PATCH v14 19/23] perf maps: Fix lock inversion in maps__load_first() From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Marco Elver Cc: Bart Van Assche , Jiri Olsa , Adrian Hunter , James Clark , Weilin Wang , linux-perf-users@vger.kernel.org, llvm@lists.linux.dev, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Ian Rogers 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. Fixes: e77b0236cd0c ("perf maps: Add maps__load_first()") 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 675fe0223faa..7e863f0f4a4f 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -1460,10 +1460,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.1.703.gf848ed807c-goog