From nobody Mon Feb 9 05:59:09 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 B3E7220E6F3 for ; Mon, 28 Apr 2025 21:34:16 +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=1745876058; cv=none; b=nv4JJ1yvu0ZyeHsyOPbVQ/V/kvdLvitYvxCC6wEM5rA0Wh/UbjYM98IvxkhZX7JO8Vx/0iecuPG6ssGVieagdPkIFqHdRhxsii6vMn/jwu/L3i6BrB5Qz/qE79cXbnycsSKWPoeUUdnx++sphGEWFCJS+frUtzvtWGZdJdmzJrY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745876058; c=relaxed/simple; bh=sNSKisiG1hdsMeqAXMQnBsbK1CE7qqQDhEcMwAn9yhQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=ccNqEk6h2DG8D3yYrtiYHxbnkjwmGHfP0A/KvKpocFL6mV3r/6ouoM9ibS49QUx67EQb71n0r8iYn9XiCeqIswVyTod5C1dDkPiogbKOjuhaWrhZ224lvR6G4wGNTdSyFmWcrjqgalS/6I3Wwlokc1p9oDsX+RxDR0tD30Gjcp4= 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=UVyiYdyO; 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="UVyiYdyO" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b0f807421c9so2934173a12.0 for ; Mon, 28 Apr 2025 14:34:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745876056; x=1746480856; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=X02HQomgxWR3mWoM82/yA1eUjs3APdARyr9edl1ymiY=; b=UVyiYdyOSxnDxDu2soqu/hFv1RqnaE3Me/dC+DrXORs6CC9cKsHcWPRyLwdMnHdfHU ZyUptv+RZpomP8FJRMSFAeWqa989t3W9qdF20gnD6/VnLb/3zGLFZNqwscFR7Qhx5BJN oQ0/d+YNUVL9hH2W0SPQ06vrZc3BYkec9uTRo+OnoKU1rp5N4YmPIYiNrwLqaV5yHv9y Q07iVPXf5cdke5QEwv/sohQuObpZRpIQbE9n0h3MV6fYAyAmxvkb3g1I0fellZgJdG1l YNVCJ6kKNutLBQwM8eLlYYC/xjytSYz3jZDgrf5KEvVJgMxJGPuHLX+2kS7dgyS3u+44 1hYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745876056; x=1746480856; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=X02HQomgxWR3mWoM82/yA1eUjs3APdARyr9edl1ymiY=; b=TmQX33IZ5NGpfG7ZiuBBVHFZokAGx62LA8hbgPUa7aeG06qeyVfr729l9AQdJvJOd6 nVYbsPID9jkmHA3fNCDv5GIKefz0aWALOYjYunOOwsQftYJHKVSxThCpm3IjJbYVNpx8 D21jDx23nVaiKEwIWzKgf2voPL6SO0cgNM8e5NKw6IQ637r5EFQ09gkDp6RhP1ayzsi1 nWn0C/T8oAUXPEcnqnxqywcbms9KFAF44V0YTnAlSckZAK5W/j61r/HkIH+StzXMPQyb Kv0a1tVoYQ/g7to8PWkCZ7b4zXizBeb2YpV5kfApQi6ZMATlq2A/sQKmrJPzAjdAh+2M S1IA== X-Forwarded-Encrypted: i=1; AJvYcCWSJS8cboisKP2/pzCln7oVImoiW3mmKluMFOsTjL1TdmjkTYsnTv4/4cPQ4lO2YsnImRpdFciyzlRLx6k=@vger.kernel.org X-Gm-Message-State: AOJu0YxKnWFq38mzakQnL6PS6pw6EA9aUxhsRTMl/OGWaOb1A7vcoROS fF0MIh61mqJBw8GsD6SQVXKEq7q/DTVh1XpoUNL78D2zd85S1F3ihrRFz8KHnUcrrTh6RoiV20K H5sUiYw== X-Google-Smtp-Source: AGHT+IG9piqj3ObQ1uyzi2wTg72pEue4UFNXrJZLmUK2OICKb7nWvOBDj/R3L8x9+9AWxEJhOVRnDHHFPirA X-Received: from pgld6.prod.google.com ([2002:a63:e06:0:b0:b13:7874:b1b3]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:6a03:b0:1f5:80a3:b006 with SMTP id adf61e73a8af0-2095682bb2dmr953425637.21.1745876056067; Mon, 28 Apr 2025 14:34:16 -0700 (PDT) Date: Mon, 28 Apr 2025 14:34:01 -0700 In-Reply-To: <20250428213409.1417584-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: <20250428213409.1417584-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.901.g37484f566f-goog Message-ID: <20250428213409.1417584-3-irogers@google.com> Subject: [PATCH v3 2/9] perf build-id: Reduce size of "size" variable From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Rajeev , Kajol Jain , Li Huafei , "Steinar H. Gunderson" , James Clark , Stephen Brennan , Andi Kleen , Dmitry Vyukov , Zhongqiu Han , Yicong Yang , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , "Dr. David Alan Gilbert" , Zixian Cai , Steve Clevenger , Thomas Falcon , Martin Liska , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Song Liu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Later clean up of the dso_id to include a build_id will suffer from alignment and size issues. The size can only hold up to a value of BUILD_ID_SIZE (20) and the mmap2 event uses a byte for the value. Signed-off-by: Ian Rogers --- tools/perf/util/build-id.h | 2 +- tools/perf/util/synthetic-events.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h index a212497bfdb0..e3e0a446ff0c 100644 --- a/tools/perf/util/build-id.h +++ b/tools/perf/util/build-id.h @@ -13,7 +13,7 @@ =20 struct build_id { u8 data[BUILD_ID_SIZE]; - size_t size; + u8 size; }; =20 struct dso; diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index 2fc4d0537840..68bb7c5fe1b1 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -2248,7 +2248,9 @@ int perf_event__synthesize_build_id(const struct perf= _tool *tool, =20 memset(&ev, 0, len); =20 - ev.build_id.size =3D min(bid->size, sizeof(ev.build_id.build_id)); + ev.build_id.size =3D bid->size; + if (ev.build_id.size > sizeof(ev.build_id.build_id)) + ev.build_id.size =3D sizeof(ev.build_id.build_id); memcpy(ev.build_id.build_id, bid->data, ev.build_id.size); ev.build_id.header.type =3D PERF_RECORD_HEADER_BUILD_ID; ev.build_id.header.misc =3D misc | PERF_RECORD_MISC_BUILD_ID_SIZE; @@ -2308,7 +2310,9 @@ int perf_event__synthesize_mmap2_build_id(const struc= t perf_tool *tool, ev.mmap2.len =3D len; ev.mmap2.pgoff =3D pgoff; =20 - ev.mmap2.build_id_size =3D min(bid->size, sizeof(ev.mmap2.build_id)); + ev.mmap2.build_id_size =3D bid->size; + if (ev.mmap2.build_id_size > sizeof(ev.mmap2.build_id)) + ev.build_id.size =3D sizeof(ev.mmap2.build_id); memcpy(ev.mmap2.build_id, bid->data, ev.mmap2.build_id_size); =20 ev.mmap2.prot =3D prot; --=20 2.49.0.901.g37484f566f-goog