From nobody Mon Oct 6 06:46:46 2025 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 042C31F0E26 for ; Thu, 24 Jul 2025 16:33:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753374798; cv=none; b=L8ojHvihC60o/JFBPIsF6snbFs/VT3y1JWMmqtafjUhGTMBn08ASuZqyXagH91c7DFLqn7unu6F5hLEDYJREUnpupZAQun+LUOd1BsYQKXRfigaRvrQDfWv2w3bsT4X8Ql3IDeiIvTjOKwMLPr0gP6Mm4AMh0SC6Awz7Y+gzuOU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753374798; c=relaxed/simple; bh=qdkXYwZwQilwi089YMqVjrMiZV659L43XoqfQaPVoIA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=neBwq1rjIdNO6+0JsrwswA2Hxbo0rGYb52A2i/bvnqXiUvOd3wONt39X4hh4AwaBr9dsZ1Rw21fU7iq5HEHC5OBKHh4m1ua6SuRpXvbUHjxsZu099ytccAESorKgbKXOUjtqJne/MvL7IK/oLcJjfn+gTNOUzLXkglNayZDMGr0= 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=zDNgcKbP; arc=none smtp.client-ip=209.85.215.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="zDNgcKbP" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b31c38d4063so923471a12.3 for ; Thu, 24 Jul 2025 09:33:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753374796; x=1753979596; 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=tHMRbh0OGf1VtE1XWliHZ+PxZ7EmgPTkysBcMOF3iMA=; b=zDNgcKbPZ6lkhMBCyj6KteVitHhE6nbUIxfv5l+jFl4VZkxmYA3bGVl+4/YWpT9fuH vVT0bFDpxKK6RsG2GFiiA8+aKiesz90dh8qQVDE7MZWbuvNgSG6ICBPi3LllQHbWH7Nk jx1cb/eYkCUuaUy5XHw0WrvhWEdIxz50n9WiU/7t7MHFQdKJ08FRCBdurznz8PjCahEx i6Z8deoauGJI5DFh0kV0hFT39E4uRhJrvjuNVCnQ8eGWNEbGjBtn89Ta5vq1272EIqm6 TpsFzI+su97shaoOe+h3RnRelDL+ywIVKJUaMlWehg7mJjctELimnY/iDE6eyprpV8AV 8P0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753374796; x=1753979596; 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=tHMRbh0OGf1VtE1XWliHZ+PxZ7EmgPTkysBcMOF3iMA=; b=fT0cSdXWX7Cm/ap6l6zeyr6K5IAKeyHCix8dmi2xGNybNG1s1WxyuMAibbPEF2zCS8 LoOgJi6hTkBaLoKMlSEybbtKsFq+JumH+/4cn5agI0kwW/wkmcwWGeNxngMhpvV3Y9pk BWyXbcjOlNBePw3R8M+6BPiglwLU9zytfHomZQQNBx9DlqwBFQR2eqWAtj8r2xZg5djW k0U4gmhHXI9wxG+FLgNbnSTzLh834OdelHhMFqSfoiNKQiY6rT1K1ccUHioxI9rwYVG1 u35cuT2hGd72y4AZdGmYjmZu/2BKQ+ERKbiMX0mtj28Pj7UF3yChTezgjKCAmYwWdUx5 tFFg== X-Forwarded-Encrypted: i=1; AJvYcCWntZXUUyIhgVKCQ2+R4FPpuCnfErUIEK9TqH3D0s5UAEbTvH/ijYOmSDmwFEZxu2Y1v+pLX2OEsLHnyqA=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5T/Nm98ag6aNi03JxDPoFuHr4Akm1nOF7M/DGcrChLnetYi// HQTxV/l/yJzqMlO0GsXvFRplzGblrgy1iqyqrzoScqqg9+ZVmoIMAKIUdpX3o0TwpfHc77dei1u MUMpGy9zr8g== X-Google-Smtp-Source: AGHT+IFUn9ibU7z3cYjN4eNtr5ZP5Zw75GPYkYhnnHDx8ub8GXqfpX9vK922RLak71vDGMJczBiyKtYkWmCZ X-Received: from plge7.prod.google.com ([2002:a17:902:cf47:b0:23d:eb0e:df66]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:c942:b0:234:a139:1215 with SMTP id d9443c01a7336-23f981d3e70mr105002605ad.35.1753374795910; Thu, 24 Jul 2025 09:33:15 -0700 (PDT) Date: Thu, 24 Jul 2025 09:32:41 -0700 In-Reply-To: <20250724163302.596743-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: <20250724163302.596743-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250724163302.596743-2-irogers@google.com> Subject: [PATCH v6 01/22] 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , "Masami Hiramatsu (Google)" , Ravi Bangoria , Charlie Jenkins , Colin Ian King , Andi Kleen , Dmitry Vyukov , Graham Woodward , Ilkka Koskinen , Zhongqiu Han , Yicong Yang , Athira Rajeev , Kajol Jain , Li Huafei , "Steinar H. Gunderson" , Stephen Brennan , Chun-Tse Shao , Yujie Liu , "Dr. David Alan Gilbert" , Levi Yun , Howard Chu , Weilin Wang , Thomas Falcon , Matt Fleming , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , Zixian Cai , Steve Clevenger , Ben Gainey , Chaitanya S Prakash , Martin Liska , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Song Liu , linux-kernel@vger.kernel.org, linux-perf-users@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.50.0.727.gbf7dc18ff4-goog