From nobody Mon Jun 8 06:36:39 2026 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 CCA01380FCD for ; Fri, 5 Jun 2026 18:52:23 +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=1780685545; cv=none; b=QIdQaelCPAg2JgERXJmG6X2ecZI74+CLjZTkmC9xGgFag2LGUtbvECbrWD39dndqp1pfIknPHBKM5mgpfFTLmus3aZrBoe3ZCJXN1QBd97j3F8xEmpHLvS5CXr2ZfY++K/DYjxq1FctfcOLog4bgIfpTmMfUpagkNc39OS4BW9M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780685545; c=relaxed/simple; bh=hqjl4BQ1CZcBfRv7ia0zKnf1uzzlkkyf23cuzeJlqlg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=L+Lmq4TmDef7i3L5hBii+wIAXO6RMykIFeDqSQVchhuz6Ggy71rQOBVXbvtBQ1N4CmMd1p9JpSUrTfhyXjHpakedS5aTa8OLsaGeYVOS0FwCHxuobgwiKyLHyc7D6cqNgGHokYS0NpRC4z79Ex8VAbqWQ1XJ7Lm1NroCSsaufNI= 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=Sfp7ti1c; 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="Sfp7ti1c" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-304b8d0ee63so2971664eec.0 for ; Fri, 05 Jun 2026 11:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780685543; x=1781290343; 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=vNE7rCsbify0CWRqFtGIzJaImEq3MEp4hN813xt5Ojs=; b=Sfp7ti1cxBOM98WiDcrEzr3zvROiQX7bRJ2l+13D7GLDQljpUys5CEIOzIgIXiqs0Q AbcIdfc/o+Rn5PZDp8/erYfWlrrNXJRoK6dSHMJdzzQ5uuEhoZHePnwl15J/vjibwM7Y 85iBRAoVf/upBj9Ano7voeIA1N7OPXN8dC4WBJ5nNt0yWSyBuM6qrDk72u3ghuZdle+3 WZbrvJgsN9FyXHl4bkHsqO88QIAIwj03NPcDersxh1VIQtxwOY9Ij3D838LvZGNxv/6Y vIGL4X1+nee7LV6un2T4Lk/QIUjquLWERIvYBi6v/9BscHUCj4q9fllZxUsTf7Gj5Io7 j1tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780685543; x=1781290343; 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=vNE7rCsbify0CWRqFtGIzJaImEq3MEp4hN813xt5Ojs=; b=kzevW69JXbVVD+pLBj91m1RturhSVGwhGt8E3m6bmbxytonQW3NxkS38ztPQJhEqoU g0fniZHHANuftV+R2IwaKsm6yM6WUJn9MhRJIiYEEBs6f5pcjTqfFh0jMOUetJTA5ADV W8StlMWcCr5hiCr55p2HaK+VwlWF3ZOcSSFVasjgKFHbwjoeIGuIoemFU0A8UStd4oiv EiBnp8XjmyYwJXn4pctHGYi70JArYAdMmAq1kbGyIwbw+Dx641oMFjHT67DEqZiGD44e +C/vGjZSnuITnV9UunWdi2NiVNsmq/QcUK690wYyAIKVSdve7RcJbidGcmjsTflwjznI KMrg== X-Forwarded-Encrypted: i=1; AFNElJ+JpD6KrUDwhZBcp1VU7bRpbx/f+r/Xx9XyVXOZv0bue3//MLdobIIci+QUv0sW78tndzSRo2XmWf1PNl8=@vger.kernel.org X-Gm-Message-State: AOJu0YxtaehoF8rpUeZ6PSjZ4J6s4n1xIC3L0VuqOXGwXSYe/ONeVagQ Iw4CM9ZkMQws9LPOqelALGJaG4VtJPe3+uqm+58kPCttvoLeN044b15+XwiiHOAJK3vOUu+ypUE jIj9wFSwQ6w== X-Received: from dyrp26.prod.google.com ([2002:a05:693c:69da:b0:2f9:af7:5050]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:9bc1:b0:2ff:c611:82c7 with SMTP id 5a478bee46e88-3077b0847camr2531337eec.12.1780685542686; Fri, 05 Jun 2026 11:52:22 -0700 (PDT) Date: Fri, 5 Jun 2026 11:52:11 -0700 In-Reply-To: <20260605185215.2359881-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> <20260605185215.2359881-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605185215.2359881-2-irogers@google.com> Subject: [PATCH v11 1/5] perf maps: Add maps__mutate_mapping 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" During kernel ELF symbol parsing (dso__process_kernel_symbol), proc kallsyms image loading (dso__load_kernel_sym, dso__load_guest_kernel_sym), and dynamic kernel memory map alignment updates (machine__update_kernel_mmap), the loader directly modifies live virtual address boundary keys fields on map objects. If these boundaries are mutated while the map pointer actively resides inside the parent maps cache array list (kmaps) outside of any lock closure, an unsafe concurrent window is exposed where parallel worker lookup threads (e.g., inside perf top) can mistakenly assume the cache remains sorted based on stale parameters, executing binary search queries (bsearch) across an unsorted range and triggering lookup failures. Fix this by introducing maps__mutate_mapping() that explicitly acquires the parent maps write semaphore lock, executes an incoming mutation callback block to perform the field updates under lock protection, and invalidates the sorted tracking flags prior to releasing the write lock. This guarantees synchronization invariants, closing the concurrent lookup race window. The adjacent module alignment pass inside machine__create_kernel_maps() is safely preserved as a high-performance lockless pass, as its invocation lifecycle bounds remain strictly single-threaded by contract during session initialization construction. To safely support this unconditional down_write write lock mutator without recursive read-to-write self-deadlock upgrades during lazy symbol loading, we introduce a public maps__load_maps() API. It copies map pointers under a brief read lock and force-loads all modules locklessly outside the lock. Callers (such as perf inject) must pre-load all kernel symbol maps up front at startup using maps__load_maps(), completely bypassing dynamic runtime mutations. Fixes: 39b12f781271 ("perf tools: Make it possible to read object code from= vmlinux") Assisted-by: Antigravity:gemini-3.5-flash Signed-off-by: Ian Rogers --- 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 +++- 5 files changed, 184 insertions(+), 58 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index da1ad58758af..1ea06fde14e0 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1539,22 +1539,30 @@ static void machine__set_kernel_mmap(struct machine= *machine, map__set_end(machine->vmlinux_map, ~0ULL); } =20 -static int machine__update_kernel_mmap(struct machine *machine, - u64 start, u64 end) +struct kernel_mmap_mutation_ctx { + u64 start; + u64 end; +}; + +static int kernel_mmap_mutate_cb(struct map *map, void *data) { - struct map *orig, *updated; - int err; + struct kernel_mmap_mutation_ctx *ctx =3D data; =20 - orig =3D machine->vmlinux_map; - updated =3D map__get(orig); + map__set_start(map, ctx->start); + map__set_end(map, ctx->end); + if (ctx->start =3D=3D 0 && ctx->end =3D=3D 0) + map__set_end(map, ~0ULL); + return 0; +} =20 - machine->vmlinux_map =3D updated; - maps__remove(machine__kernel_maps(machine), orig); - machine__set_kernel_mmap(machine, start, end); - err =3D maps__insert(machine__kernel_maps(machine), updated); - map__put(orig); +static int machine__update_kernel_mmap(struct machine *machine, + u64 start, u64 end) +{ + struct kernel_mmap_mutation_ctx ctx =3D { .start =3D start, .end =3D end = }; =20 - return err; + return maps__mutate_mapping(machine__kernel_maps(machine), + machine->vmlinux_map, + kernel_mmap_mutate_cb, &ctx); } =20 int machine__create_kernel_maps(struct machine *machine) diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c index 923935ee21b6..aed72c9f0a50 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -576,6 +576,49 @@ void maps__remove(struct maps *maps, struct map *map) #endif } =20 +/** + * maps__mutate_mapping - Apply write-protected mutations to a map. + * @maps: The maps collection containing the map. + * @map: The map to mutate. + * @mutate_cb: Callback function that performs the actual mutations. + * @data: Private data passed to the callback. + * + * This acquires the write lock on the maps semaphore to safely protect + * concurrent readers from seeing partially mutated or unsorted map bounda= ries. + * + * WARNING: Acquiring down_write() here can trigger a recursive self-deadl= ock if + * the caller already holds the read lock (e.g., during maps__for_each_map= () or + * maps__find() iteration paths that trigger lazy symbol loading). To comp= letely + * avoid this deadlock, all kernel/module maps must be pre-loaded up-front= (via + * maps__load_maps()) under a clean, single-threaded context before enteri= ng + * multi-threaded event processing loops. + */ +int maps__mutate_mapping(struct maps *maps, struct map *map, + int (*mutate_cb)(struct map *map, void *data), void *data) +{ + int err =3D 0; + + if (maps) + down_write(maps__lock(maps)); + + err =3D mutate_cb(map, data); + + if (maps) { + RC_CHK_ACCESS(maps)->maps_by_address_sorted =3D false; + RC_CHK_ACCESS(maps)->maps_by_name_sorted =3D false; + } + + if (maps) + up_write(maps__lock(maps)); + +#ifdef HAVE_LIBDW_SUPPORT + if (maps) + libdw__invalidate_dwfl(maps, maps__libdw_addr_space_dwfl(maps)); +#endif + + return err; +} + bool maps__empty(struct maps *maps) { bool res; @@ -626,6 +669,41 @@ int maps__for_each_map(struct maps *maps, int (*cb)(st= ruct map *map, void *data) return ret; } =20 +int maps__load_maps(struct maps *maps) +{ + struct map **maps_copy; + unsigned int nr_maps; + int err =3D 0; + + if (!maps) + return 0; + + down_read(maps__lock(maps)); + nr_maps =3D maps__nr_maps(maps); + if (nr_maps =3D=3D 0) { + up_read(maps__lock(maps)); + return 0; + } + maps_copy =3D calloc(nr_maps, sizeof(*maps_copy)); + if (!maps_copy) { + up_read(maps__lock(maps)); + return -ENOMEM; + } + for (unsigned int i =3D 0; i < nr_maps; i++) + maps_copy[i] =3D map__get(maps__maps_by_address(maps)[i]); + up_read(maps__lock(maps)); + + for (unsigned int i =3D 0; i < nr_maps; i++) { + if (map__load(maps_copy[i]) < 0) { + pr_warning("Failed to load map %s\n", map__dso(maps_copy[i])->name); + err =3D -1; + } + map__put(maps_copy[i]); + } + free(maps_copy); + return err; +} + void maps__remove_maps(struct maps *maps, bool (*cb)(struct map *map, void= *data), void *data) { struct map **maps_by_address; @@ -668,40 +746,57 @@ struct symbol *maps__find_symbol(struct maps *maps, u= 64 addr, struct map **mapp) return result; } =20 -struct maps__find_symbol_by_name_args { - struct map **mapp; - const char *name; - struct symbol *sym; -}; - -static int maps__find_symbol_by_name_cb(struct map *map, void *data) +struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *na= me, struct map **mapp) { - struct maps__find_symbol_by_name_args *args =3D data; + struct map **maps_copy; + unsigned int nr_maps; + struct symbol *sym =3D NULL; =20 - args->sym =3D map__find_symbol_by_name(map, args->name); - if (!args->sym) - return 0; + if (!maps) + return NULL; =20 - if (!map__contains_symbol(map, args->sym)) { - args->sym =3D NULL; - return 0; + /* + * First, ensure all maps are loaded. We pre-load them outside of any + * read-to-write locks to avoid deadlocks. Even if some fail, we proceed. + */ + maps__load_maps(maps); + + /* + * Create a local snapshot of the maps while holding the read lock. + * This prevents deadlocking if iteration triggers further map insertions. + */ + down_read(maps__lock(maps)); + nr_maps =3D maps__nr_maps(maps); + maps_copy =3D calloc(nr_maps, sizeof(*maps_copy)); + if (maps_copy) { + for (unsigned int i =3D 0; i < nr_maps; i++) { + struct map *map =3D maps__maps_by_address(maps)[i]; + + maps_copy[i] =3D map__get(map); + } } + up_read(maps__lock(maps)); =20 - if (args->mapp !=3D NULL) - *args->mapp =3D map__get(map); - return 1; -} + if (!maps_copy) + return NULL; =20 -struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *na= me, struct map **mapp) -{ - struct maps__find_symbol_by_name_args args =3D { - .mapp =3D mapp, - .name =3D name, - .sym =3D NULL, - }; + for (unsigned int i =3D 0; i < nr_maps; i++) { + struct map *map =3D maps_copy[i]; + + sym =3D map__find_symbol_by_name(map, name); + if (sym && map__contains_symbol(map, sym)) { + if (mapp) + *mapp =3D map__get(map); + break; + } + sym =3D NULL; + } + + for (unsigned int i =3D 0; i < nr_maps; i++) + map__put(maps_copy[i]); =20 - maps__for_each_map(maps, maps__find_symbol_by_name_cb, &args); - return args.sym; + free(maps_copy); + return sym; } =20 int maps__find_ams(struct maps *maps, struct addr_map_symbol *ams) diff --git a/tools/perf/util/maps.h b/tools/perf/util/maps.h index 5b80b199685e..4ec9b7453a3b 100644 --- a/tools/perf/util/maps.h +++ b/tools/perf/util/maps.h @@ -59,8 +59,11 @@ void maps__set_libdw_addr_space_dwfl(struct maps *maps, = void *dwfl); =20 size_t maps__fprintf(struct maps *maps, FILE *fp); =20 +int maps__load_maps(struct maps *maps); int maps__insert(struct maps *maps, struct map *map); void maps__remove(struct maps *maps, struct map *map); +int maps__mutate_mapping(struct maps *maps, struct map *map, + int (*mutate_cb)(struct map *map, void *data), void *data); =20 struct map *maps__find(struct maps *maps, u64 addr); struct symbol *maps__find_symbol(struct maps *maps, u64 addr, struct map *= *mapp); diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 186e6d92ac3d..d1e93c0556dd 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -1342,6 +1342,24 @@ static u64 ref_reloc(struct kmap *kmap) void __weak arch__sym_update(struct symbol *s __maybe_unused, GElf_Sym *sym __maybe_unused) { } =20 +struct remap_kernel_ctx { + u64 sh_addr; + u64 sh_size; + u64 sh_offset; + struct kmap *kmap; +}; + +static int remap_kernel_cb(struct map *map, void *data) +{ + struct remap_kernel_ctx *ctx =3D data; + + map__set_start(map, ctx->sh_addr + ref_reloc(ctx->kmap)); + map__set_end(map, map__start(map) + ctx->sh_size); + map__set_pgoff(map, ctx->sh_offset); + map__set_mapping_type(map, MAPPING_TYPE__DSO); + return 0; +} + static int dso__process_kernel_symbol(struct dso *dso, struct map *map, GElf_Sym *sym, GElf_Shdr *shdr, struct maps *kmaps, struct kmap *kmap, @@ -1372,22 +1390,15 @@ static int dso__process_kernel_symbol(struct dso *d= so, struct map *map, * map to the kernel dso. */ if (*remap_kernel && dso__kernel(dso) && !kmodule) { + struct remap_kernel_ctx ctx =3D { + .sh_addr =3D shdr->sh_addr, + .sh_size =3D shdr->sh_size, + .sh_offset =3D shdr->sh_offset, + .kmap =3D kmap + }; + *remap_kernel =3D false; - map__set_start(map, shdr->sh_addr + ref_reloc(kmap)); - map__set_end(map, map__start(map) + shdr->sh_size); - map__set_pgoff(map, shdr->sh_offset); - map__set_mapping_type(map, MAPPING_TYPE__DSO); - /* Ensure maps are correctly ordered */ - if (kmaps) { - int err; - struct map *tmp =3D map__get(map); - - maps__remove(kmaps, map); - err =3D maps__insert(kmaps, map); - map__put(tmp); - if (err) - return err; - } + maps__mutate_mapping(kmaps, map, remap_kernel_cb, &ctx); } =20 /* diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 0c46b24ee098..2cc911af8c81 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -48,6 +48,13 @@ #include #include =20 +static int map_fixup_cb(struct map *map, void *data __maybe_unused) +{ + map__fixup_start(map); + map__fixup_end(map); + return 0; +} + static int dso__load_kernel_sym(struct dso *dso, struct map *map); static int dso__load_guest_kernel_sym(struct dso *dso, struct map *map); =20 @@ -2240,10 +2247,11 @@ static int dso__load_kernel_sym(struct dso *dso, st= ruct map *map) free(kallsyms_allocated_filename); =20 if (err > 0 && !dso__is_kcore(dso)) { + struct maps *kmaps =3D map__kmaps(map); + dso__set_binary_type(dso, DSO_BINARY_TYPE__KALLSYMS); dso__set_long_name(dso, DSO__NAME_KALLSYMS, false); - map__fixup_start(map); - map__fixup_end(map); + maps__mutate_mapping(kmaps, map, map_fixup_cb, NULL); } =20 return err; @@ -2283,10 +2291,11 @@ static int dso__load_guest_kernel_sym(struct dso *d= so, struct map *map) if (err > 0) pr_debug("Using %s for symbols\n", kallsyms_filename); if (err > 0 && !dso__is_kcore(dso)) { + struct maps *kmaps =3D map__kmaps(map); + dso__set_binary_type(dso, DSO_BINARY_TYPE__GUEST_KALLSYMS); dso__set_long_name(dso, machine->mmap_name, false); - map__fixup_start(map); - map__fixup_end(map); + maps__mutate_mapping(kmaps, map, map_fixup_cb, NULL); } =20 return err; --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:39 2026 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 C5A223F44C3 for ; Fri, 5 Jun 2026 18:52:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780685550; cv=none; b=C9+yAC7jPWw4sPbJmR8XN7vTTtI5WNSCc2SGdIpHZUopXrtaYoiUFQwwTw3Znaj6yKxE50yaVGf8eUw/FHo3SiRKq4i8KDh1/Fenmq4kA2dkNzO7CYIH9KGjntEDgXC/c8XtSIifX80DKsjDC+85Z/I3qdZeY92GnEozI9TcNmM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780685550; c=relaxed/simple; bh=QgMnOSk6f3SKFP2pe6EWNKV4xQVSNKxkG1k31eDbbTM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hAuuOQWUUqLTivu39ICxCUR/XtHUKI4RPeLCEwj/QusMBPNeRmf0cjKNs7BswMmx5A3USBqQyWi6Ae34UBvXKy3ikGMAEIYh7IUQgllK3Ks0tBNPTBCsNAkINu7Aart3umjTseJVudkUcbJwhIbwr2GgPzFp7/R5XTFF2/9yGuY= 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=Dy/trPj7; arc=none smtp.client-ip=209.85.215.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="Dy/trPj7" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c850ff84ddfso2614303a12.2 for ; Fri, 05 Jun 2026 11:52:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780685546; x=1781290346; 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=ugAR/J2bH5qi9rUScYSOLrzZcBbjWpwWvU21UaH9C/M=; b=Dy/trPj7jwR/YF8V15L95WQKX6139a0RMeFO70XjTYLiJXcCznr1oZ/Yne1Rk/Lxdv ldC4EsGxFwx/A6QQXvtOQedcfHQZLmcuvZ+7MGeBMMYORbc5LBJqwb0Po6w8TJia34Jb JXQgyR5w1GjiN8N6ILmhy6AZI9T3P0/dv2tPc1qz9G0/VRYzIybTXF7biaghg9w7ZVyj xfrfdNPKuzu7zt45fZVLN7LmBXSbPDIlW4meqjuy0VQV9BFWXiL+9+TFFrDT7YjuTsi7 Ti+CRMGomyH+lU/xsRp1enEkvf0QP9e5JWHVezzPkdnl1Rc+NLbsJIe1qmltV8ojWi+o wZpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780685546; x=1781290346; 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=ugAR/J2bH5qi9rUScYSOLrzZcBbjWpwWvU21UaH9C/M=; b=k6k1Xh2V6c+ZptqaKZtsC/vqbQwHyYXdh3p+83ZiiYUy+b3dbjohp8/fQi+SDlUfs+ o0C97yluz3Tb9Di3h2ImOwQ1vl1HeYvK5uZitIav38S6LvVGPCv4h/s+TBMvCoNRgm00 kD18pzrv8KSK23AktMsAbsWMxgHyQNN2lxjIqzyK4TgSw/v1AwQdqojkhibEwPGVGmGO G14cuNq5fnUonc2Y4zUv12Rx582ekS/iC0239FUAQcYqCXEK0y9NFLV22fnmn6gadPwA qQIzHfW5z94Tot1SJntHLs2/lKTMehSMAQNpF/Mv+Ydy3q3CTj/9wAr4btKAOm76iPV/ muTA== X-Forwarded-Encrypted: i=1; AFNElJ/+JxSbBuqCvMK55l0PhTRMA+m6rPAFMEPgrb5QVYrWoFtfZySYpy0C5yfOBj8z8N+9VxL/ujGFwHhLuMQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yzut8UKWzwBcmtl57FNk0TJQRVsOkfaeMvdzGMBIvKVoeIxSXE1 /38O6UowkOQ/WM5riZ6XkkUaLD3VjcOKDxeaiwO8fY3TLDY8MmjuM2t92l1VM93sGDFPzRLSHes 8sWHHS014Rg== X-Received: from pgbcs13.prod.google.com ([2002:a05:6a02:418d:b0:c80:26b4:27c1]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6f89:b0:3b4:931c:3c7c with SMTP id adf61e73a8af0-3b4cd0cdc51mr6179114637.44.1780685545731; Fri, 05 Jun 2026 11:52:25 -0700 (PDT) Date: Fri, 5 Jun 2026 11:52:12 -0700 In-Reply-To: <20260605185215.2359881-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> <20260605185215.2359881-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605185215.2359881-3-irogers@google.com> Subject: [PATCH v11 2/5] perf inject/aslr: Add ASLR tool infrastructure and MMAP tracking 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If perf.data files are taken from one machine to another they may leak virtual addresses and so weaken ASLR on the machine they are coming from. Add an aslr option for perf inject that remaps all virtual addresses, or drops data/events, so that the virtual address information isn't leaked. This patch introduces the core ASLR remapping tool infrastructure and implements remapping/tracking for metadata events (MMAP, MMAP2, COMM, FORK, EXIT, KSYMBOL, TEXT_POKE). Sample events are delegated without remapping for now. Assisted-by: Antigravity:gemini-3.5-flash Signed-off-by: Ian Rogers Co-developed-by: Gabriel Marin Signed-off-by: Gabriel Marin --- tools/perf/builtin-inject.c | 57 ++- tools/perf/util/Build | 1 + tools/perf/util/aslr.c | 689 ++++++++++++++++++++++++++++++++++++ tools/perf/util/aslr.h | 37 ++ 4 files changed, 782 insertions(+), 2 deletions(-) create mode 100644 tools/perf/util/aslr.c create mode 100644 tools/perf/util/aslr.h diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 75ffe31d03fe..65c7eccccf4d 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -8,6 +8,7 @@ */ #include "builtin.h" =20 +#include "util/aslr.h" #include "util/color.h" #include "util/dso.h" #include "util/vdso.h" @@ -124,6 +125,7 @@ struct perf_inject { bool in_place_update_dry_run; bool copy_kcore_dir; bool convert_callchain; + bool aslr; const char *input_name; struct perf_data output; u64 bytes_written; @@ -242,8 +244,25 @@ static int perf_event__repipe_attr(const struct perf_t= ool *tool, if (!inject->output.is_pipe) return 0; =20 - if (!inject->itrace_synth_opts.set) + if (!inject->itrace_synth_opts.set) { + if (inject->aslr) { + union perf_event *stripped_event =3D malloc(event->header.size); + int err; + + if (!stripped_event) + return -ENOMEM; + memcpy(stripped_event, event, event->header.size); + stripped_event->attr.attr.sample_type &=3D ASLR_SUPPORTED_SAMPLE_TYPE; + + if (stripped_event->attr.attr.type =3D=3D PERF_TYPE_BREAKPOINT) + stripped_event->attr.attr.bp_addr =3D 0; + + err =3D perf_event__repipe_synth(tool, stripped_event); + free(stripped_event); + return err; + } return perf_event__repipe_synth(tool, event); + } =20 if (event->header.size < sizeof(struct perf_event_header) + PERF_ATTR_SIZ= E_VER0) { pr_err("Attribute event size %u is too small\n", event->header.size); @@ -276,6 +295,8 @@ static int perf_event__repipe_attr(const struct perf_to= ol *tool, =20 attr.size =3D sizeof(struct perf_event_attr); attr.sample_type &=3D ~PERF_SAMPLE_AUX; + if (inject->aslr) + attr.sample_type &=3D ASLR_SUPPORTED_SAMPLE_TYPE; =20 if (inject->itrace_synth_opts.add_last_branch) { attr.sample_type |=3D PERF_SAMPLE_BRANCH_STACK; @@ -2595,6 +2616,8 @@ static int __cmd_inject(struct perf_inject *inject) } } =20 + + session->header.data_offset =3D output_data_offset; session->header.data_size =3D inject->bytes_written; perf_session__inject_header(session, session->evlist, fd, &inj_fc.fc, @@ -2704,6 +2727,8 @@ int cmd_inject(int argc, const char **argv) unwind__option), OPT_BOOLEAN(0, "convert-callchain", &inject.convert_callchain, "Generate callchains using DWARF and drop register/stack data"), + OPT_BOOLEAN(0, "aslr", &inject.aslr, + "Remap virtual memory addresses similar to ASLR"), OPT_END() }; const char * const inject_usage[] =3D { @@ -2711,6 +2736,7 @@ int cmd_inject(int argc, const char **argv) NULL }; bool ordered_events; + struct perf_tool *tool =3D &inject.tool; =20 if (!inject.itrace_synth_opts.set) { /* Disable eager loading of kernel symbols that adds overhead to perf in= ject. */ @@ -2731,6 +2757,11 @@ int cmd_inject(int argc, const char **argv) if (argc) usage_with_options(inject_usage, options); =20 + if (inject.aslr && inject.convert_callchain) { + pr_err("Error: --aslr and --convert-callchain are mutually exclusive fea= tures.\n"); + return -EINVAL; + } + if (inject.strip && !inject.itrace_synth_opts.set) { pr_err("--strip option requires --itrace option\n"); return -1; @@ -2824,12 +2855,21 @@ int cmd_inject(int argc, const char **argv) inject.tool.schedstat_domain =3D perf_event__repipe_op2_synth; inject.tool.dont_split_sample_group =3D true; inject.tool.merge_deferred_callchains =3D false; - inject.session =3D __perf_session__new(&data, &inject.tool, + if (inject.aslr) { + tool =3D aslr_tool__new(&inject.tool); + if (!tool) { + ret =3D -ENOMEM; + goto out_close_output; + } + } + inject.session =3D __perf_session__new(&data, tool, /*trace_event_repipe=3D*/inject.output.is_pipe, /*host_env=3D*/NULL); =20 if (IS_ERR(inject.session)) { ret =3D PTR_ERR(inject.session); + if (inject.aslr) + aslr_tool__delete(tool); goto out_close_output; } =20 @@ -2923,12 +2963,25 @@ int cmd_inject(int argc, const char **argv) =20 ret =3D __cmd_inject(&inject); =20 + if (inject.aslr) { + struct evsel *evsel; + + evlist__for_each_entry(inject.session->evlist, evsel) { + evsel->core.attr.sample_type &=3D ASLR_SUPPORTED_SAMPLE_TYPE; + + if (evsel->core.attr.type =3D=3D PERF_TYPE_BREAKPOINT) + evsel->core.attr.bp_addr =3D 0; + } + } + guest_session__exit(&inject.guest_session); =20 out_delete: strlist__delete(inject.known_build_ids); zstd_fini(&(inject.session->zstd_data)); perf_session__delete(inject.session); + if (inject.aslr) + aslr_tool__delete(tool); out_close_output: if (!inject.in_place_update) perf_data__close(&inject.output); diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 4bbc78b1f741..19994e026ae5 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -6,6 +6,7 @@ perf-util-y +=3D arm64-frame-pointer-unwind-support.o perf-util-y +=3D addr2line.o perf-util-y +=3D addr_location.o perf-util-y +=3D annotate.o +perf-util-y +=3D aslr.o perf-util-y +=3D blake2s.o perf-util-y +=3D block-info.o perf-util-y +=3D block-range.o diff --git a/tools/perf/util/aslr.c b/tools/perf/util/aslr.c new file mode 100644 index 000000000000..375a0355f281 --- /dev/null +++ b/tools/perf/util/aslr.c @@ -0,0 +1,689 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "aslr.h" + +#include "addr_location.h" +#include "debug.h" +#include "event.h" +#include "evsel.h" +#include "machine.h" +#include "map.h" +#include "thread.h" +#include "tool.h" +#include "session.h" +#include "data.h" +#include "dso.h" + +#include /* page_size */ +#include +#include +#include +#include + +/** + * struct remap_addresses_key - Key for mapping original addresses to rema= pped ones. + * @dso: Pointer to the DSO (Dynamic Shared Object) associated with the ma= pping. + * @invariant: Unique offset invariant within the VMA (Virtual Memory Area= ). + * Calculated as `start - pgoff`. This value remains constant = when + * perf's internal `maps__fixup_overlap_and_insert` splits a m= ap into + * fragmented VMA pieces due to overlapping events, allowing u= s to + * resolve split maps consistently back to the original VMA. + * @pid: Process ID associated with the mapping. + */ +struct remap_addresses_key { + struct machine *machine; + struct dso *dso; + u64 invariant; + pid_t pid; +}; + +struct aslr_mapping { + struct list_head node; + u64 orig_start; + u64 len; + u64 remap_start; +}; + +struct process_top_address { + u64 remapped_max; + u64 orig_last_end; +}; +struct aslr_tool { + /** @tool: The tool implemented here and a pointer to a delegate to proce= ss the data. */ + struct delegate_tool tool; + /** @machines: The machines with the input, not remapped, virtual address= layout. */ + struct machines machines; + /** @event_copy: Buffer used to create an event to pass to the delegate. = */ + char event_copy[PERF_SAMPLE_MAX_SIZE] __aligned(8); + /** @remap_addresses: mapping from remap_addresses_key to remapped addres= s. */ + struct hashmap remap_addresses; + /** @top_addresses: mapping from process to max remapped address. */ + struct hashmap top_addresses; +}; + +static const pid_t kernel_pid =3D -1; + +/* Start remapping user processes from a small non-zero offset. */ +static const u64 user_space_start =3D 0x200000; +static const u64 kernel_space_start =3D 0xffff800010000000; + +static size_t remap_addresses__hash(long _key, void *ctx __maybe_unused) +{ + struct remap_addresses_key *key =3D (struct remap_addresses_key *)_key; + + return (size_t)key->machine ^ (size_t)key->dso ^ key->invariant ^ key->pi= d; +} + +static bool remap_addresses__equal(long _key1, long _key2, void *ctx __may= be_unused) +{ + struct remap_addresses_key *key1 =3D (struct remap_addresses_key *)_key1; + struct remap_addresses_key *key2 =3D (struct remap_addresses_key *)_key2; + + return key1->machine =3D=3D key2->machine && + RC_CHK_EQUAL(key1->dso, key2->dso) && + key1->invariant =3D=3D key2->invariant && + key1->pid =3D=3D key2->pid; +} + +struct top_addresses_key { + struct machine *machine; + pid_t pid; +}; + +static size_t top_addresses__hash(long _key, void *ctx __maybe_unused) +{ + struct top_addresses_key *key =3D (struct top_addresses_key *)_key; + + return (size_t)key->machine ^ key->pid; +} + +static bool top_addresses__equal(long _key1, long _key2, void *ctx __maybe= _unused) +{ + struct top_addresses_key *key1 =3D (struct top_addresses_key *)_key1; + struct top_addresses_key *key2 =3D (struct top_addresses_key *)_key2; + + return key1->machine =3D=3D key2->machine && key1->pid =3D=3D key2->pid; +} + +static u64 round_up_to_page_size(u64 addr) +{ + return (addr + page_size - 1) & ~((u64)page_size - 1); +} + +struct aslr_machine_priv { + bool kernel_maps_loaded; +}; + +static int aslr_tool__preload_kernel_maps(struct machine *machine) +{ + struct aslr_machine_priv *mpriv =3D machine->priv; + + if (!mpriv) { + mpriv =3D zalloc(sizeof(*mpriv)); + if (!mpriv) + return -ENOMEM; + machine->priv =3D mpriv; + } + + if (!mpriv->kernel_maps_loaded) { + struct maps *kmaps =3D machine__kernel_maps(machine); + + if (kmaps) { + int err =3D maps__load_maps(kmaps); + + if (err < 0) { + pr_err("ASLR: Failed to preload kernel maps for machine pid %d\n", + machine->pid); + return err; + } + } + mpriv->kernel_maps_loaded =3D true; + } + return 0; +} + +static void aslr_tool__free_machine_priv(struct machine *machine) +{ + free(machine->priv); + machine->priv =3D NULL; +} + +static void aslr_tool__destroy_machines_priv(struct machines *machines) +{ + struct rb_node *nd; + + aslr_tool__free_machine_priv(&machines->host); + for (nd =3D rb_first_cached(&machines->guests); nd; nd =3D rb_next(nd)) { + struct machine *machine =3D rb_entry(nd, struct machine, rb_node); + + aslr_tool__free_machine_priv(machine); + } +} + +static u64 aslr_tool__findnew_mapping(struct aslr_tool *aslr, + struct thread *aslr_thread, + u8 cpumode, u64 start, + u64 len, u64 pgoff) +{ + /* Address location for dso lookup. */ + struct addr_location al; + /* Original ASLR address based key for the remap table. */ + struct remap_addresses_key remap_key; + /* The address in the ASLR sanitized address space less pg_off. */ + u64 *remapped_invariant_ptr; + /* Key for the maximum address in a process. */ + struct top_addresses_key top_addr_key; + /* Value in top address table. */ + struct process_top_address *top =3D NULL; + /* Address in ASLR sanitized address space. */ + u64 remap_addr; + /* Potentially allocated remap table key. */ + struct remap_addresses_key *new_remap_key =3D NULL; + /* + * Potentially allocated remap table key. + * TODO: Avoid allocation necessary for perf 32-bit binary support. + */ + u64 *new_remap_val =3D NULL; + int err; + + if (!aslr_thread) + return 0; + + /* The key to look up an incoming address to the outgoing value. */ + addr_location__init(&al); + remap_key.machine =3D maps__machine(thread__maps(aslr_thread)); + remap_key.pid =3D (cpumode =3D=3D PERF_RECORD_MISC_KERNEL || + cpumode =3D=3D PERF_RECORD_MISC_GUEST_KERNEL) ? + kernel_pid : thread__pid(aslr_thread); + if (thread__find_map(aslr_thread, cpumode, start, &al)) { + struct dso *dso =3D map__dso(al.map); + const char *dso_name =3D dso ? dso__long_name(dso) : NULL; + + remap_key.dso =3D dso; + if (dso && !is_anon_memory(dso_name) && !is_no_dso_memory(dso_name)) + remap_key.invariant =3D map__start(al.map) - map__pgoff(al.map); + else + remap_key.invariant =3D map__start(al.map); + } else { + remap_key.dso =3D NULL; + remap_key.invariant =3D start; + } + + /* The key to look up top allocated address. */ + top_addr_key.machine =3D remap_key.machine; + top_addr_key.pid =3D remap_key.pid; + + if (hashmap__find(&aslr->remap_addresses, &remap_key, &remapped_invariant= _ptr)) { + /* Mmap already exists. */ + u64 calculated_max; + + if (al.map) { + remap_addr =3D *remapped_invariant_ptr + map__pgoff(al.map) + + (start - map__start(al.map)); + } else { + remap_addr =3D *remapped_invariant_ptr + pgoff; + } + + calculated_max =3D remap_addr + len; + + /* See if top mapping was expanded. */ + if (hashmap__find(&aslr->top_addresses, &top_addr_key, &top)) { + if (calculated_max > top->remapped_max) + top->remapped_max =3D calculated_max; + } + addr_location__exit(&al); + return remap_addr; + } + /* No mmap, create an entry from the top address. */ + if (hashmap__find(&aslr->top_addresses, &top_addr_key, &top)) { + /* Current max allocated mmap address within the process. */ + remap_addr =3D top->remapped_max; + + if (start =3D=3D top->orig_last_end) { + /* Contiguous mapping, do not add 1 page gap! */ + remap_addr =3D round_up_to_page_size(remap_addr); + } else { + /* Give 1 page gap from current max page. */ + remap_addr =3D round_up_to_page_size(remap_addr); + remap_addr +=3D page_size; + } + top->orig_last_end =3D start + len; + if (remap_addr + len > top->remapped_max) + top->remapped_max =3D remap_addr + len; + } else { + /* First address of the process, allocate key and first top address. */ + struct top_addresses_key *tk; + struct process_top_address *top_val; + + remap_addr =3D (cpumode =3D=3D PERF_RECORD_MISC_KERNEL || + cpumode =3D=3D PERF_RECORD_MISC_GUEST_KERNEL) ? + kernel_space_start : user_space_start; + remap_addr =3D round_up_to_page_size(remap_addr); + + tk =3D malloc(sizeof(*tk)); + top_val =3D malloc(sizeof(*top_val)); + if (!tk || !top_val) { + err =3D -ENOMEM; + } else { + *tk =3D top_addr_key; + top_val->remapped_max =3D remap_addr + len; + top_val->orig_last_end =3D start + len; + err =3D hashmap__insert(&aslr->top_addresses, tk, top_val, + HASHMAP_ADD, NULL, NULL); + } + if (err) { + errno =3D -err; + pr_err("Failure to add ASLR process top address %m\n"); + free(tk); + free(top_val); + addr_location__exit(&al); + return 0; + } + } + /* Create rmeapping entry. */ + new_remap_key =3D malloc(sizeof(*new_remap_key)); + new_remap_val =3D malloc(sizeof(u64)); + if (!new_remap_key || !new_remap_val) { + err =3D -ENOMEM; + } else { + *new_remap_key =3D remap_key; + new_remap_key->dso =3D dso__get(remap_key.dso); + if (cpumode =3D=3D PERF_RECORD_MISC_KERNEL || + cpumode =3D=3D PERF_RECORD_MISC_GUEST_KERNEL) { + if (al.map) { + *new_remap_val =3D remap_addr - + (start - map__start(al.map)) - + map__pgoff(al.map); + } else { + *new_remap_val =3D remap_addr; + } + } else { + *new_remap_val =3D remap_addr - (al.map ? map__pgoff(al.map) : pgoff); + } + err =3D hashmap__add(&aslr->remap_addresses, new_remap_key, new_remap_va= l); + if (err) + dso__put(new_remap_key->dso); + } + if (err) { + errno =3D -err; + pr_err("Failure to add ASLR remapping %m\n"); + free(new_remap_key); + free(new_remap_val); + addr_location__exit(&al); + return 0; + } + addr_location__exit(&al); + return remap_addr; +} + +static int aslr_tool__process_mmap(const struct perf_tool *tool, + union perf_event *event, + struct perf_sample *sample, + struct machine *machine) +{ + struct delegate_tool *del_tool; + struct aslr_tool *aslr; + struct perf_tool *delegate; + union perf_event *new_event; + u8 cpumode; + struct thread *thread; + struct machine *aslr_machine; + int err; + + del_tool =3D container_of(tool, struct delegate_tool, tool); + aslr =3D container_of(del_tool, struct aslr_tool, tool); + delegate =3D aslr->tool.delegate; + new_event =3D (union perf_event *)aslr->event_copy; + cpumode =3D event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK; + + aslr_machine =3D machines__findnew(&aslr->machines, machine->pid); + if (!aslr_machine) + return -ENOMEM; + if (aslr_tool__preload_kernel_maps(aslr_machine) < 0) + return -ENOMEM; + + /* Create the thread, map, etc. in the ASLR before virtual address space.= */ + err =3D perf_event__process_mmap(tool, event, sample, aslr_machine); + if (err) + return err; + + thread =3D machine__findnew_thread(aslr_machine, event->mmap.pid, event->= mmap.tid); + if (!thread) + return -ENOMEM; + memcpy(&new_event->mmap, &event->mmap, event->mmap.header.size); + /* Remaps the mmap.start. */ + new_event->mmap.start =3D aslr_tool__findnew_mapping(aslr, thread, cpumod= e, + event->mmap.start, + event->mmap.len, + event->mmap.pgoff); + if (cpumode =3D=3D PERF_RECORD_MISC_KERNEL || cpumode =3D=3D PERF_RECORD_= MISC_GUEST_KERNEL) + new_event->mmap.pgoff =3D new_event->mmap.start; + err =3D delegate->mmap(delegate, new_event, sample, machine); + thread__put(thread); + return err; +} + +static int aslr_tool__process_mmap2(const struct perf_tool *tool, + union perf_event *event, + struct perf_sample *sample, + struct machine *machine) +{ + struct delegate_tool *del_tool; + struct aslr_tool *aslr; + struct perf_tool *delegate; + union perf_event *new_event; + u8 cpumode; + struct thread *thread; + struct machine *aslr_machine; + int err; + + del_tool =3D container_of(tool, struct delegate_tool, tool); + aslr =3D container_of(del_tool, struct aslr_tool, tool); + delegate =3D aslr->tool.delegate; + new_event =3D (union perf_event *)aslr->event_copy; + cpumode =3D event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK; + + aslr_machine =3D machines__findnew(&aslr->machines, machine->pid); + if (!aslr_machine) + return -ENOMEM; + if (aslr_tool__preload_kernel_maps(aslr_machine) < 0) + return -ENOMEM; + + /* Create the thread, map, etc. in the ASLR before virtual address space.= */ + err =3D perf_event__process_mmap2(tool, event, sample, aslr_machine); + if (err) + return err; + + thread =3D machine__findnew_thread(aslr_machine, event->mmap2.pid, event-= >mmap2.tid); + if (!thread) + return -ENOMEM; + memcpy(&new_event->mmap2, &event->mmap2, event->mmap2.header.size); + /* Remaps the mmap.start. */ + new_event->mmap2.start =3D aslr_tool__findnew_mapping(aslr, thread, cpumo= de, + event->mmap2.start, + event->mmap2.len, + event->mmap2.pgoff); + if (cpumode =3D=3D PERF_RECORD_MISC_KERNEL || cpumode =3D=3D PERF_RECORD_= MISC_GUEST_KERNEL) + new_event->mmap2.pgoff =3D new_event->mmap2.start; + err =3D delegate->mmap2(delegate, new_event, sample, machine); + thread__put(thread); + return err; +} + +static int aslr_tool__process_comm(const struct perf_tool *tool, + union perf_event *event, + struct perf_sample *sample, + struct machine *machine) +{ + struct delegate_tool *del_tool; + struct aslr_tool *aslr; + struct perf_tool *delegate; + struct machine *aslr_machine; + int err; + + del_tool =3D container_of(tool, struct delegate_tool, tool); + aslr =3D container_of(del_tool, struct aslr_tool, tool); + delegate =3D aslr->tool.delegate; + + aslr_machine =3D machines__findnew(&aslr->machines, machine->pid); + if (!aslr_machine) + return -ENOMEM; + if (aslr_tool__preload_kernel_maps(aslr_machine) < 0) + return -ENOMEM; + + /* Create the thread, map, etc. in the ASLR before virtual address space.= */ + err =3D perf_event__process_comm(tool, event, sample, aslr_machine); + if (err) + return err; + + return delegate->comm(delegate, event, sample, machine); +} + +static int aslr_tool__process_fork(const struct perf_tool *tool, + union perf_event *event, + struct perf_sample *sample, + struct machine *machine) +{ + struct delegate_tool *del_tool; + struct aslr_tool *aslr; + struct perf_tool *delegate; + struct machine *aslr_machine; + int err; + + del_tool =3D container_of(tool, struct delegate_tool, tool); + aslr =3D container_of(del_tool, struct aslr_tool, tool); + delegate =3D aslr->tool.delegate; + + aslr_machine =3D machines__findnew(&aslr->machines, machine->pid); + if (!aslr_machine) + return -ENOMEM; + if (aslr_tool__preload_kernel_maps(aslr_machine) < 0) + return -ENOMEM; + + /* Create the thread, map, etc. in the ASLR before virtual address space.= */ + err =3D perf_event__process_fork(tool, event, sample, aslr_machine); + if (err) + return err; + + return delegate->fork(delegate, event, sample, machine); +} + +static int aslr_tool__process_exit(const struct perf_tool *tool, + union perf_event *event, + struct perf_sample *sample, + struct machine *machine) +{ + struct delegate_tool *del_tool; + struct aslr_tool *aslr; + struct perf_tool *delegate; + struct machine *aslr_machine; + int err; + + del_tool =3D container_of(tool, struct delegate_tool, tool); + aslr =3D container_of(del_tool, struct aslr_tool, tool); + delegate =3D aslr->tool.delegate; + + aslr_machine =3D machines__findnew(&aslr->machines, machine->pid); + if (!aslr_machine) + return -ENOMEM; + if (aslr_tool__preload_kernel_maps(aslr_machine) < 0) + return -ENOMEM; + + /* Create the thread, map, etc. in the ASLR before virtual address space.= */ + err =3D perf_event__process_exit(tool, event, sample, aslr_machine); + if (err) + return err; + + return delegate->exit(delegate, event, sample, machine); +} + +static int aslr_tool__process_text_poke(const struct perf_tool *tool __may= be_unused, + union perf_event *event __maybe_unused, + struct perf_sample *sample __maybe_unused, + struct machine *machine __maybe_unused) +{ + /* Drop in case the instruction encodes an ASLR revealing address. */ + return 0; +} + +static int aslr_tool__process_ksymbol(const struct perf_tool *tool, + union perf_event *event, + struct perf_sample *sample, + struct machine *machine) +{ + struct delegate_tool *del_tool; + struct aslr_tool *aslr; + struct perf_tool *delegate; + union perf_event *new_event; + struct thread *thread; + struct machine *aslr_machine; + int err; + + del_tool =3D container_of(tool, struct delegate_tool, tool); + aslr =3D container_of(del_tool, struct aslr_tool, tool); + delegate =3D aslr->tool.delegate; + new_event =3D (union perf_event *)aslr->event_copy; + + aslr_machine =3D machines__findnew(&aslr->machines, machine->pid); + if (!aslr_machine) + return -ENOMEM; + if (aslr_tool__preload_kernel_maps(aslr_machine) < 0) + return -ENOMEM; + + err =3D perf_event__process_ksymbol(tool, event, sample, aslr_machine); + if (err) + return err; + + thread =3D machine__findnew_thread(aslr_machine, kernel_pid, 0); + if (!thread) + return -ENOMEM; + memcpy(&new_event->ksymbol, &event->ksymbol, event->ksymbol.header.size); + /* Remaps the ksymbol.start */ + new_event->ksymbol.addr =3D aslr_tool__findnew_mapping(aslr, thread, + PERF_RECORD_MISC_KERNEL, + event->ksymbol.addr, + event->ksymbol.len, + /*pgoff=3D*/0); + + err =3D delegate->ksymbol(delegate, new_event, sample, machine); + thread__put(thread); + return err; +} + +static int aslr_tool__process_sample(const struct perf_tool *tool, + union perf_event *event, + struct perf_sample *sample, + struct machine *machine) +{ + struct delegate_tool *del_tool =3D container_of(tool, struct delegate_too= l, tool); + struct aslr_tool *aslr =3D container_of(del_tool, struct aslr_tool, tool); + struct perf_tool *delegate =3D aslr->tool.delegate; + + return delegate->sample(delegate, event, sample, machine); +} + +static int skipn(int fd, off_t n) +{ + char buf[4096]; + ssize_t ret; + + while (n > 0) { + ret =3D read(fd, buf, min_t(off_t, n, (off_t)sizeof(buf))); + if (ret <=3D 0) + return ret; + n -=3D ret; + } + + return 0; +} + +static s64 aslr_tool__process_auxtrace(const struct perf_tool *tool __mayb= e_unused, + struct perf_session *session, + union perf_event *event) +{ + pr_warning_once("ASLR: Dropping auxtrace data as it cannot be obfuscated.= \n"); + if (perf_data__is_pipe(session->data)) { + /* Copy behavior of the stub by reading all pipe data. */ + int err =3D skipn(perf_data__fd(session->data), event->auxtrace.size); + + if (err < 0) + return err; + } + return event->auxtrace.size; +} + +static int aslr_tool__process_auxtrace_info(const struct perf_tool *tool _= _maybe_unused, + struct perf_session *session __maybe_unused, + union perf_event *event __maybe_unused) +{ + return 0; +} + +static int aslr_tool__process_auxtrace_error(const struct perf_tool *tool = __maybe_unused, + struct perf_session *session __maybe_unused, + union perf_event *event __maybe_unused) +{ + return 0; +} + +static void aslr_tool__init(struct aslr_tool *aslr, struct perf_tool *dele= gate) +{ + delegate_tool__init(&aslr->tool, delegate); + aslr->tool.tool.ordered_events =3D true; + + machines__init(&aslr->machines); + + hashmap__init(&aslr->remap_addresses, + remap_addresses__hash, remap_addresses__equal, + /*ctx=3D*/NULL); + hashmap__init(&aslr->top_addresses, + top_addresses__hash, top_addresses__equal, + /*ctx=3D*/NULL); + + aslr->tool.tool.sample =3D aslr_tool__process_sample; + /* read - reads a counter, okay to delegate. */ + aslr->tool.tool.mmap =3D aslr_tool__process_mmap; + aslr->tool.tool.mmap2 =3D aslr_tool__process_mmap2; + aslr->tool.tool.comm =3D aslr_tool__process_comm; + aslr->tool.tool.fork =3D aslr_tool__process_fork; + aslr->tool.tool.exit =3D aslr_tool__process_exit; + /* namesspaces, cgroup, lost, lost_sample, aux, */ + /* itrace_start, aux_output_hw_id, context_switch, throttle, unthrottle */ + /* - no virtual addresses. */ + aslr->tool.tool.ksymbol =3D aslr_tool__process_ksymbol; + /* bpf - no virtual address. */ + aslr->tool.tool.text_poke =3D aslr_tool__process_text_poke; + /* + * event_update, tracing_data, finished_round, build_id, id_index, + * auxtrace_info, auxtrace_error, time_conv, thread_map, cpu_map, + * stat_config, stat, feature, finished_init, bpf_metadata, compressed, + * auxtrace - no virtual addresses. + */ + aslr->tool.tool.auxtrace =3D aslr_tool__process_auxtrace; + aslr->tool.tool.auxtrace_info =3D aslr_tool__process_auxtrace_info; + aslr->tool.tool.auxtrace_error =3D aslr_tool__process_auxtrace_error; +} + +struct perf_tool *aslr_tool__new(struct perf_tool *delegate) +{ + struct aslr_tool *aslr =3D zalloc(sizeof(*aslr)); + + if (!aslr) + return NULL; + + aslr_tool__init(aslr, delegate); + return &aslr->tool.tool; +} + +void aslr_tool__delete(struct perf_tool *tool) +{ + struct delegate_tool *del_tool; + struct aslr_tool *aslr; + struct hashmap_entry *cur; + size_t bkt; + + if (!tool) + return; + + del_tool =3D container_of(tool, struct delegate_tool, tool); + aslr =3D container_of(del_tool, struct aslr_tool, tool); + + hashmap__for_each_entry(&aslr->remap_addresses, cur, bkt) { + struct remap_addresses_key *key =3D (struct remap_addresses_key *)cur->p= key; + + if (key) + dso__put(key->dso); + zfree(&cur->pkey); + zfree(&cur->pvalue); + } + hashmap__for_each_entry(&aslr->top_addresses, cur, bkt) { + zfree(&cur->pkey); + zfree(&cur->pvalue); + } + + hashmap__clear(&aslr->remap_addresses); + hashmap__clear(&aslr->top_addresses); + aslr_tool__destroy_machines_priv(&aslr->machines); + machines__destroy_kernel_maps(&aslr->machines); + machines__exit(&aslr->machines); + free(aslr); +} diff --git a/tools/perf/util/aslr.h b/tools/perf/util/aslr.h new file mode 100644 index 000000000000..a9b90bf29540 --- /dev/null +++ b/tools/perf/util/aslr.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __PERF_ASLR_H +#define __PERF_ASLR_H + +#include + +#define ASLR_SUPPORTED_SAMPLE_TYPE ( \ + PERF_SAMPLE_IDENTIFIER | \ + PERF_SAMPLE_IP | \ + PERF_SAMPLE_TID | \ + PERF_SAMPLE_TIME | \ + PERF_SAMPLE_ADDR | \ + PERF_SAMPLE_ID | \ + PERF_SAMPLE_STREAM_ID | \ + PERF_SAMPLE_CPU | \ + PERF_SAMPLE_PERIOD | \ + PERF_SAMPLE_READ | \ + PERF_SAMPLE_CALLCHAIN | \ + PERF_SAMPLE_RAW | \ + PERF_SAMPLE_BRANCH_STACK | \ + PERF_SAMPLE_STACK_USER | \ + PERF_SAMPLE_WEIGHT_TYPE | \ + PERF_SAMPLE_DATA_SRC | \ + PERF_SAMPLE_TRANSACTION | \ + PERF_SAMPLE_PHYS_ADDR | \ + PERF_SAMPLE_CGROUP | \ + PERF_SAMPLE_DATA_PAGE_SIZE | \ + PERF_SAMPLE_CODE_PAGE_SIZE | \ + PERF_SAMPLE_AUX) + +struct perf_tool; +struct evsel; + +struct perf_tool *aslr_tool__new(struct perf_tool *delegate); +void aslr_tool__delete(struct perf_tool *aslr); + +#endif /* __PERF_ASLR_H */ --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:39 2026 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 74FBF3F483D for ; Fri, 5 Jun 2026 18:52:29 +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=1780685551; cv=none; b=GJ9FI900UB81M/y2UE53uEtOb+S9TOo/0FhGvyjLfG+lYut9NHgV30Kssbb+qGwypmJMSf2s5k5LqrH9ACfhMGt3+oMDzlZrv5AyyjkoYwlADmQqitljnP1GJfj84kVM1uEKyA7cF63PL0kVuGK6Q1f1fQuK6EO7mAE7NaD3rrM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780685551; c=relaxed/simple; bh=+82x5aWoHkdYVgO+uSMvM0iH44/iOh3/7nnqjK/l8e0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gK389VO0+Oz822AB+RIE0ug4fpUfJOCSX1feoE4/E1toDoOEIYVDqdsfQ6+LOHpr9Soym7RTdRPn4IJVKqlzk1Uo2sZxVA/MxSLAHlsTtzHJ97vLA43OjiityUTdM5yENwi95laEeYxvs0unXVurucIGSr652QRn13GfQqOzXWY= 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=NsUcuB63; 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="NsUcuB63" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-137d4309062so5829140c88.0 for ; Fri, 05 Jun 2026 11:52:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780685548; x=1781290348; 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=/YbD+Wjd7BL8GrjSZIh9V1eXi2DaIrh7jy2xNds9ws0=; b=NsUcuB63M7CeOSLqpRc3YqflsnPv5EeFLeK+2T/zIod8Kz8DUPR06y2dtd7Z4AA9JH Ygdf4iMA1ruG4Y49FZIhlZ9N7a0DKWwgRvvbwGdocTSW3z/DFG3jTIKFXQkb7B1CrMYF 4M7TQ5FGpyB75jXzPg704rUA+eKLzGyG6Ri7F1lo4CDXQhiQj3+CsL9uJxvCm4+7TluM d9Elsue1K5X9N3vP6RpvswEXA8CvM3YQxiiNVpaYN5nmpb3+zeB9n9XRALy5Rpew4lgL U/a8zYs7ehzf9EibPyKtlyk0/J5HbW9KqcorlWuXIAZByYJO0GZz22x/bjTkiizyJnt9 f9bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780685548; x=1781290348; 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=/YbD+Wjd7BL8GrjSZIh9V1eXi2DaIrh7jy2xNds9ws0=; b=DF07+cX0ewdhiPre1R+jw42mw56R093e8kp+ihU3PzQSb2bupFj+aM5rv/NQ4RYR1l Q/gV99Cgd6ZeU+Sqoq5ztWF7DW1xpEx/8DJD8s4w3WqhAjJJb/N3QjV18CgV+ThP9ylx jokN2FvZYdNkfDfsVoHvbA/g+0Ap1le3K8D03i1xqj1BWPAEPTNW4btuc52NtfCcWDX/ mOJQJ/PVOnv2IdIOa7ZV8Gov3YvIaXgFu+4WEcMAI+lIpXdnG/LWVB1tU749nvNJ2gLq 0S/m5UdJywW/LCxjTkyOeXcv4MphtYWsD+SbGFWHBnXffOVaBihG9We0KOSDKXsP1Ltx hRbg== X-Forwarded-Encrypted: i=1; AFNElJ/F+19DY5uL4xlrpPW5zrUn0i8cP+C5IRcAytyh03W36vJrNj0XNy6NcERypzeGkLXxXtbMkxg2UY+EHmw=@vger.kernel.org X-Gm-Message-State: AOJu0YyTVd7IJK7w+2PCzyt+wgu/nXx6eNAiRMGs68471Rrh0kwWqmF6 OxNZtuRLEk80ks6zsu+rSbuV0DJrAhQkcBwwnTpMVlA0Oy4qXi05VYvPTG1zw3y09xfgiH0iMXl LhsouK0chyg== X-Received: from dlaf3.prod.google.com ([2002:a05:701b:2403:b0:137:f863:d944]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:111:b0:136:c565:e862 with SMTP id a92af1059eb24-1380670f0e1mr2262723c88.26.1780685548213; Fri, 05 Jun 2026 11:52:28 -0700 (PDT) Date: Fri, 5 Jun 2026 11:52:13 -0700 In-Reply-To: <20260605185215.2359881-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> <20260605185215.2359881-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605185215.2359881-4-irogers@google.com> Subject: [PATCH v11 3/5] perf inject/aslr: Implement sample address remapping 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add the sample address remapping logic to the ASLR tool. This patch implements aslr_tool__process_sample, which parses sample events, remaps IPs, ADDRs, callchains, and branch stacks using the mappings collected from metadata events, and drops potentially leaking raw, register, stack, physical address, and aux samples. Also adds the aslr_tool__remap_address helper function. Co-developed-by: Gabriel Marin Signed-off-by: Gabriel Marin Signed-off-by: Ian Rogers --- tools/perf/util/aslr.c | 449 +++++++++++++++++++++++++++++++++++++++- tools/perf/util/evsel.c | 6 +- tools/perf/util/evsel.h | 10 +- 3 files changed, 456 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/aslr.c b/tools/perf/util/aslr.c index 375a0355f281..6d081dfae480 100644 --- a/tools/perf/util/aslr.c +++ b/tools/perf/util/aslr.c @@ -109,6 +109,60 @@ static u64 round_up_to_page_size(u64 addr) return (addr + page_size - 1) & ~((u64)page_size - 1); } =20 +static u64 aslr_tool__remap_address(struct aslr_tool *aslr, + struct thread *aslr_thread, + u8 cpumode, + u64 addr) +{ + struct addr_location al; + struct remap_addresses_key key; + u64 *remapped_invariant_ptr =3D NULL; + u64 remap_addr =3D 0; + u8 effective_cpumode =3D cpumode; + + if (!aslr_thread) + return 0; /* No thread. */ + + addr_location__init(&al); + if (!thread__find_map(aslr_thread, cpumode, addr, &al)) { + /* + * If lookup fails with specified cpumode, try fallback to the other spa= ce + * to be robust against bad cpumode in samples. + */ + if (cpumode =3D=3D PERF_RECORD_MISC_KERNEL) + effective_cpumode =3D PERF_RECORD_MISC_USER; + else if (cpumode =3D=3D PERF_RECORD_MISC_USER) + effective_cpumode =3D PERF_RECORD_MISC_KERNEL; + else if (cpumode =3D=3D PERF_RECORD_MISC_GUEST_KERNEL) + effective_cpumode =3D PERF_RECORD_MISC_GUEST_USER; + else if (cpumode =3D=3D PERF_RECORD_MISC_GUEST_USER) + effective_cpumode =3D PERF_RECORD_MISC_GUEST_KERNEL; + + if (!thread__find_map(aslr_thread, effective_cpumode, addr, &al)) { + addr_location__exit(&al); + return 0; /* No mmap. */ + } + } + + key.machine =3D maps__machine(thread__maps(aslr_thread)); + key.dso =3D map__dso(al.map); + key.invariant =3D map__start(al.map) - map__pgoff(al.map); + key.pid =3D (effective_cpumode =3D=3D PERF_RECORD_MISC_KERNEL || + effective_cpumode =3D=3D PERF_RECORD_MISC_GUEST_KERNEL) ? + kernel_pid : thread__pid(aslr_thread); + + if (hashmap__find(&aslr->remap_addresses, &key, &remapped_invariant_ptr))= { + remap_addr =3D *remapped_invariant_ptr + map__pgoff(al.map) + + (addr - map__start(al.map)); + } else { + pr_debug("Cannot find a remapped entry for address %lx in mapping %lx(%l= x) for pid=3D%d\n", + addr, map__start(al.map), map__size(al.map), key.pid); + } + + addr_location__exit(&al); + return remap_addr; +} + struct aslr_machine_priv { bool kernel_maps_loaded; }; @@ -554,13 +608,400 @@ static int aslr_tool__process_sample(const struct pe= rf_tool *tool, struct perf_sample *sample, struct machine *machine) { - struct delegate_tool *del_tool =3D container_of(tool, struct delegate_too= l, tool); - struct aslr_tool *aslr =3D container_of(del_tool, struct aslr_tool, tool); - struct perf_tool *delegate =3D aslr->tool.delegate; + struct evsel *evsel =3D sample->evsel; + struct delegate_tool *del_tool; + struct aslr_tool *aslr; + struct perf_tool *delegate; + int ret; + u64 sample_type; + struct thread *thread; + struct machine *aslr_machine; + __u64 max_i; + __u64 max_j; + union perf_event *new_event; + struct perf_sample new_sample; + __u64 *in_array, *out_array; + u8 cpumode; + u64 addr; + size_t i; + size_t j; + + del_tool =3D container_of(tool, struct delegate_tool, tool); + aslr =3D container_of(del_tool, struct aslr_tool, tool); + delegate =3D aslr->tool.delegate; + + if (evsel__is_dummy_event(evsel)) + return delegate->sample(delegate, event, sample, machine); + + ret =3D -EFAULT; + sample_type =3D evsel->core.attr.sample_type; + max_i =3D (event->header.size - sizeof(struct perf_event_header)) / sizeo= f(__u64); + max_j =3D (PERF_SAMPLE_MAX_SIZE - sizeof(struct perf_event_header)) / siz= eof(__u64); + new_event =3D (union perf_event *)aslr->event_copy; + cpumode =3D sample->cpumode; + i =3D 0; + j =3D 0; + + aslr_machine =3D machines__findnew(&aslr->machines, machine->pid); + if (!aslr_machine) + return -ENOMEM; + if (aslr_tool__preload_kernel_maps(aslr_machine) < 0) + return -ENOMEM; + + thread =3D machine__findnew_thread(aslr_machine, sample->pid, sample->tid= ); + + if (!thread) + return -ENOMEM; =20 - return delegate->sample(delegate, event, sample, machine); + if (max_i > PERF_SAMPLE_MAX_SIZE / sizeof(u64)) + goto out_put; + + new_event->sample.header =3D event->sample.header; + + in_array =3D &event->sample.array[0]; + out_array =3D &new_event->sample.array[0]; + +#define CHECK_BOUNDS(required_i, required_j) \ + (i + (required_i) > max_i || j + (required_j) > max_j) + +#define COPY_U64() \ + do { \ + if (CHECK_BOUNDS(1, 1)) { \ + ret =3D -EFAULT; \ + goto out_put; \ + } \ + out_array[j++] =3D in_array[i++]; \ + } while (0) + +#define REMAP_U64(addr_field) \ + do { \ + if (CHECK_BOUNDS(1, 1)) { \ + ret =3D -EFAULT; \ + goto out_put; \ + } \ + out_array[j++] =3D aslr_tool__remap_address(aslr, thread, cpumode, addr_= field); \ + i++; \ + } while (0) + + if (sample_type & PERF_SAMPLE_IDENTIFIER) + COPY_U64(); /* id */ + if (sample_type & PERF_SAMPLE_IP) + REMAP_U64(sample->ip); + if (sample_type & PERF_SAMPLE_TID) + COPY_U64(); /* pid, tid */ + if (sample_type & PERF_SAMPLE_TIME) + COPY_U64(); /* time */ + if (sample_type & PERF_SAMPLE_ADDR) + REMAP_U64(sample->addr); + if (sample_type & PERF_SAMPLE_ID) + COPY_U64(); /* id */ + if (sample_type & PERF_SAMPLE_STREAM_ID) + COPY_U64(); /* stream_id */ + if (sample_type & PERF_SAMPLE_CPU) + COPY_U64(); /* cpu, res */ + if (sample_type & PERF_SAMPLE_PERIOD) + COPY_U64(); /* period */ + if (sample_type & PERF_SAMPLE_READ) { + if ((evsel->core.attr.read_format & PERF_FORMAT_GROUP) =3D=3D 0) { + COPY_U64(); /* value */ + if (evsel->core.attr.read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) + COPY_U64(); /* time_enabled */ + if (evsel->core.attr.read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) + COPY_U64(); /* time_running */ + if (evsel->core.attr.read_format & PERF_FORMAT_ID) + COPY_U64(); /* id */ + if (evsel->core.attr.read_format & PERF_FORMAT_LOST) + COPY_U64(); /* lost */ + } else { + u64 nr; + + if (CHECK_BOUNDS(1, 1)) { + ret =3D -EFAULT; + goto out_put; + } + out_array[j] =3D in_array[i]; + nr =3D out_array[j++]; + i++; + if (evsel->core.attr.read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) + COPY_U64(); /* time_enabled */ + if (evsel->core.attr.read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) + COPY_U64(); /* time_running */ + for (u64 cntr =3D 0; cntr < nr; cntr++) { + COPY_U64(); /* value */ + if (evsel->core.attr.read_format & PERF_FORMAT_ID) + COPY_U64(); /* id */ + if (evsel->core.attr.read_format & PERF_FORMAT_LOST) + COPY_U64(); /* lost */ + } + } + } + if (sample_type & PERF_SAMPLE_CALLCHAIN) { + u64 nr; + + if (CHECK_BOUNDS(1, 1)) { + ret =3D -EFAULT; + goto out_put; + } + out_array[j] =3D in_array[i]; + nr =3D out_array[j++]; + i++; + + for (u64 cntr =3D 0; cntr < nr; cntr++) { + if (CHECK_BOUNDS(1, 1)) { + ret =3D -EFAULT; + goto out_put; + } + addr =3D in_array[i++]; + if (addr >=3D PERF_CONTEXT_MAX) { + out_array[j++] =3D addr; + switch (addr) { + case PERF_CONTEXT_HV: + cpumode =3D PERF_RECORD_MISC_HYPERVISOR; + break; + case PERF_CONTEXT_KERNEL: + cpumode =3D PERF_RECORD_MISC_KERNEL; + break; + case PERF_CONTEXT_USER: + cpumode =3D PERF_RECORD_MISC_USER; + break; + case PERF_CONTEXT_GUEST: + cpumode =3D PERF_RECORD_MISC_GUEST_KERNEL; + break; + case PERF_CONTEXT_GUEST_KERNEL: + cpumode =3D PERF_RECORD_MISC_GUEST_KERNEL; + break; + case PERF_CONTEXT_GUEST_USER: + cpumode =3D PERF_RECORD_MISC_GUEST_USER; + break; + case PERF_CONTEXT_USER_DEFERRED: + if (cntr + 1 >=3D nr) { + pr_debug("Truncated callchain deferred cookie context\n"); + ret =3D 0; + goto out_put; + } + /* + * Immediately followed by a 64-bit + * stitching cookie. Skip/Copy it! + */ + if (CHECK_BOUNDS(1, 1)) { + ret =3D -EFAULT; + goto out_put; + } + out_array[j++] =3D in_array[i++]; + cntr++; + cpumode =3D PERF_RECORD_MISC_USER; + break; + default: + pr_debug("invalid callchain context: %"PRIx64"\n", addr); + ret =3D 0; + goto out_put; + } + continue; + } + out_array[j++] =3D aslr_tool__remap_address(aslr, thread, cpumode, addr= ); + } + } + if (sample_type & PERF_SAMPLE_RAW) { + size_t bytes =3D sizeof(u32) + sample->raw_size; + size_t u64_words =3D (bytes + 7) / 8; + + if (i + u64_words > max_i || j + u64_words > max_j) { + ret =3D -EFAULT; + goto out_put; + } + memcpy(&out_array[j], &in_array[i], bytes); + i +=3D u64_words; + j +=3D u64_words; + /* + * TODO: certain raw samples can be remapped, such as + * tracepoints by examining their fields. + */ + pr_debug("Dropping raw samples as possible ASLR leak\n"); + ret =3D 0; + goto out_put; + } + if (sample_type & PERF_SAMPLE_BRANCH_STACK) { + u64 nr; + + if (CHECK_BOUNDS(1, 1)) { + ret =3D -EFAULT; + goto out_put; + } + out_array[j] =3D in_array[i]; + nr =3D out_array[j++]; + i++; + + if (evsel->core.attr.branch_sample_type & PERF_SAMPLE_BRANCH_HW_INDEX) + COPY_U64(); /* hw_idx */ + + if (nr > (ULLONG_MAX / 3)) { + ret =3D -EFAULT; + goto out_put; + } + if (nr * 3 > max_i - i || nr * 3 > max_j - j) { + ret =3D -EFAULT; + goto out_put; + } + for (u64 cntr =3D 0; cntr < nr; cntr++) { + out_array[j++] =3D aslr_tool__remap_address(aslr, thread, + sample->cpumode, + in_array[i++]); /* from */ + out_array[j++] =3D aslr_tool__remap_address(aslr, thread, + sample->cpumode, + in_array[i++]); /* to */ + out_array[j++] =3D in_array[i++]; /* flags */ + } + if (evsel->core.attr.branch_sample_type & PERF_SAMPLE_BRANCH_COUNTERS) { + if (nr > max_i - i || nr > max_j - j) { + ret =3D -EFAULT; + goto out_put; + } + memcpy(&out_array[j], &in_array[i], nr * sizeof(u64)); + i +=3D nr; + j +=3D nr; + /* TODO: confirm branch counters don't leak ASLR information. */ + pr_debug("Dropping sample branch counters as possible ASLR leak\n"); + ret =3D 0; + goto out_put; + } + } + if (sample_type & PERF_SAMPLE_REGS_USER) { + if (CHECK_BOUNDS(1, 0)) { + ret =3D -EFAULT; + goto out_put; + } + /* abi */ + COPY_U64(); + /* TODO: can this be less conservative? */ + pr_debug("Dropping regs user sample as possible ASLR leak\n"); + ret =3D 0; + goto out_put; + } + if (sample_type & PERF_SAMPLE_STACK_USER) { + u64 size; + + if (CHECK_BOUNDS(1, 1)) { + ret =3D -EFAULT; + goto out_put; + } + out_array[j] =3D in_array[i]; + size =3D out_array[j++]; + i++; + if (size > 0) { + size_t u64_words =3D size / 8 + (size % 8 ? 1 : 0); + + if (u64_words > max_i - i || u64_words > max_j - j) { + ret =3D -EFAULT; + goto out_put; + } + memcpy(&out_array[j], &in_array[i], size); + if (size % 8) { + size_t pad =3D 8 - (size % 8); + + memset(((char *)&out_array[j]) + size, 0, pad); + } + i +=3D u64_words; + j +=3D u64_words; + } + /* TODO: can this be less conservative? */ + pr_debug("Dropping stack user sample as possible ASLR leak\n"); + ret =3D 0; + goto out_put; + } + if (sample_type & PERF_SAMPLE_WEIGHT_TYPE) + COPY_U64(); /* perf_sample_weight */ + if (sample_type & PERF_SAMPLE_DATA_SRC) + COPY_U64(); /* data_src */ + if (sample_type & PERF_SAMPLE_TRANSACTION) + COPY_U64(); /* transaction */ + if (sample_type & PERF_SAMPLE_REGS_INTR) { + if (CHECK_BOUNDS(1, 0)) { + ret =3D -EFAULT; + goto out_put; + } + /* abi */ + COPY_U64(); + /* TODO: can this be less conservative? */ + pr_debug("Dropping interrupt register sample as possible ASLR leak\n"); + ret =3D 0; + goto out_put; + } + if (sample_type & PERF_SAMPLE_PHYS_ADDR) { + COPY_U64(); /* phys_addr */ + /* TODO: can this be less conservative? */ + pr_debug("Dropping physical address sample as possible ASLR leak\n"); + ret =3D 0; + goto out_put; + } + if (sample_type & PERF_SAMPLE_CGROUP) + COPY_U64(); /* cgroup */ + if (sample_type & PERF_SAMPLE_DATA_PAGE_SIZE) + COPY_U64(); /* data_page_size */ + if (sample_type & PERF_SAMPLE_CODE_PAGE_SIZE) + COPY_U64(); /* code_page_size */ + + if (sample_type & PERF_SAMPLE_AUX) { + u64 size; + + if (CHECK_BOUNDS(1, 1)) { + ret =3D -EFAULT; + goto out_put; + } + out_array[j] =3D in_array[i]; + size =3D out_array[j++]; + i++; + if (size > 0) { + size_t u64_words =3D size / 8 + (size % 8 ? 1 : 0); + + if (u64_words > max_i - i || u64_words > max_j - j) { + ret =3D -EFAULT; + goto out_put; + } + memcpy(&out_array[j], &in_array[i], size); + if (size % 8) { + size_t pad =3D 8 - (size % 8); + + memset(((char *)&out_array[j]) + size, 0, pad); + } + i +=3D u64_words; + j +=3D u64_words; + } + /* TODO: can this be less conservative? */ + pr_debug("Dropping aux sample as possible ASLR leak\n"); + ret =3D 0; + goto out_put; + } + + if (evsel__is_offcpu_event(evsel)) { + /* TODO: can this be less conservative? */ + pr_debug("Dropping off-CPU sample as possible ASLR leak\n"); + ret =3D 0; + goto out_put; + } + + new_event->sample.header.size =3D sizeof(struct perf_event_header) + j * = sizeof(u64); + + perf_sample__init(&new_sample, /*all=3D*/ true); + ret =3D evsel__parse_sample(evsel, new_event, &new_sample); + + if (ret) { + perf_sample__exit(&new_sample); + goto out_put; + } + + new_sample.evsel =3D evsel; + ret =3D delegate->sample(delegate, new_event, &new_sample, machine); + perf_sample__exit(&new_sample); + +out_put: + thread__put(thread); + return ret; } =20 +#undef CHECK_BOUNDS +#undef COPY_U64 +#undef REMAP_U64 + static int skipn(int fd, off_t n) { char buf[4096]; diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 34c03f47a913..05fa0010c858 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -3337,11 +3337,11 @@ static int __set_offcpu_sample(struct perf_sample *= data) return -EFAULT; } =20 -int evsel__parse_sample(struct evsel *evsel, union perf_event *event, - struct perf_sample *data) +int __evsel__parse_sample(struct evsel *evsel, union perf_event *event, + struct perf_sample *data, bool needs_swap) { u64 type =3D evsel->core.attr.sample_type; - bool swapped =3D evsel->needs_swap; + bool swapped =3D needs_swap; const __u64 *array; u16 max_size =3D event->header.size; const void *endp =3D (void *)event + max_size; diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 8178858d168a..8009be22cc3f 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -432,8 +432,14 @@ static inline int evsel__read_on_cpu_scaled(struct evs= el *evsel, int cpu_map_idx return __evsel__read_on_cpu(evsel, cpu_map_idx, thread, true); } =20 -int evsel__parse_sample(struct evsel *evsel, union perf_event *event, - struct perf_sample *sample); +int __evsel__parse_sample(struct evsel *evsel, union perf_event *event, + struct perf_sample *data, bool needs_swap); + +static inline int evsel__parse_sample(struct evsel *evsel, union perf_even= t *event, + struct perf_sample *data) +{ + return __evsel__parse_sample(evsel, event, data, evsel->needs_swap); +} =20 int evsel__parse_sample_timestamp(struct evsel *evsel, union perf_event *e= vent, u64 *timestamp); --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:39 2026 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 C741A3F58D8 for ; Fri, 5 Jun 2026 18:52:32 +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=1780685554; cv=none; b=eqfPAZomwBgtKYQtYgmRU+G18a3iYWYLqke+dYyYyWsa/NTRpVjQaCgIvNOA3E4VUFBuJEkgzko5+WOfqsqn10u9MBfuktLQ0m4gGpx0MxBbvc0P0Aa/upZTuGjPT/l/GTqruv6WoPGUWODBSEhqmpj9yKlezCRNSlI0gKjSo9A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780685554; c=relaxed/simple; bh=EKtC/lvj/1x7foH7Gmv7h68D75QB3TnoOEUOZ0Aarac=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oOYTrQnspY/VcVy6C3ZqV0o9NnAgrxa9d5/r/ZFbTRt9Rau6RL0GSdidR+ELirraalqdKVRxoIXKa0xTPWKDCU3KONyKWJAvx/53waDFLeb8MEPWh75INjQ0lOZZghT3nUDR9ExttGwiSB3UrDRdXDA2f3yKs36e2vF/u+LiH5E= 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=t0IVx4qY; 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="t0IVx4qY" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-137dd5100c7so3249464c88.1 for ; Fri, 05 Jun 2026 11:52:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780685552; x=1781290352; 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=l+L+4ePAVYPRjEGmd/fjli1XPzR17aGwHmlHfUuUJqA=; b=t0IVx4qYgtbB8P1+dtpZ6b/amzzn3duAJcaHIyV2lTLsJCw2+r/VQNyn/5lqDQmXYM N25Pv/cmiqsf6eLsYmUuhX07oBbd+P/dIGwNLKv1zw957DheUeokpzJT83YRqxtUVKjJ RoyWA2AeiH+GKFKKKlJAiLRHEYMYWzvzEfE6X+UycmZhW727IZ/fw9L9X2WlORSWqeZx 3RYlaKYfW7XIrZ2vjWN6antCC0zHUA+QGzQl+osN7ss7RSI5EdUEI6t5G9ju+zo8Q8K3 WjoYuxfkly0OcoLQlFdEDau70Bbj/COdUl5HzXd0M0HZWwkMlj3Euyw6VB5AODn7YHHw FzbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780685552; x=1781290352; 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=l+L+4ePAVYPRjEGmd/fjli1XPzR17aGwHmlHfUuUJqA=; b=b7+fHhFUO69udQgXO7ZbcVwdxWOeI4SyqNE58MeJxIi9NJ5c48dgu5SL2tSUIblQo0 1H3U91/z9csMYTLNezqh5DDn0Z2Ow/z/SLWkZlIlj7G1W4zuTnCS5AOAcPiJ/RZzg2no RpKIVgw5+S4AK0OwzaadVua5Z6KHhIx2nyZmq7ynV7O6pNRgDsSdXo1/dwrW0QRoEgLv 4/Ov+iR1uNVyiXCZlaadxbbHaAlqIvMMGrPqW2dKVTjtNQL9O34UpTLL5sl971qF5i6M KBb/Vv7mysjnIDxo8K1eV2IExoBT9/NfuE04wEINQkK8wryOfEp9s83zMbiuydmZAOn7 fVjQ== X-Forwarded-Encrypted: i=1; AFNElJ9QALX1UaDpwPUTivshuNwiwKgx+llXqNf7E4m2YH85eWxfNrQ1uTI7ewDtl9f9ZKInwnAZ2r653r+8Qmo=@vger.kernel.org X-Gm-Message-State: AOJu0Yy+1sYgxgSnLsHZA51qJsh5Xhkr+Bfs8aT4Mz3tfukT/60l4p4N Fw1MZSn0Tt7sP49O+kErwW6J7JydLhd5N6jS6e8WQTQ1j8DpTvC2vaH4qBWpYSYo4zLUxLck/N7 n4OJWd9huAQ== X-Received: from dlbrx9.prod.google.com ([2002:a05:7022:1709:b0:138:57f:8a4f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:7a5:b0:137:6781:7dd4 with SMTP id a92af1059eb24-138066b5982mr2133449c88.8.1780685551545; Fri, 05 Jun 2026 11:52:31 -0700 (PDT) Date: Fri, 5 Jun 2026 11:52:14 -0700 In-Reply-To: <20260605185215.2359881-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> <20260605185215.2359881-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605185215.2359881-5-irogers@google.com> Subject: [PATCH v11 4/5] perf test: Add inject ASLR test 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a new shell test to verify the feature. The test covers: - Basic address remapping for user space samples. - Pipe mode coverage for piped into . - Callchain address remapping. - Consistency of output before and after injection. - Pipe mode report consistency. - Dropping of samples that leak ASLR info (physical addresses). - Kernel address remapping (utilizing a dedicated kernel-intensive VFS dd workload to guarantee continuous timer interrupts sampling flow inside kernel privilege states). - Kernel report consistency with address normalization. The test suite is hardened with global 'set -o pipefail' assertions to catch pipeline failures, stream-consuming awk processors to handle SIGPIPE signals, and a dedicated pipe output scenario validating raw 'perf inject -o -' stdout streams. Assisted-by: Antigravity:gemini-3.5-flash Signed-off-by: Ian Rogers --- tools/perf/tests/shell/inject_aslr.sh | 464 ++++++++++++++++++++++++++ 1 file changed, 464 insertions(+) create mode 100755 tools/perf/tests/shell/inject_aslr.sh diff --git a/tools/perf/tests/shell/inject_aslr.sh b/tools/perf/tests/shell= /inject_aslr.sh new file mode 100755 index 000000000000..d8ded16ba905 --- /dev/null +++ b/tools/perf/tests/shell/inject_aslr.sh @@ -0,0 +1,464 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# perf inject --aslr test + +set -e +set -o pipefail + +shelldir=3D$(dirname "$0") +# shellcheck source=3Dlib/perf_has_symbol.sh +. "${shelldir}"/lib/perf_has_symbol.sh + +sym=3D"noploop" + +skip_test_missing_symbol ${sym} + +# Create global temp directory +temp_dir=3D$(mktemp -d /tmp/perf-test-aslr.XXXXXXXXXX) + +prog=3D"perf test -w noploop" +[ "$(uname -m)" =3D "s390x" ] && prog=3D"$prog 3" +err=3D0 +kprog=3D"dd if=3D/dev/zero of=3D/dev/null bs=3D1M count=3D500" + +cleanup() { + local exit_code=3D${1:-$?} + trap - EXIT TERM INT + if [ "${exit_code}" -ne 0 ] || [ "${err}" -ne 0 ]; then + echo "Test failed! Preserving temp directory: ${temp_dir}" + return + fi + # Check if temp_dir is set and looks sane before removing + if [[ "${temp_dir}" =3D~ ^/tmp/perf-test-aslr\. ]]; then + rm -rf "${temp_dir}" + fi +} + +trap_cleanup() { + local exit_code=3D$? + echo "Unexpected signal in ${FUNCNAME[1]}" + cleanup ${exit_code} + exit ${exit_code} +} +trap trap_cleanup EXIT TERM INT + +get_noploop_addr() { + local file=3D$1 + perf script -i "$file" | awk ' + BEGIN { found=3D0 } + { + for (i=3D1; i<=3DNF; i++) { + if ($i ~ /noploop\+/) { + if (!found) { + print $(i-1) + found=3D1 + } + } + } + }' +} + +test_basic_aslr() { + echo "Test basic ASLR remapping" + local data + data=3D$(mktemp "${temp_dir}/perf.data.basic.XXXXXX") + local data2 + data2=3D$(mktemp "${temp_dir}/perf.data2.basic.XXXXXX") + + perf record -e task-clock:u -o "${data}" ${prog} + perf inject -v --aslr -i "${data}" -o "${data2}" + + orig_addr=3D$(get_noploop_addr "${data}") + new_addr=3D$(get_noploop_addr "${data2}") + + echo "Basic ASLR: orig_addr=3D$orig_addr, new_addr=3D$new_addr" + + if [ -z "$orig_addr" ]; then + echo "Basic ASLR test [Failed - no noploop samples in original file]" + err=3D1 + elif [ -z "$new_addr" ]; then + echo "Basic ASLR test [Failed - could not find remapped address]" + err=3D1 + elif [ "$orig_addr" =3D "$new_addr" ]; then + echo "Basic ASLR test [Failed - addresses are not remapped]" + err=3D1 + else + echo "Basic ASLR test [Success]" + fi +} + +test_pipe_aslr() { + echo "Test pipe mode ASLR remapping" + local data + data=3D$(mktemp "${temp_dir}/perf.data.pipe.XXXXXX") + local data2 + data2=3D$(mktemp "${temp_dir}/perf.data2.pipe.XXXXXX") + + # Use tee to save the original pipe data for comparison + perf record -e task-clock:u -o - ${prog} | tee "${data}" | perf inject -= -aslr -o "${data2}" + + orig_addr=3D$(get_noploop_addr "${data}") + new_addr=3D$(get_noploop_addr "${data2}") + + echo "Pipe ASLR: orig_addr=3D$orig_addr, new_addr=3D$new_addr" + + if [ -z "$orig_addr" ]; then + echo "Pipe ASLR test [Failed - no noploop samples in original file]" + err=3D1 + elif [ -z "$new_addr" ]; then + echo "Pipe ASLR test [Failed - could not find remapped address]" + err=3D1 + elif [ "$orig_addr" =3D "$new_addr" ]; then + echo "Pipe ASLR test [Failed - addresses are not remapped]" + err=3D1 + else + echo "Pipe ASLR test [Success]" + fi +} + +test_callchain_aslr() { + echo "Test Callchain ASLR remapping" + local data + data=3D$(mktemp "${temp_dir}/perf.data.callchain.XXXXXX") + local data2 + data2=3D$(mktemp "${temp_dir}/perf.data2.callchain.XXXXXX") + + perf record -g -e task-clock:u -o "${data}" ${prog} + perf inject --aslr -i "${data}" -o "${data2}" + + orig_addr=3D$(get_noploop_addr "${data}") + new_addr=3D$(get_noploop_addr "${data2}") + + echo "Callchain ASLR: orig_addr=3D$orig_addr, new_addr=3D$new_addr" + + if [ -z "$orig_addr" ]; then + echo "Callchain ASLR test [Failed - no noploop samples in original fil= e]" + err=3D1 + elif [ -z "$new_addr" ]; then + echo "Callchain ASLR test [Failed - could not find remapped address]" + err=3D1 + elif [ "$orig_addr" =3D "$new_addr" ]; then + echo "Callchain ASLR test [Failed - addresses are not remapped]" + err=3D1 + else + # Extract callchain addresses (indented lines starting with hex addres= ses) + orig_callchain=3D$(perf script -i "${data}" | awk '/^[[:space:]]+[0-9a= -f]+/ {print $1}') + new_callchain=3D$(perf script -i "${data2}" | awk '/^[[:space:]]+[0-9a= -f]+/ {print $1}') + + if [ -z "$orig_callchain" ]; then + echo "Callchain ASLR test [Failed - no callchain samples in original= file]" + err=3D1 + elif [ -z "$new_callchain" ]; then + echo "Callchain ASLR test [Failed - callchain data was dropped]" + err=3D1 + elif [ "$orig_callchain" =3D "$new_callchain" ]; then + echo "Callchain ASLR test [Failed - callchain addresses were not rem= apped]" + err=3D1 + else + echo "Callchain ASLR test [Success]" + fi + fi +} + +test_report_aslr() { + echo "Test perf report consistency" + local data + data=3D$(mktemp "${temp_dir}/perf.data.report.XXXXXX") + local data2 + data2=3D$(mktemp "${temp_dir}/perf.data2.report.XXXXXX") + local data_clean + data_clean=3D$(mktemp "${temp_dir}/perf.data.clean.XXXXXX") + + perf record -e task-clock:u -o "${data}" ${prog} + # Use -b to inject build-ids and force ordered events processing in both + perf inject -b -i "${data}" -o "${data_clean}" + perf inject -v -b --aslr -i "${data}" -o "${data2}" + + local report1=3D"${temp_dir}/report1" + local report2=3D"${temp_dir}/report2" + local report1_clean=3D"${temp_dir}/report1.clean" + local report2_clean=3D"${temp_dir}/report2.clean" + local diff_file=3D"${temp_dir}/diff" + + perf report -i "${data_clean}" --stdio > "${report1}" + perf report -i "${data2}" --stdio > "${report2}" + + # Strip headers and compare lines with percentages + grep '%' "${report1}" | grep -v '^#' | sort > "${report1_clean}" || true + grep '%' "${report2}" | grep -v '^#' | sort > "${report2_clean}" || true + + diff -u -w "${report1_clean}" "${report2_clean}" > "${diff_file}" || true + + if [ ! -s "${report1_clean}" ]; then + echo "Report ASLR test [Failed - no samples captured]" + err=3D1 + elif [ -s "${diff_file}" ]; then + echo "Report ASLR test [Failed - reports differ]" + echo "Showing first 20 lines of diff:" + head -n 20 "${diff_file}" + err=3D1 + else + echo "Report ASLR test [Success]" + fi +} + +test_pipe_report_aslr() { + echo "Test pipe mode perf report consistency" + local data + data=3D$(mktemp "${temp_dir}/perf.data.pipe_report.XXXXXX") + local data2 + data2=3D$(mktemp "${temp_dir}/perf.data2.pipe_report.XXXXXX") + local data_clean + data_clean=3D$(mktemp "${temp_dir}/perf.data.clean.XXXXXX") + + # Use tee to save the original pipe data, then process it with inject -b + perf record -e task-clock:u -o - ${prog} | \ + tee "${data}" | \ + perf inject -b --aslr -o "${data2}" + perf inject -b -i "${data}" -o "${data_clean}" + + local report1=3D"${temp_dir}/report1" + local report2=3D"${temp_dir}/report2" + local report1_clean=3D"${temp_dir}/report1.clean" + local report2_clean=3D"${temp_dir}/report2.clean" + local diff_file=3D"${temp_dir}/diff" + + perf report -i "${data_clean}" --stdio > "${report1}" + perf report -i "${data2}" --stdio > "${report2}" + + # Strip headers and compare lines with percentages + grep '%' "${report1}" | grep -v '^#' | sort > "${report1_clean}" || true + grep '%' "${report2}" | grep -v '^#' | sort > "${report2_clean}" || true + + diff -u -w "${report1_clean}" "${report2_clean}" > "${diff_file}" || true + + if [ ! -s "${report1_clean}" ]; then + echo "Pipe Report ASLR test [Failed - no samples captured]" + err=3D1 + elif [ -s "${diff_file}" ]; then + echo "Pipe Report ASLR test [Failed - reports differ]" + echo "Showing first 20 lines of diff:" + head -n 20 "${diff_file}" + err=3D1 + else + echo "Pipe Report ASLR test [Success]" + fi +} + +test_pipe_out_report_aslr() { + echo "Test pipe output mode perf report consistency" + local data + data=3D$(mktemp "${temp_dir}/perf.data.pipe_out_report.XXXXXX") + local data_clean + data_clean=3D$(mktemp "${temp_dir}/perf.data.clean.XXXXXX") + + perf record -e task-clock:u -o "${data}" ${prog} + perf inject -b -i "${data}" -o "${data_clean}" + + local report1=3D"${temp_dir}/report1" + local report2=3D"${temp_dir}/report2" + local report1_clean=3D"${temp_dir}/report1.clean" + local report2_clean=3D"${temp_dir}/report2.clean" + local diff_file=3D"${temp_dir}/diff" + + perf report -i "${data_clean}" --stdio > "${report1}" + perf inject -b --aslr -i "${data}" -o - | perf report -i - --stdio > "${= report2}" + + # Strip headers and compare lines with percentages + grep '%' "${report1}" | grep -v '^#' | sort > "${report1_clean}" || true + grep '%' "${report2}" | grep -v '^#' | sort > "${report2_clean}" || true + + diff -u -w "${report1_clean}" "${report2_clean}" > "${diff_file}" || true + + if [ ! -s "${report1_clean}" ]; then + echo "Pipe Output Report ASLR test [Failed - no samples captured]" + err=3D1 + elif [ -s "${diff_file}" ]; then + echo "Pipe Output Report ASLR test [Failed - reports differ]" + echo "Showing first 20 lines of diff:" + head -n 20 "${diff_file}" + err=3D1 + else + echo "Pipe Output Report ASLR test [Success]" + fi +} + +test_dropped_samples() { + echo "Test dropped samples (phys-data)" + local data + data=3D$(mktemp "${temp_dir}/perf.data.dropped.XXXXXX") + local data2 + data2=3D$(mktemp "${temp_dir}/perf.data2.dropped.XXXXXX") + + # Check if --phys-data is supported by recording a short run + if ! perf record -e task-clock:u --phys-data -o "${data}" -- sleep 0.1 >= /dev/null 2>&1; then + echo "Skipping dropped samples test as --phys-data is not supported" + return + fi + + perf record -e task-clock:u --phys-data -o "${data}" ${prog} + perf inject --aslr -i "${data}" -o "${data2}" + + # Verify that the original file actually contained samples! + orig_samples=3D$(perf script -i "${data}" | wc -l) + if [ "$orig_samples" -eq 0 ]; then + echo "Dropped samples test [Failed - no samples in original file]" + err=3D1 + else + # Verify that samples are dropped. + samples_count=3D$(perf script -i "${data2}" | wc -l) + + if [ "$samples_count" -gt 0 ]; then + echo "Dropped samples test [Failed - samples were not dropped]" + err=3D1 + else + echo "Dropped samples test [Success]" + fi + fi +} + +test_kernel_aslr() { + echo "Test kernel ASLR remapping" + local kdata + kdata=3D$(mktemp "${temp_dir}/perf.data.kernel.XXXXXX") + local kdata2 + kdata2=3D$(mktemp "${temp_dir}/perf.data2.kernel.XXXXXX") + local log_file + log_file=3D$(mktemp "${temp_dir}/kernel_record.log.XXXXXX") + + # Try to record kernel samples + if ! perf record -e task-clock:k -o "${kdata}" ${kprog} > "${log_file}" = 2>&1; then + echo "Skipping kernel ASLR test as recording failed (maybe no permissi= ons)" + return + fi + + # Check for warning about kernel map restriction + if grep -q "Couldn't record kernel reference relocation symbol" "${log_f= ile}"; then + echo "Skipping kernel ASLR test as kernel map could not be recorded (p= ermissions restricted)" + return + fi + + perf inject -v --aslr -i "${kdata}" -o "${kdata2}" + + # Check if kernel addresses are remapped. + # Find the field that ends with :k: (the event name) and take the next f= ield! + orig_addr=3D$(perf script -i "${kdata}" | awk ' + BEGIN { found=3D0 } + { + for (i=3D1; i "${log_file}" = 2>&1; then + echo "Skipping kernel report test as recording failed (maybe no permis= sions)" + return + fi + + # Check for warning about kernel map restriction + if grep -q "Couldn't record kernel reference relocation symbol" "${log_f= ile}"; then + echo "Skipping kernel report test as kernel map could not be recorded = (permissions restricted)" + return + fi + + # Use -b to inject build-ids and force ordered events processing in both + perf inject -b -i "${kdata}" -o "${data_clean}" + perf inject -v -b --aslr -i "${kdata}" -o "${kdata2}" + + local report1=3D"${temp_dir}/report_kernel1" + local report2=3D"${temp_dir}/report_kernel2" + local report1_clean=3D"${temp_dir}/report_kernel1.clean" + local report2_clean=3D"${temp_dir}/report_kernel2.clean" + + perf report -i "${data_clean}" --stdio > "${report1}" + perf report -i "${kdata2}" --stdio > "${report2}" + + # Strip headers and compare lines with percentages + grep '%' "${report1}" | grep -v '^#' > "${report1_clean}" || true + grep '%' "${report2}" | grep -v '^#' > "${report2_clean}" || true + + # Normalize kernel DSOs and addresses in clean reports + # This allows kernel modules to be either a module or kernel.kallsyms + local report1_norm=3D"${temp_dir}/report_kernel1.norm" + local report2_norm=3D"${temp_dir}/report_kernel2.norm" + local diff_file=3D"${temp_dir}/diff_kernel" + + grep -v -E '0x[0-9a-f]{8,}|0000000000000000' "${report1_clean}" | \ + awk '{gsub(/\[[a-zA-Z0-9_.-]{2,}\](\.[a-zA-Z0-9_]+)?/, "[kernel]", $0)= ; print}' | \ + sort > "${report1_norm}" || true + grep -v -E '0x[0-9a-f]{8,}|0000000000000000' "${report2_clean}" | \ + awk '{gsub(/\[[a-zA-Z0-9_.-]{2,}\](\.[a-zA-Z0-9_]+)?/, "[kernel]", $0)= ; print}' | \ + sort > "${report2_norm}" || true + + diff -u -w "${report1_norm}" "${report2_norm}" > "${diff_file}" || true + + if [ ! -s "${report1_norm}" ]; then + echo "Kernel Report ASLR test [Failed - no samples captured]" + err=3D1 + elif [ -s "${diff_file}" ]; then + echo "Kernel Report ASLR test [Failed - reports differ]" + echo "Showing first 20 lines of diff:" + head -n 20 "${diff_file}" + err=3D1 + else + echo "Kernel Report ASLR test [Success]" + fi +} + +test_basic_aslr +test_pipe_aslr +test_callchain_aslr +test_report_aslr +test_pipe_report_aslr +test_pipe_out_report_aslr +test_dropped_samples +test_kernel_aslr +test_kernel_report_aslr + +cleanup ${err} +exit $err --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:39 2026 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 3C0723F39E0 for ; Fri, 5 Jun 2026 18:52:35 +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=1780685557; cv=none; b=RNhPCoWDZu+N8ku0mjQDRhroLEGKuBuUZsqD3Xq4pg3pfAAiVxwV8Ig32E9SFH4YnnMAtYISYEGpGalP8rm2y4MBP+OKsVoLzGI3v6sXoAmQJF+icHNxFEdsNFmVuY12Ql29N7ukGW3hsSJhReYeInnukEO0rZTmEbiqzhC6eqg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780685557; c=relaxed/simple; bh=4n2tZKc2McVDpwhiSwRcUNallV6FrNgrqrFzwOAh1X4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=b7eR4XwNzm3UFxdvCn/i15CAEyltqm8JsbyF4YBUsT8dUawWMc9/i6uOunxMlzMXolPSq+ET4KlavkzuS0gNhGKDtIgu09uH9xy3gdQLFL9fDIUhhSbXB2+Ne5pyCvLHwKp/oGjUjuA2g8bxb1RriNpoFoyjnkke1eCw97+qGw0= 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=XVR34oM4; 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="XVR34oM4" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-304df51ff3eso1953083eec.0 for ; Fri, 05 Jun 2026 11:52:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780685554; x=1781290354; 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=dyXHJxSc/U+gnsHWfAxxv7dTSv31ERYzWYYb9FLIEq4=; b=XVR34oM4F/RZ5QCaFHyX7EiT6M7VY+yWI55DxZsy7Uxp+CdOeXTZRCc+QgcGmR87w7 foHott4idex4BDDwVjRdODhm3+F2SL/h8h1yGGMIlndYdh+L4ZT9Nuh3BQplGzvhOnmY czmc7/9jSVxIOazBtKCDIwjd4zQpv1SGZVrnYOuZDEp8a1CXLbTQ88/AmdkvxErbx1i6 qFqF3VKxtC7pCyV7aKOjPRq1n5VMm2ittWaYrxahxs8jqLzi8CRz00IiRXXS8hHJje0X DWwoELf9q8f3kVjFndtt6n9J4wxFlN8ZXv7iIlTciIHy5jhJyFPeCzFuKMSWG5JQPCCu 0lUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780685554; x=1781290354; 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=dyXHJxSc/U+gnsHWfAxxv7dTSv31ERYzWYYb9FLIEq4=; b=ro4rpp9X8d/FOt++05eZd+55gTKfJP4Ts/ryTSh+d905hjq5ZG27wa1Dv9rb57O34W dgwk763sGA2UBrSgioi4WdoDOt0KkZKULU8EjKyZw3zEEl+RLTS4E2B4Gjul6469ANkA fbe6R1uPn/lQREB21gMZCVxZrlozT8huId1hIH5rrY6Vn3ZuhC7iES6vH1IIJg2pt0pB j8ZfXGpXB3zxncUKRFXtXVv5FNsdVaAZF7z5rmFCVycNncvXyotA3PjDLLRKOkj8Mw3M xKji4HyzymQdPuqYFOShu05cdq35cDSlRtrcS6ZC90QkByuQM/ALIhQNuzPUlSuR5Z+S EDAg== X-Forwarded-Encrypted: i=1; AFNElJ86pg1xoHEC0yIIWBwPO0Iy6ri7txDB+inkKgUfkHjLP/Br2L5T29bIRxgeTH9n0wuMEy+NhMlyVaNQf/0=@vger.kernel.org X-Gm-Message-State: AOJu0Yxjc27eDlE9C/uZjom3gqXu4zJUUcCDGTK79neYpvIyDOYG6zdu apGIpOm5fyeDUQv572bd7Sua4ceaH5iK2UuOKD5L50q2s2mHu3vR4PvO97O9ok3gvT2Xb9XlyjT fDzUcpoBOOg== X-Received: from dlaf26.prod.google.com ([2002:a05:701b:241a:b0:12d:bc1d:8783]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:10b:b0:134:def6:e73f with SMTP id a92af1059eb24-1380671fb25mr2004660c88.21.1780685554020; Fri, 05 Jun 2026 11:52:34 -0700 (PDT) Date: Fri, 5 Jun 2026 11:52:15 -0700 In-Reply-To: <20260605185215.2359881-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> <20260605185215.2359881-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605185215.2359881-6-irogers@google.com> Subject: [PATCH v11 5/5] perf aslr: Strip sample registers 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Refactor the ASLR tool to strip out only the register dump payload by masking out the relevant perf_event_attr fields when the delegated tool is handling the data. struct aslr_evsel_priv maintains the original perf_event_attr values and is looked up via the evsel_orig_attrs hashmap. This allows us to keep samples that would otherwise be dropped because they contain registers, while still obfuscating the registers. Co-developed-by: Gabriel Marin Signed-off-by: Gabriel Marin Signed-off-by: Ian Rogers --- tools/perf/builtin-inject.c | 46 ++++-- tools/perf/tests/shell/inject_aslr.sh | 55 +++++++ tools/perf/util/aslr.c | 208 +++++++++++++++++++++----- tools/perf/util/aslr.h | 4 + 4 files changed, 263 insertions(+), 50 deletions(-) diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 65c7eccccf4d..de315bb334b3 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -253,6 +253,12 @@ static int perf_event__repipe_attr(const struct perf_t= ool *tool, return -ENOMEM; memcpy(stripped_event, event, event->header.size); stripped_event->attr.attr.sample_type &=3D ASLR_SUPPORTED_SAMPLE_TYPE; + if (stripped_event->attr.attr.size >=3D + (offsetof(struct perf_event_attr, sample_regs_user) + sizeof(u64))) + stripped_event->attr.attr.sample_regs_user =3D 0; + if (stripped_event->attr.attr.size >=3D + (offsetof(struct perf_event_attr, sample_regs_intr) + sizeof(u64))) + stripped_event->attr.attr.sample_regs_intr =3D 0; =20 if (stripped_event->attr.attr.type =3D=3D PERF_TYPE_BREAKPOINT) stripped_event->attr.attr.bp_addr =3D 0; @@ -295,8 +301,13 @@ static int perf_event__repipe_attr(const struct perf_t= ool *tool, =20 attr.size =3D sizeof(struct perf_event_attr); attr.sample_type &=3D ~PERF_SAMPLE_AUX; - if (inject->aslr) + if (inject->aslr) { attr.sample_type &=3D ASLR_SUPPORTED_SAMPLE_TYPE; + if (attr.type =3D=3D PERF_TYPE_BREAKPOINT) + attr.bp_addr =3D 0; + attr.sample_regs_user =3D 0; + attr.sample_regs_intr =3D 0; + } =20 if (inject->itrace_synth_opts.add_last_branch) { attr.sample_type |=3D PERF_SAMPLE_BRANCH_STACK; @@ -2618,6 +2629,9 @@ static int __cmd_inject(struct perf_inject *inject) =20 =20 =20 + if (inject->aslr) + aslr_tool__strip_evlist(inject->session->tool, session->evlist); + session->header.data_offset =3D output_data_offset; session->header.data_size =3D inject->bytes_written; perf_session__inject_header(session, session->evlist, fd, &inj_fc.fc, @@ -2876,6 +2890,18 @@ int cmd_inject(int argc, const char **argv) if (zstd_init(&(inject.session->zstd_data), 0) < 0) pr_warning("Decompression initialization failed.\n"); =20 + if (inject.aslr) { + struct evsel *evsel; + + evlist__for_each_entry(inject.session->evlist, evsel) { + ret =3D aslr_tool__cache_orig_attrs(tool, evsel); + if (ret) { + pr_err("Failed to cache original attributes: %d\n", ret); + goto out_delete; + } + } + } + /* Save original section info before feature bits change */ ret =3D save_section_info(&inject); if (ret) @@ -2894,10 +2920,17 @@ int cmd_inject(int argc, const char **argv) * the input. */ if (!data.is_pipe) { + if (inject.aslr) + aslr_tool__strip_evlist(tool, inject.session->evlist); + ret =3D perf_event__synthesize_for_pipe(&inject.tool, inject.session, &inject.output, perf_event__repipe); + + if (inject.aslr) + aslr_tool__restore_evlist(tool, inject.session->evlist); + if (ret < 0) goto out_delete; } @@ -2963,17 +2996,6 @@ int cmd_inject(int argc, const char **argv) =20 ret =3D __cmd_inject(&inject); =20 - if (inject.aslr) { - struct evsel *evsel; - - evlist__for_each_entry(inject.session->evlist, evsel) { - evsel->core.attr.sample_type &=3D ASLR_SUPPORTED_SAMPLE_TYPE; - - if (evsel->core.attr.type =3D=3D PERF_TYPE_BREAKPOINT) - evsel->core.attr.bp_addr =3D 0; - } - } - guest_session__exit(&inject.guest_session); =20 out_delete: diff --git a/tools/perf/tests/shell/inject_aslr.sh b/tools/perf/tests/shell= /inject_aslr.sh index d8ded16ba905..21d306a0ff2f 100755 --- a/tools/perf/tests/shell/inject_aslr.sh +++ b/tools/perf/tests/shell/inject_aslr.sh @@ -450,6 +450,60 @@ test_kernel_report_aslr() { fi } =20 +test_regs_stripping() { + echo "Test user register stripping" + local rdata=3D"${temp_dir}/perf.data.regs" + local rdata2=3D"${temp_dir}/perf.data.regs.injected" + local rdata_clean=3D"${temp_dir}/perf.data.regs.clean" + + if ! perf record --user-regs -o "${rdata}" ${prog} > /dev/null 2>&1; then + echo "Skipping user registers test as recording failed (unsupported fl= ag/platform)" + return + fi + + perf inject -b -i "${rdata}" -o "${rdata_clean}" + perf inject -v -b --aslr -i "${rdata}" -o "${rdata2}" + + local report1=3D"${temp_dir}/report_regs1" + local report2=3D"${temp_dir}/report_regs2" + local report1_clean=3D"${temp_dir}/report_regs1.clean" + local report2_clean=3D"${temp_dir}/report_regs2.clean" + local diff_file=3D"${temp_dir}/diff_regs" + + perf report -i "${rdata_clean}" --stdio > "${report1}" 2>/dev/null || tr= ue + perf report -i "${rdata2}" --stdio > "${report2}" 2>/dev/null || true + + grep '%' "${report1}" | grep -v '^#' | \ + grep -v -E '0x[0-9a-f]{8,}|0000000000000000' | \ + sort > "${report1_clean}" || true + grep '%' "${report2}" | grep -v '^#' | \ + grep -v -E '0x[0-9a-f]{8,}|0000000000000000' | \ + sort > "${report2_clean}" || true + + diff -u -w "${report1_clean}" "${report2_clean}" > "${diff_file}" || true + + if [ ! -s "${report1_clean}" ]; then + echo "User registers stripping test [Failed - profile trace starved/em= pty]" + err=3D1 + return + elif [ -s "${diff_file}" ]; then + echo "User registers stripping test [Failed - report parsing differs]" + echo "Showing first 20 lines of diff:" + head -n 20 "${diff_file}" + err=3D1 + return + fi + + local script_dump=3D"${temp_dir}/script_regs_dump" + perf script -D -i "${rdata2}" > "${script_dump}" 2>/dev/null || true + if grep -q "PERF_SAMPLE_REGS_USER" "${script_dump}"; then + echo "User registers stripping test [Failed - register dumps still pre= sent]" + err=3D1 + else + echo "User registers stripping test [Success]" + fi +} + test_basic_aslr test_pipe_aslr test_callchain_aslr @@ -459,6 +513,7 @@ test_pipe_out_report_aslr test_dropped_samples test_kernel_aslr test_kernel_report_aslr +test_regs_stripping =20 cleanup ${err} exit $err diff --git a/tools/perf/util/aslr.c b/tools/perf/util/aslr.c index 6d081dfae480..f9c00caf79b7 100644 --- a/tools/perf/util/aslr.c +++ b/tools/perf/util/aslr.c @@ -5,6 +5,7 @@ #include "debug.h" #include "event.h" #include "evsel.h" +#include "evlist.h" #include "machine.h" #include "map.h" #include "thread.h" @@ -16,6 +17,7 @@ #include /* page_size */ #include #include +#include #include #include =20 @@ -43,6 +45,22 @@ struct aslr_mapping { u64 remap_start; }; =20 +struct aslr_evsel_priv { + u64 orig_sample_type; + u64 orig_sample_regs_user; + u64 orig_sample_regs_intr; +}; + +static size_t evsel_hash(long key, void *ctx __maybe_unused) +{ + return (size_t)key; +} + +static bool evsel_equal(long key1, long key2, void *ctx __maybe_unused) +{ + return key1 =3D=3D key2; +} + struct process_top_address { u64 remapped_max; u64 orig_last_end; @@ -58,6 +76,11 @@ struct aslr_tool { struct hashmap remap_addresses; /** @top_addresses: mapping from process to max remapped address. */ struct hashmap top_addresses; + /** + * @evsel_orig_attrs: mapping from evsel pointer to its original + * unstripped sample_type and registers bitmasks. + */ + struct hashmap evsel_orig_attrs; }; =20 static const pid_t kernel_pid =3D -1; @@ -613,6 +636,7 @@ static int aslr_tool__process_sample(const struct perf_= tool *tool, struct aslr_tool *aslr; struct perf_tool *delegate; int ret; + int orig_sample_size; u64 sample_type; struct thread *thread; struct machine *aslr_machine; @@ -625,7 +649,10 @@ static int aslr_tool__process_sample(const struct perf= _tool *tool, u64 addr; size_t i; size_t j; - + struct aslr_evsel_priv *priv =3D NULL; + u64 orig_sample_type; + u64 orig_regs_user; + u64 orig_regs_intr; del_tool =3D container_of(tool, struct delegate_tool, tool); aslr =3D container_of(del_tool, struct aslr_tool, tool); delegate =3D aslr->tool.delegate; @@ -634,7 +661,23 @@ static int aslr_tool__process_sample(const struct perf= _tool *tool, return delegate->sample(delegate, event, sample, machine); =20 ret =3D -EFAULT; - sample_type =3D evsel->core.attr.sample_type; + + if (hashmap__find(&aslr->evsel_orig_attrs, evsel, &priv)) { + orig_sample_type =3D priv->orig_sample_type; + orig_regs_user =3D priv->orig_sample_regs_user; + orig_regs_intr =3D priv->orig_sample_regs_intr; + } else { + orig_sample_type =3D evsel->core.attr.sample_type; + orig_regs_user =3D evsel->core.attr.sample_regs_user; + orig_regs_intr =3D evsel->core.attr.sample_regs_intr; + } + + orig_sample_size =3D evsel->sample_size; + + sample_type =3D orig_sample_type; + sample_type &=3D ~PERF_SAMPLE_REGS_USER; + sample_type &=3D ~PERF_SAMPLE_REGS_INTR; + max_i =3D (event->header.size - sizeof(struct perf_event_header)) / sizeo= f(__u64); max_j =3D (PERF_SAMPLE_MAX_SIZE - sizeof(struct perf_event_header)) / siz= eof(__u64); new_event =3D (union perf_event *)aslr->event_copy; @@ -683,25 +726,25 @@ static int aslr_tool__process_sample(const struct per= f_tool *tool, i++; \ } while (0) =20 - if (sample_type & PERF_SAMPLE_IDENTIFIER) + if (orig_sample_type & PERF_SAMPLE_IDENTIFIER) COPY_U64(); /* id */ - if (sample_type & PERF_SAMPLE_IP) + if (orig_sample_type & PERF_SAMPLE_IP) REMAP_U64(sample->ip); - if (sample_type & PERF_SAMPLE_TID) + if (orig_sample_type & PERF_SAMPLE_TID) COPY_U64(); /* pid, tid */ - if (sample_type & PERF_SAMPLE_TIME) + if (orig_sample_type & PERF_SAMPLE_TIME) COPY_U64(); /* time */ - if (sample_type & PERF_SAMPLE_ADDR) + if (orig_sample_type & PERF_SAMPLE_ADDR) REMAP_U64(sample->addr); - if (sample_type & PERF_SAMPLE_ID) + if (orig_sample_type & PERF_SAMPLE_ID) COPY_U64(); /* id */ - if (sample_type & PERF_SAMPLE_STREAM_ID) + if (orig_sample_type & PERF_SAMPLE_STREAM_ID) COPY_U64(); /* stream_id */ - if (sample_type & PERF_SAMPLE_CPU) + if (orig_sample_type & PERF_SAMPLE_CPU) COPY_U64(); /* cpu, res */ - if (sample_type & PERF_SAMPLE_PERIOD) + if (orig_sample_type & PERF_SAMPLE_PERIOD) COPY_U64(); /* period */ - if (sample_type & PERF_SAMPLE_READ) { + if (orig_sample_type & PERF_SAMPLE_READ) { if ((evsel->core.attr.read_format & PERF_FORMAT_GROUP) =3D=3D 0) { COPY_U64(); /* value */ if (evsel->core.attr.read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) @@ -735,7 +778,7 @@ static int aslr_tool__process_sample(const struct perf_= tool *tool, } } } - if (sample_type & PERF_SAMPLE_CALLCHAIN) { + if (orig_sample_type & PERF_SAMPLE_CALLCHAIN) { u64 nr; =20 if (CHECK_BOUNDS(1, 1)) { @@ -801,7 +844,7 @@ static int aslr_tool__process_sample(const struct perf_= tool *tool, out_array[j++] =3D aslr_tool__remap_address(aslr, thread, cpumode, addr= ); } } - if (sample_type & PERF_SAMPLE_RAW) { + if (orig_sample_type & PERF_SAMPLE_RAW) { size_t bytes =3D sizeof(u32) + sample->raw_size; size_t u64_words =3D (bytes + 7) / 8; =20 @@ -820,7 +863,7 @@ static int aslr_tool__process_sample(const struct perf_= tool *tool, ret =3D 0; goto out_put; } - if (sample_type & PERF_SAMPLE_BRANCH_STACK) { + if (orig_sample_type & PERF_SAMPLE_BRANCH_STACK) { u64 nr; =20 if (CHECK_BOUNDS(1, 1)) { @@ -865,19 +908,25 @@ static int aslr_tool__process_sample(const struct per= f_tool *tool, goto out_put; } } - if (sample_type & PERF_SAMPLE_REGS_USER) { + if (orig_sample_type & PERF_SAMPLE_REGS_USER) { + u64 abi; + if (CHECK_BOUNDS(1, 0)) { ret =3D -EFAULT; goto out_put; } - /* abi */ - COPY_U64(); - /* TODO: can this be less conservative? */ - pr_debug("Dropping regs user sample as possible ASLR leak\n"); - ret =3D 0; - goto out_put; + abi =3D in_array[i++]; + if (abi !=3D PERF_SAMPLE_REGS_ABI_NONE) { + u64 nr =3D hweight64(orig_regs_user); + + if (nr > max_i - i) { + ret =3D -EFAULT; + goto out_put; + } + i +=3D nr; + } } - if (sample_type & PERF_SAMPLE_STACK_USER) { + if (orig_sample_type & PERF_SAMPLE_STACK_USER) { u64 size; =20 if (CHECK_BOUNDS(1, 1)) { @@ -908,39 +957,45 @@ static int aslr_tool__process_sample(const struct per= f_tool *tool, ret =3D 0; goto out_put; } - if (sample_type & PERF_SAMPLE_WEIGHT_TYPE) + if (orig_sample_type & PERF_SAMPLE_WEIGHT_TYPE) COPY_U64(); /* perf_sample_weight */ - if (sample_type & PERF_SAMPLE_DATA_SRC) + if (orig_sample_type & PERF_SAMPLE_DATA_SRC) COPY_U64(); /* data_src */ - if (sample_type & PERF_SAMPLE_TRANSACTION) + if (orig_sample_type & PERF_SAMPLE_TRANSACTION) COPY_U64(); /* transaction */ - if (sample_type & PERF_SAMPLE_REGS_INTR) { + if (orig_sample_type & PERF_SAMPLE_REGS_INTR) { + u64 abi; + if (CHECK_BOUNDS(1, 0)) { ret =3D -EFAULT; goto out_put; } - /* abi */ - COPY_U64(); - /* TODO: can this be less conservative? */ - pr_debug("Dropping interrupt register sample as possible ASLR leak\n"); - ret =3D 0; - goto out_put; + abi =3D in_array[i++]; + if (abi !=3D PERF_SAMPLE_REGS_ABI_NONE) { + u64 nr =3D hweight64(orig_regs_intr); + + if (nr > max_i - i) { + ret =3D -EFAULT; + goto out_put; + } + i +=3D nr; + } } - if (sample_type & PERF_SAMPLE_PHYS_ADDR) { + if (orig_sample_type & PERF_SAMPLE_PHYS_ADDR) { COPY_U64(); /* phys_addr */ /* TODO: can this be less conservative? */ pr_debug("Dropping physical address sample as possible ASLR leak\n"); ret =3D 0; goto out_put; } - if (sample_type & PERF_SAMPLE_CGROUP) + if (orig_sample_type & PERF_SAMPLE_CGROUP) COPY_U64(); /* cgroup */ - if (sample_type & PERF_SAMPLE_DATA_PAGE_SIZE) + if (orig_sample_type & PERF_SAMPLE_DATA_PAGE_SIZE) COPY_U64(); /* data_page_size */ - if (sample_type & PERF_SAMPLE_CODE_PAGE_SIZE) + if (orig_sample_type & PERF_SAMPLE_CODE_PAGE_SIZE) COPY_U64(); /* code_page_size */ =20 - if (sample_type & PERF_SAMPLE_AUX) { + if (orig_sample_type & PERF_SAMPLE_AUX) { u64 size; =20 if (CHECK_BOUNDS(1, 1)) { @@ -981,10 +1036,20 @@ static int aslr_tool__process_sample(const struct pe= rf_tool *tool, =20 new_event->sample.header.size =3D sizeof(struct perf_event_header) + j * = sizeof(u64); =20 + /* Temporarily override evsel attributes to match the stripped new_event = format! */ + evsel->sample_size =3D __evsel__sample_size(sample_type); + evsel->core.attr.sample_type =3D sample_type; + evsel->core.attr.sample_regs_user =3D 0; + evsel->core.attr.sample_regs_intr =3D 0; perf_sample__init(&new_sample, /*all=3D*/ true); ret =3D evsel__parse_sample(evsel, new_event, &new_sample); =20 if (ret) { + /* Restore original attributes immediately if parsing fails */ + evsel->sample_size =3D orig_sample_size; + evsel->core.attr.sample_type =3D orig_sample_type; + evsel->core.attr.sample_regs_user =3D orig_regs_user; + evsel->core.attr.sample_regs_intr =3D orig_regs_intr; perf_sample__exit(&new_sample); goto out_put; } @@ -993,6 +1058,12 @@ static int aslr_tool__process_sample(const struct per= f_tool *tool, ret =3D delegate->sample(delegate, new_event, &new_sample, machine); perf_sample__exit(&new_sample); =20 + /* Restore original attributes so trace ingestion never desynchronizes! */ + evsel->sample_size =3D orig_sample_size; + evsel->core.attr.sample_type =3D orig_sample_type; + evsel->core.attr.sample_regs_user =3D orig_regs_user; + evsel->core.attr.sample_regs_intr =3D orig_regs_intr; + out_put: thread__put(thread); return ret; @@ -1059,6 +1130,9 @@ static void aslr_tool__init(struct aslr_tool *aslr, s= truct perf_tool *delegate) hashmap__init(&aslr->top_addresses, top_addresses__hash, top_addresses__equal, /*ctx=3D*/NULL); + hashmap__init(&aslr->evsel_orig_attrs, + evsel_hash, evsel_equal, + /*ctx=3D*/NULL); =20 aslr->tool.tool.sample =3D aslr_tool__process_sample; /* read - reads a counter, okay to delegate. */ @@ -1120,11 +1194,69 @@ void aslr_tool__delete(struct perf_tool *tool) zfree(&cur->pkey); zfree(&cur->pvalue); } + hashmap__for_each_entry(&aslr->evsel_orig_attrs, cur, bkt) { + zfree(&cur->pvalue); + } =20 hashmap__clear(&aslr->remap_addresses); hashmap__clear(&aslr->top_addresses); + hashmap__clear(&aslr->evsel_orig_attrs); aslr_tool__destroy_machines_priv(&aslr->machines); machines__destroy_kernel_maps(&aslr->machines); machines__exit(&aslr->machines); free(aslr); } + +int aslr_tool__cache_orig_attrs(struct perf_tool *tool, struct evsel *evse= l) +{ + struct delegate_tool *del_tool =3D container_of(tool, struct delegate_too= l, tool); + struct aslr_tool *aslr =3D container_of(del_tool, struct aslr_tool, tool); + struct aslr_evsel_priv *priv =3D zalloc(sizeof(*priv)); + int err; + + if (!priv) + return -ENOMEM; + + priv->orig_sample_type =3D evsel->core.attr.sample_type; + priv->orig_sample_regs_user =3D evsel->core.attr.sample_regs_user; + priv->orig_sample_regs_intr =3D evsel->core.attr.sample_regs_intr; + + err =3D hashmap__add(&aslr->evsel_orig_attrs, evsel, priv); + if (err) { + free(priv); + return err; + } + return 0; +} + +void aslr_tool__strip_evlist(const struct perf_tool *tool __maybe_unused, = struct evlist *evlist) +{ + struct evsel *evsel; + + evlist__for_each_entry(evlist, evsel) { + evsel->core.attr.sample_type &=3D ASLR_SUPPORTED_SAMPLE_TYPE; + evsel__reset_sample_bit(evsel, REGS_USER); + evsel__reset_sample_bit(evsel, REGS_INTR); + evsel->core.attr.sample_regs_user =3D 0; + evsel->core.attr.sample_regs_intr =3D 0; + + if (evsel->core.attr.type =3D=3D PERF_TYPE_BREAKPOINT) + evsel->core.attr.bp_addr =3D 0; + } +} + +void aslr_tool__restore_evlist(const struct perf_tool *tool, struct evlist= *evlist) +{ + const struct delegate_tool *del_tool =3D container_of(tool, const struct = delegate_tool, tool); + const struct aslr_tool *aslr =3D container_of(del_tool, const struct aslr= _tool, tool); + struct evsel *evsel; + struct aslr_evsel_priv *priv; + + evlist__for_each_entry(evlist, evsel) { + if (hashmap__find(&aslr->evsel_orig_attrs, evsel, &priv)) { + evsel->core.attr.sample_type =3D priv->orig_sample_type; + evsel->core.attr.sample_regs_user =3D priv->orig_sample_regs_user; + evsel->core.attr.sample_regs_intr =3D priv->orig_sample_regs_intr; + } + } +} diff --git a/tools/perf/util/aslr.h b/tools/perf/util/aslr.h index a9b90bf29540..4c2cffc0e500 100644 --- a/tools/perf/util/aslr.h +++ b/tools/perf/util/aslr.h @@ -30,8 +30,12 @@ =20 struct perf_tool; struct evsel; +struct evlist; =20 struct perf_tool *aslr_tool__new(struct perf_tool *delegate); void aslr_tool__delete(struct perf_tool *aslr); +int aslr_tool__cache_orig_attrs(struct perf_tool *tool, struct evsel *evse= l); +void aslr_tool__strip_evlist(const struct perf_tool *tool, struct evlist *= evlist); +void aslr_tool__restore_evlist(const struct perf_tool *tool, struct evlist= *evlist); =20 #endif /* __PERF_ASLR_H */ --=20 2.54.0.1032.g2f8565e1d1-goog