From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f70.google.com (mail-dl1-f70.google.com [74.125.82.70]) (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 EA01440EBA9 for ; Fri, 2 Oct 2026 06:54:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.70 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790924099; cv=none; b=hfLxSvIPtryb/RhCaeOb78PDfuDeOfsU9AOv+/eWDbguvvXohmtjKfdCpCojWx33CcoFkeN8qFC12652lkJGXu5dtFOAWZ+yRn1nQaUAtsY0Tfim+QT8DZAEQg3HzJI5oV9+/DotSYS6HthYLOw35HHZhihl5xNvwoJyDPFZha0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790924099; c=relaxed/simple; bh=rHmBf/qUFb97VwsNbQMtVRtXzU8md133Mj4GKesN0jU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Mzyr2dw3Zzqjwjhi9rYqANsVWlMk7t7JG3wFjYho2qm57CCgFkPmnF4Lp77IvAxjxFb1C9QxyEuvDMvoeIPuF7rpi+qj9QDEF+1uMAl0RQMYl6GOgi5OBcBMe2Mm2KmoN553BUsDAaUnF9o9c0gz9UJKtPNJAQQsoUaIKUk58kI= 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=jv83o5mr; arc=none smtp.client-ip=74.125.82.70 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="jv83o5mr" Received: by mail-dl1-f70.google.com with SMTP id a92af1059eb24-1493b09d6bbso3418836c88.0 for ; Thu, 01 Oct 2026 23:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1790924096; x=1791528896; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=PhCPPQy6IciDdKP83gowChF0t2PFkHd1JM+aCRaprW4=; b=jv83o5mriYgKZ1SaDWooSGTtq2o9pVP0VKryZnurI7px8gywVuaJiP65KuIujxXCcv bPhCOtRT+1QoXBC8UDC0tNF+kCoTbwKhqwWZP072dLzVgl8q0/FSLvsPnblUqNXrOTWQ Wz4yqBEnkWnNC+LGNynWigJPYnQ5W94aE27HyA3hW8dNyQHJBKVJmr4+qNMX/CFzs3H1 sP7xhJz4qgT3HLhjM0+KeImGG7CdZARCKXjSwqwqCdpQz+UINLRKVKkexYzHQXnqJPbH 5v649ltLmzdZyWUbUFr2UB3umEwtLbmV9HBGi/c6mKIPxSZ0Jn1FraoQLv53jvUs9ggA 2dCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790924096; x=1791528896; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=PhCPPQy6IciDdKP83gowChF0t2PFkHd1JM+aCRaprW4=; b=uX24xLM0eL+hmUE/gfJKdgz+4Xk0mGiR5ONIGh9qCGDPtVTib//X2PvJG+HzcnSmA5 8uf/I+D0GPxBilB3JbgPYzycAYEDursXE9e2tqKFS5DW48jZUC0Q3/cCsdKi2Bt/UpgR sxVTG2zvTwa/d62DzI/EFEfeKomdZH8E6b4N6DLtNfm39aPZBw+gdY/29oVHW8R3vFjB xPa+v3I8zSd+K9kpb4u6VpGzuX/c+9s84NUq2Pq3yd9XI2V3TXZpWLV5rx4F6+ttVbb3 77b9KZyxM3exqjqSU32Py4huuzx6Uwl5pDkbZl1XpSZ22mmwfzyRYwbOEQOyN7p/8ZKd jPlg== X-Forwarded-Encrypted: i=1; AKwUvBx4KsqULELK50TTxD4mGx3gyPkHW6TwaVrbqJq+4doFog3lur7KA3W027hp+g0E2TIOA+e511Q4FoafT98=@vger.kernel.org X-Gm-Message-State: AFuF++mluRmWiXlzIMI25vgiEEDEF+kapZpPRCwf+ylXBHPFFNagWVcx Bp9p8hxWw1XqH8MFiilbZbOCPXPWe9XRpWdyHfojKXTfv6Bug/I7LCOK1oe1nkYBcgNd3XSK5Kf jATkzQsi4qw== X-Received: from dlbrd11.prod.google.com ([2002:a05:7022:f10b:b0:14c:5add:b3d4]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:798:b0:14d:c7ae:85dd with SMTP id a92af1059eb24-14f5b50b67fmr2908519c88.7.1790924095513; Thu, 01 Oct 2026 23:54:55 -0700 (PDT) Date: Thu, 1 Oct 2026 23:54:40 -0700 In-Reply-To: <20261002065440.2781176-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: <20261002065440.2781176-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.rc1.315.gc6ed9934b7-goog Message-ID: <20261002065440.2781176-2-irogers@google.com> Subject: [PATCH 2/2] perf trace: Increase TRACE_AUG_MAX_BUF to 128 and document beauty_map encoding From: Ian Rogers To: acme@kernel.org Cc: adrian.hunter@intel.com, atomlin@atomlin.com, howardchu95@gmail.com, irogers@google.com, james.clark@linaro.org, jbrnak@redhat.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, namhyung@kernel.org, peterz@infradead.org, Arnaldo Carvalho de Melo Content-Type: text/plain; charset="UTF-8" With sockaddr arguments copied as buffers via beauty_map_enter, the 32-byte TRACE_AUG_MAX_BUF limit only held 2 bytes of sa_family plus 30 bytes of AF_LOCAL sun_path, truncating longer socket paths such as "/var/run/.heim_org.h5l.kcm-socket". Since struct augmented_arg already reserves PATH_MAX (4096) bytes, increase TRACE_AUG_MAX_BUF to 128 (SS_MAXSIZE, the size of struct sockaddr_storage), which covers all 110 bytes of struct sockaddr_un without changing map sizes. Also document the 1-based negative -(arg_idx + 1) encoding used in beauty_array for paired length arguments. Suggested-by: Arnaldo Carvalho de Melo Assisted-by: Antigravity:gemini-3.1-pro Signed-off-by: Ian Rogers --- tools/perf/builtin-trace.c | 8 +++++++- tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index c34c9f129836..4094141461f9 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -4174,7 +4174,12 @@ static int trace__bpf_sys_enter_beauty_map(struct trace *trace, int e_machine, i continue; bt = sc->arg_fmt[i].type; - /* Copy a sockaddr as a buffer sized by the next argument, e.g. addrlen. */ + /* + * Copy a sockaddr as a buffer sized by the next + * argument (i + 1), e.g. addrlen. A negative entry + * -(j + 1) encodes the 0-based length argument index j + * as 1-based so arg 0 is -1 rather than 0. + */ if (strcmp(name, "sockaddr") == 0 && field->next && strstr(field->next->name, "len")) beauty_array[i] = -((i + 1) + 1); @@ -4210,6 +4215,7 @@ static int trace__bpf_sys_enter_beauty_map(struct trace *trace, int e_machine, i strstr(field_tmp->name, "siz") || /* size, bufsiz */ (strstr(field_tmp->name, "len") && strcmp(field_tmp->name, "filename")))) { /* filename's got 'len' in it, we don't want that */ + /* 1-based negative index of length arg j. */ beauty_array[i] = -(j + 1); can_augment = true; break; diff --git a/tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c b/tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c index 0b2ef9541f84..28ebb9a72776 100644 --- a/tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c +++ b/tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c @@ -28,7 +28,7 @@ #define MAX_CPUS 4096 -#define TRACE_AUG_MAX_BUF 32 /* for buffer augmentation in perf trace */ +#define TRACE_AUG_MAX_BUF 128 /* for buffer augmentation in perf trace */ /* bpf-output associated map */ struct __augmented_syscalls__ { @@ -514,9 +514,9 @@ u64 ZERO = 0; * value in the beauty_map. This is the relation of parameter type and its corresponding * value in the beauty map, and how many bytes we read eventually: * - * string: 1 -> size of string - * struct: size of struct -> size of struct - * buffer: -1 * (index of paired len) -> value of paired len (maximum: TRACE_AUG_MAX_BUF) + * string: 1 -> size of string + * struct: size of struct -> size of struct + * buffer: -(0-based index of paired len + 1) -> value of paired len (maximum: TRACE_AUG_MAX_BUF) */ static inline int augment_arg(struct syscall_enter_args *args, int i, unsigned int *beauty_map, -- 2.56.0.rc1.315.gc6ed9934b7-goog