From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 342D525291F for ; Thu, 29 May 2025 04:40:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748493612; cv=none; b=q3+VQi777Z0mzJrEzylEKZQ7MbbMqnsCvkcEF7VOtNeKGJq6lFP5vrtNTlxV319jwJEEoAmUvQBBNJ8wVMahcDlK59/tjodJkrVuiPHkWW2N/i/LZV0DHz4R9/mommrQ0J5U0l98pSTlFjOwZjtKMMK+Sy5CLF/HbANi+DwgFss= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748493612; c=relaxed/simple; bh=CANFhZkJgyGsnrInmGKjXkCZcjZ3YXzkDfH+xL7C5tk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=r5g+IlAcgbOVSW823fmf+MLe7UYD93DT5O223ksNT51JommDkYuoGj9+xUq+YtWq6x7guF3o8XzXu8rSXhQXFjdoidEwBnSAUYYlCowCoXLenmjQxIJYZX5ThdTE0ad5D/gAnl5zjgGSQkwcDVxUakXgYHPuI69qfPj/18r4sMs= 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=yAmwy0ER; arc=none smtp.client-ip=209.85.216.73 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="yAmwy0ER" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-311e7337f26so387338a91.3 for ; Wed, 28 May 2025 21:40:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748493610; x=1749098410; 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=q0+6lU8x18MkCnRglmEGZnHeaHUfbjOQhfXfqkjM75Q=; b=yAmwy0ERJlTDnIK6W7sZ/Ho8PhIICBg9hOHE7ti9zzdopdbbcY+hisQBd3QCrmUz0K xvNltDZoiUDCJrSxNouGuA3u4yhzkLprmbqQKVlwaEtmxEz3QYl6SrIT8BE3JthEhdcR NS7lzuzRgXbv1vLvr9Cv0DvWKe3uHIJGJyl8wdZFunW4Xko/v+tpligiBY5SnYHgZ7a2 FuWqwUzZhaxaQHMhFu/INApPUUv40bHul1qcHoCsJ/Rp8zLoJWp2mjEKLPF8GXKH6a9z 6emzBp+2xmtsXbF0wY3yVBfF6y7jGNvHzdMdRIrqUcMz0rUBtubTDWFkchQq8Bwy3esP D/2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748493610; x=1749098410; 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=q0+6lU8x18MkCnRglmEGZnHeaHUfbjOQhfXfqkjM75Q=; b=ickP4XrfmTKr4ribLns6mfhZCVvOSQSqVoh6JiGJahOtJU6RBEEEgZtJ6hIAeClpAj +SJer49q1wYqCfWxKUPKjir7m86fomBYlM/FAZGbcWGoF8cAvB8z5MNw501cH9UWn215 GKPCeolWQqVN513/ltXfiRSDZS2tq5CaCw5NRroUr2MUCVqYo25obUJJz3vKOxCGSxBZ hsFZauo13z/2fd+V85uNl1eYYsie+ylh2/5XlT+oIe2Wb65WTjyZ6Y5eU//KtRYvUOfQ eHrbjbPb03npDQ8YHm/L/ZSl5tzgMrTb5DKsnQnh6lvFM2Ly+dDt4S+tzUOf/DdGXkH6 araQ== X-Forwarded-Encrypted: i=1; AJvYcCUQofPYo+s+TDBmUYgZSovqsjZMEDGL2EgJUznabVuwoPsnS4r8EjF64SsdIDMTqRfSCXrzEsEh0v0AUjPc3sRj@vger.kernel.org X-Gm-Message-State: AOJu0YxyI7HZxeHMJYcb11b4m56OFQpfwY/iGZIYJ2PTn4Up/nybxxD/ oK+LNYrUbWT4KZc5Bs//uX53z5tcO/b7NC2HSB/07k+0zRX+9CBtxJomKwmPnJ2azupuUPjnBss IOQS+A2qGeg== X-Google-Smtp-Source: AGHT+IE9ubP4EXyB04CdzN29eN45hiHLXKn9ZXif4h1X/irDCdN/4AOj6erkhGRhVueGltT8T+vgXt9OVBa/ X-Received: from pjuj14.prod.google.com ([2002:a17:90a:d00e:b0:311:4201:4021]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:50:b0:311:e8cc:425d with SMTP id 98e67ed59e1d1-3121dc54006mr1264393a91.10.1748493609979; Wed, 28 May 2025 21:40:09 -0700 (PDT) Date: Wed, 28 May 2025 21:39:38 -0700 In-Reply-To: <20250529044000.759937-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250529044000.759937-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.1204.g71687c7c1d-goog Message-ID: <20250529044000.759937-3-irogers@google.com> Subject: [PATCH v4 02/24] 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 , Veronika Molnarova , "=?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, linux-arm-kernel@lists.infradead.org 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 @@ struct build_id { u8 data[BUILD_ID_SIZE]; - size_t size; + u8 size; }; 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, memset(&ev, 0, len); - ev.build_id.size = min(bid->size, sizeof(ev.build_id.build_id)); + ev.build_id.size = bid->size; + if (ev.build_id.size > sizeof(ev.build_id.build_id)) + ev.build_id.size = sizeof(ev.build_id.build_id); memcpy(ev.build_id.build_id, bid->data, ev.build_id.size); ev.build_id.header.type = PERF_RECORD_HEADER_BUILD_ID; ev.build_id.header.misc = misc | PERF_RECORD_MISC_BUILD_ID_SIZE; @@ -2308,7 +2310,9 @@ int perf_event__synthesize_mmap2_build_id(const struct perf_tool *tool, ev.mmap2.len = len; ev.mmap2.pgoff = pgoff; - ev.mmap2.build_id_size = min(bid->size, sizeof(ev.mmap2.build_id)); + ev.mmap2.build_id_size = bid->size; + if (ev.mmap2.build_id_size > sizeof(ev.mmap2.build_id)) + ev.build_id.size = sizeof(ev.mmap2.build_id); memcpy(ev.mmap2.build_id, bid->data, ev.mmap2.build_id_size); ev.mmap2.prot = prot; -- 2.49.0.1204.g71687c7c1d-goog