From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (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 7BC123DD84C for ; Fri, 5 Jun 2026 18:52:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780685544; cv=none; b=EUlvr3UHbaKqzBHER+D2BwqEmr9/nLJPzlPAUAJHLtz58X7sYtSZp9OfFlvnOT2vhB+P9aWnt0/1Kw3dNi89Jw7QQk1LXV1om7J4O8BJ94dIlLsDkwKH+5oZ+UNEdUjb+tpQhUKF9MRvutzQWu7oGGRegB1ryAEf6qxY1S5xrNc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780685544; c=relaxed/simple; bh=srtociLrvnHcEG5k4tyCKuohlja7a0PZRB9ks+X2Psc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=G5ix7MYg1JgdYbbNOiezXfIqZxW/TkltvgXNqcK9nECzUDnkm+GhW2ZDp8eJ+Ss93Vye1TOrgCWY8RpOpbHIC6OTwQ7bHJYuNW1Csj7cbOpUlyISJozgah5Ae6Ckt7IbZJdYOxS4R6uq0V9JLUygU2qvo+GNV4XGMznAP3YUrq4= 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=qCtRDuJp; arc=none smtp.client-ip=74.125.82.202 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="qCtRDuJp" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-304e7fc90b1so2093044eec.1 for ; Fri, 05 Jun 2026 11:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780685541; x=1781290341; 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=yZcrYQ+luWhsLSl8+NQJSOjgtxCMzT7GK6goxdc/VEo=; b=qCtRDuJp7TqswXP8xxlhmzC/KhdGN5bja3LhSkaSzSKqO/S2OS88KQl/z8apPH/TCX tB+2TwMsgHNeubJUwLVCEOhH4W6CdvcPpBB3p8Dix9yTd8aUHEBZj27CWKaoEeRbE4ox rJFcyIT/33uCSyZhcy88/ohh5v2S7bOgr1eLW+Gq3z/Zl3eOnTkNXOeMnjrRT9hsJcKe 77KuMDPqjh1s/r4rbbWWSq3UqVQ2EexI2Z8ZK2dQcXpmJ2UhtRyvGNPCQsGUZybsiS7J d1xFG0WngKG0+ZCuRkWMWVD1dtErTjNnAMoM5ZDIBiC4EgJ3ZwrKY4kat5zZAqOyy00F 6k0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780685541; x=1781290341; 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=yZcrYQ+luWhsLSl8+NQJSOjgtxCMzT7GK6goxdc/VEo=; b=CcbpaVG9N/aJGOZsgVCPVU265NnCOmpBP3WeBJdjyR4Lx9aW8zwx5fML5+KKunFdzp xoPa/3wnD63wychNufQ+DvN3AiciushKRBhtlKGf9L+Kx/OgoUAN8tG8nI7s5mbua++/ mu9gSRbgy2VdSY+CFm49WuQlrl5GM5gjRwX6wvB31aQZ0iP1Dl4QPpjzLLgD0MAnpWWD PrNqQQKIrUqur9SxWcGPBm6jz48C6ydftaKyzGZKrRXzApO5fyhCIB/jJ6/wjdxewVYW ErU3YlDnn7TBFqChfr4OGY1qQ/22BeZRIDY5NKyoM/tyaUhs10Fy47TxdGfCLPhYiT4x Ikxg== X-Forwarded-Encrypted: i=1; AFNElJ9iOoR0QszUgpJd7TU19oe9gSvQZx00Xim7b16IQe76Yt2ByZsMoSi1T05T2JLWytD4PTYWL7Oa0fSKSNA=@vger.kernel.org X-Gm-Message-State: AOJu0YzfjkZ70c3gVEr6Y4xguJNEwASwRCIeavi032q3pEC6nvsr5X3b paq8fj5pWGpAsACUbH5ZdwqaTuSeYCLqir8dGH7qS7nlerdMlJl7u8S93Gv7q4ZQtbcEgXqoZpo FRxQlNnpJNg== X-Received: from dyry5.prod.google.com ([2002:a05:7300:8c85:b0:2f9:af7:504f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:cc0c:b0:2ce:25be:c8e8 with SMTP id 5a478bee46e88-3077b22a360mr2713034eec.17.1780685540344; Fri, 05 Jun 2026 11:52:20 -0700 (PDT) Date: Fri, 5 Jun 2026 11:52:10 -0700 In-Reply-To: <20260605060610.1529996-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: <20260605060610.1529996-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605185215.2359881-1-irogers@google.com> Subject: [PATCH v11 0/5] perf tools: Add inject --aslr feature, early maps loading, and decoupling fixes From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, gmx@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" This patch series introduces the new 'perf inject --aslr' feature to remap virtual memory addresses or drop physical memory event leaks when profile record data is shared between machines. Bundled with this feature is a bug fix inside the core map tracking tool that hardens perf session analysis against concurrent lookup data races. Detailed Mechanism of MMAP Mapping and ASLR virtual Address Allocation: The ASLR tool virtualizes the address space of the recorded processes by intercepting MMAP and MMAP2 events to build a consistent translation database, which is subsequently used to rewrite sample addresses. It maintains two primary lookup databases using hash maps: 1. 'remap_addresses': Maps an original mapping key to its new remapped base address. The key uses topological invariant coordinates: (machine, dso, invariant). The invariant is computed as (start - pgoff) for DSO-backed mappings. This invariant remains constant even when perf's internal overlap-resolution splits a VMA into fragmented pieces, ensuring split maps resolve consistently back to the same remapped base. 2. 'top_addresses': Tracks the allocation state per process (machine, pid). It maintains 'remapped_max' (the highest allocated address in the virtualized space) and 'orig_last_end' (the end address of the last processed original mapping). For each MMAP/MMAP2 event: - We look up the DSO and invariant key in 'remap_addresses'. If found, we reuse the translation, preserving the offset within the mapping. - If not found, we allocate a new remapped address space: - If the new mapping is contiguous to the previous one in the original address space (start == orig_last_end), we place it contiguously in the remapped space. This is critical to preserve the contiguity of mappings for downstream merging (e.g. symbols split by HugeTLB, or anonymous .bss segments adjacent to initialized data). - If not contiguous, we insert a 1-page gap (using page_size) from the previous maximum allocated address to prevent accidental merging of unrelated VMAs. - The event's start address (and pgoff for kernel maps) is rewritten, and the event is delegated to the output writer. To remain strictly conservative and guarantee security, the tool scrubs breakpoint addresses (bp_addr) from all synthesized stream headers, completely drops PERF_RECORD_TEXT_POKE events to prevent absolute immediate pointer operands leaks, and drops unsupported complex payloads (such as user register stacks, raw tracepoints, and hardware AUX tracing frames). Verification is reinforced with shell test ('inject_aslr.sh'). Prerequisite Bug Fix (Patch 1). During development, a core map indexing issue was identified and resolved to prevent concurrent lookup data races during session analysis. Changes since v10: - Patch 1: Added explicit tracking array logic in maps__load_maps() to correctly accumulate valid maps (skipping NULL entries after failures) and safely return the exact populated count, resolving out-of-bounds pointer iteration panics. - Patch 3: Fixed endianness bug during cross-endian sample parsing by passing evsel->needs_swap instead of false to __evsel__parse_sample in aslr.c, ensuring correct 32-bit field byte unswapping for packed fields. Refactored evsel__parse_sample to take a needs_swap argument via __evsel__parse_sample. - Patch 4: Fixed inject_aslr.sh exit code handling in trap functions to capture and propagate the correct pipeline failure status code instead of unconditionally returning success or failing the test. Changes since v9: - Patch 1: Added `-ENOMEM` error check inside `maps__find_symbol_by_name()` and return `NULL` early. Added map sorting state invalidation on early return in `maps__load_maps()`. - Patch 2: Fixed encapsulation by using `thread__maps()` and `thread__pid()` accessors in `aslr_tool__findnew_mapping()`. Added `pr_warning_once` warning when raw auxtrace data is dropped. - Patch 3: Fixed encapsulation by using `thread__maps()` and `thread__pid()` accessors in `aslr_tool__remap_address()`. Wrapped `evsel__parse_sample()` to temporarily disable `needs_swap` to avoid branch stack endianness corruption on cross-endian files. Fixed ISO C90 warning for declaration-after-statement for `orig_needs_swap`. - Patch 4: Fixed duplicate cleanup by explicitly removing trap handlers (`trap - EXIT TERM INT`) inside the `cleanup()` function. - Patch 5: Fixed heap corruption by adding size bounds checking before writing to `sample_regs_user` and `sample_regs_intr` fields. Added missing register mask clearing logic for the `itrace` synthesis path of `perf_event__repipe_attr()`. Ian Rogers (5): perf maps: Add maps__mutate_mapping perf inject/aslr: Add ASLR tool infrastructure and MMAP tracking perf inject/aslr: Implement sample address remapping perf test: Add inject ASLR test perf aslr: Strip sample registers tools/perf/builtin-inject.c | 79 +- tools/perf/tests/shell/inject_aslr.sh | 519 ++++++++++ tools/perf/util/Build | 1 + tools/perf/util/aslr.c | 1262 +++++++++++++++++++++++++ tools/perf/util/aslr.h | 41 + tools/perf/util/evsel.c | 6 +- tools/perf/util/evsel.h | 10 +- tools/perf/util/machine.c | 32 +- tools/perf/util/maps.c | 149 ++- tools/perf/util/maps.h | 3 + tools/perf/util/symbol-elf.c | 41 +- tools/perf/util/symbol.c | 17 +- 12 files changed, 2095 insertions(+), 65 deletions(-) create mode 100755 tools/perf/tests/shell/inject_aslr.sh create mode 100644 tools/perf/util/aslr.c create mode 100644 tools/perf/util/aslr.h -- 2.54.0.1032.g2f8565e1d1-goog