From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (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 83EB436C9CD for ; Wed, 8 Apr 2026 02:09:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775614149; cv=none; b=FZbC4dzRVewD1HVmT8uGwU2jAz/BY58ySCul3L3FVq4mlvGtsUx2pwnxcnBHhsxEC8ScfRcCbUVLBHlGHV33zFfSrFtOyuhNkQpkikyDrII0YHGq2WTlVSTud4cHFBHawx3S161QYuo3NsaQgFbPiaLFe8ZWtkeJoMnqQiVcueM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775614149; c=relaxed/simple; bh=PR8MNZhxCDgxVdk6JApNYOffCZu2rcwBtoxpFaVaxXw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=X4BreaJZeucn5TAtEQOLaNu997BkDwibsTZSdbxEXzdNeQmlornp7ehXJrB2ud50PfXq4VoJYbbkf9D2M5IAcL0aq4DdR1qDqik5JOldTU7Eif+hjPv84JsPmXtiTELoCKSV9WeuUqLWasTfl19Wx78BzdusXPdr0YPPglvpRbk= 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=Dq4jCgz8; arc=none smtp.client-ip=74.125.82.74 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="Dq4jCgz8" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-1273dfdaf5dso470596c88.0 for ; Tue, 07 Apr 2026 19:09:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775614148; x=1776218948; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=8DbmMGj/vxTCtEVQGakPXINHzX2eKFA0/buM7lOEXCs=; b=Dq4jCgz8th7mPLuPXC+bO14eM0l8j7j7jSn8QRn291THlWt3ntCKB8ZPg+9ynvwmER xdV+gY36za26c3m13/21D/MmsMMbTz23Pw6uMBdRh66Tk9Rfv6mIZFKaUiFc+/UaqUSM zdmDefuNB0hjkvYbqw4xX3MjjD940dWp2nApNnGV1cMhDzY+A4ZmctVKuHdvv2zHdpej 4F0x1K5f1MuZeWDH3inHBBw1wtGcrrXA3VI2mbNTqCkIWgwKKu0fZ6oh6/DKl0BYkCRp TXAh8fvecPcnvO+jTWp1u3t8+XbP7StfhUTKZCmSo8fsP4DLlGsjZFT/h4rDwRCdZBP5 qOwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775614148; x=1776218948; h=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; bh=8DbmMGj/vxTCtEVQGakPXINHzX2eKFA0/buM7lOEXCs=; b=eI+3saLxUjGgvvKvsKvdUXy/oUoEXyeabMkthTQvQS4QadybeF81QIRg9flP64wcGp KTwFmHjPr172tEfwWFWdqShd+ybQkCbTZ6lRRNCZgSIANTRCYXScINo9PvqzLojZNSIW oy/CpLnGabOHOxNtWvAaF6YOeJ38KMdE+vUkrWv1eOFIgLk/GVJFIp3ZWCyiCoIdQCdr fbxBsRAgxlFEaGntitrRcyg8XkUZHHkwL56psjzgQE2IY/trr93lU86Q4XQQre7vADio 16ZLS81gP1THSwl+pIsm7TnQh1O5W9sa8F2/UUnIIQQEae3Bkaq/hHDDjPxgJNYMQUC8 1J3Q== X-Forwarded-Encrypted: i=1; AJvYcCWHJCH5LHfJqeVTiiQCmp5dJeTk8dPshzNVAm7Y02ZpUTG6YYEfWfylcZq6exq9JGoBugZnsJMtJpJvdSQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzH8QXSlvLKyBT1/x4smoCpo49/rrV5OGS7qbbtk39C2p58BxZ0 kVjoIHznqnIViwJAF/yTD1+fpCLkKjuQT70psTuOb401QMDtAcd+b0+rhBrnIGWYQ1lq61lxayj gnr+iEltHLw== X-Received: from dlea1-n2.prod.google.com ([2002:a05:701b:4201:20b0:128:d754:39d]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:1284:b0:128:cf41:d6e4 with SMTP id a92af1059eb24-12bf0899182mr9071834c88.21.1775614147244; Tue, 07 Apr 2026 19:09:07 -0700 (PDT) Date: Tue, 7 Apr 2026 19:08:38 -0700 In-Reply-To: <20260408020838.166906-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: <20260408020838.166906-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260408020838.166906-3-irogers@google.com> Subject: [PATCH v3 3/3] perf maps: Fix copy_from that can break sorted by name order From: Ian Rogers To: acme@kernel.org, namhyung@kernel.org Cc: irogers@google.com, adrian.hunter@intel.com, alexander.shishkin@linux.intel.com, ctshao@google.com, james.clark@linaro.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org Content-Type: text/plain; charset="UTF-8" When an parent is copied into a child the name array is populated in address not name order. Make sure the name array isn't flagged as sorted. Fixes: 659ad3492b91 ("perf maps: Switch from rbtree to lazily sorted array for addresses") Signed-off-by: Ian Rogers --- tools/perf/util/maps.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c index b44bc41f51f3..81a97ac34077 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -1081,16 +1081,9 @@ int maps__copy_from(struct maps *dest, struct maps *parent) map__put(new); } maps__set_maps_by_address_sorted(dest, maps__maps_by_address_sorted(parent)); - if (!err) { - RC_CHK_ACCESS(dest)->last_search_by_name_idx = - RC_CHK_ACCESS(parent)->last_search_by_name_idx; - maps__set_maps_by_name_sorted(dest, - dest_maps_by_name && - maps__maps_by_name_sorted(parent)); - } else { - RC_CHK_ACCESS(dest)->last_search_by_name_idx = 0; - maps__set_maps_by_name_sorted(dest, false); - } + RC_CHK_ACCESS(dest)->last_search_by_name_idx = 0; + /* Values were copied into the name array in address order. */ + maps__set_maps_by_name_sorted(dest, false); } else { /* Unexpected copying to a maps containing entries. */ for (unsigned int i = 0; !err && i < n; i++) { -- 2.53.0.1213.gd9a14994de-goog