From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.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 D65411C7012 for ; Wed, 8 Apr 2026 00:17:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775607426; cv=none; b=EkaVYhr52K8GI2XLwmxjFZOHoyBd6BZS+EiqGwbAlmme7be6/FHz4z1Q9alodR+CC2NPxEGxmg3FJ2qe9IlR2SIJjpMd1g/IbwffcMq6W3xOGggIPe3AzZCWp8sxg+7cejn9Z3OjecDBhB8rz0VfQ4wu16fRqa/nsbl3TFJc/1Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775607426; c=relaxed/simple; bh=Z0qfPEhcP1eMPLjQVXjuVt68AeV0ZxAQxr7U/NbzAV4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=SI5J+aVihIgaxpsM0/JkFxHMEfinBW/x50ndaB/viFVsaJT7jCCFvoBNnwsUah0e18dXOWAFk976ttYrYZ75+BguG9IvWCFbdw1cVZwFXM3FGYQ6HzqxTsoTjb4sahoJA1S9eSDEHiymPsjQFC8O6sqlI7DgXuKycRpE1IaHaLg= 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=N0qI54LX; arc=none smtp.client-ip=74.125.82.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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="N0qI54LX" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2c4cfe08c9dso28500567eec.1 for ; Tue, 07 Apr 2026 17:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775607424; x=1776212224; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=Oo6VH0RKKqWyfDtOptPYYvi5gEdLGmyx0uq6Rgsqz/8=; b=N0qI54LXPlyqsugPm4425xQeVgtA/MPI0P/0xDhyWrOTSHk62rLkOdJirLECvl6NJo 1Y4aw/jirTGIMn0PAArkZfr41Q8CHaNOx0H6nUl1HFjfgV84ren16yF3tbJo/usi5hFw d+in8h2qIfHu3bb77LzycBXQYtlOgIu4R/E2Mb1ruecN7ze6U+r5q+Z3S004RCMGurQS JHZiMwxHvuJQR08cz65aCvhN1/StXQ82fZhSIyqrZ9HcgBR5t7MorGDxlnuWMpYL/k1p LN9uE8Lh6kIfDdi3dyBfb65jhexKxfZHYWtP9kz/sHQ7b0DLDM2RgKyOxiG0a0MQu/fI e4Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775607424; x=1776212224; h=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; bh=Oo6VH0RKKqWyfDtOptPYYvi5gEdLGmyx0uq6Rgsqz/8=; b=LyCZTwVFwIDxs2gAcZysq0L766aRlhvW+cq2NTkubz6MYj70yfbmO5/JUdF5XL8E5b IAWj3TUpTx5nOqFAVNKLKbl84M9WMy3BTg3yKBTLJ05s0aIB818Y2ZVV16K7ed0XYQIV B/Kh1Mj2rVOFEqNq6QJpizu6rhWnP1KQBnehlPJTaHea5Om3aOEfpjD8VEpvqTb/5hK7 gonSV4HOjRnPRDMbEWJDDWT8KSpDwRiEqlzfue150+JqOLsh2bgcYL8aNZ+QGGLFRe7R 8aDTAn/Q2fdEv/IU4rr1enhyZU3cFs3NVT+UFzdF5r9fLokxcSW+rNKxC23M+fNxlI+8 uvvg== X-Forwarded-Encrypted: i=1; AJvYcCXvAKuu3GbjBrtDgcDauVEhR3h5ac5fwTjS1PjuSlF3BkQ5MNse1IkTl4+UuifA1dltYpJ2KbOiAB4j2sw=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5xjvjAhu1jsNcP4q+wrscr1zYYEW7tpqacvYClFquSORgr/Ps aq0GFQuRQIQKtJ1XYquLCw9TISHaLWfT3CIO+/yH9PVTIIhS+ilzj0rPdDJVCPtq/Vo48ZFG7d4 vDXgY91t7GQ== X-Received: from dybfx18.prod.google.com ([2002:a05:7300:c392:b0:2c5:89d3:2645]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:e78d:b0:2c0:da6f:55e0 with SMTP id 5a478bee46e88-2cbfc362ac8mr9025591eec.27.1775607423743; Tue, 07 Apr 2026 17:17:03 -0700 (PDT) Date: Tue, 7 Apr 2026 17:15:21 -0700 In-Reply-To: <20260408001521.102140-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260408001521.102140-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260408001521.102140-2-irogers@google.com> Subject: [PATCH v2 2/2] perf maps: Fix fixup_overlap_and_insert that can break sorted by name order From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , Chun-Tse Shao , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" When an entry in the address array is replaced, the corresponding name entry is replaced. The entries names may sort differently and so it is important that the sorted by name property be cleared on the maps. Signed-off-by: Ian Rogers --- tools/perf/util/maps.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c index 7dd6da9d1e4f..b44bc41f51f3 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -955,6 +955,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new) if (maps_by_name) { map__put(maps_by_name[ni]); maps_by_name[ni] = map__get(new); + maps__set_maps_by_name_sorted(maps, false); } err = __maps__insert_sorted(maps, i + 1, after, NULL); @@ -981,6 +982,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new) if (maps_by_name) { map__put(maps_by_name[ni]); maps_by_name[ni] = map__get(new); + maps__set_maps_by_name_sorted(maps, false); } check_invariants(maps); -- 2.53.0.1213.gd9a14994de-goog