From nobody Wed Dec 17 18:01:16 2025 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.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 BC21E17753 for ; Mon, 16 Dec 2024 01:46:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734313612; cv=none; b=Y42PGzvhLW5biGkFQRu9/gpwf+E365q19zbZSuuBTZF6XlY4fr1bk5eMYd4qP0A/F/9nMntJJEVWnsJA8MbZ5m9+V0vZ8qLklYiAcQVQ+dYFeryiwbpriTRYjEIFkHJj7wY+xTSCJfLLamAVcdg2Cr4B7eHreAGNG2Rk9XS8bC4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734313612; c=relaxed/simple; bh=WydwZX+4HGFs/roSNEAeN+iGcRwNyw0N9yYTQ/F7jhM=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=Gj/8SeJXhIVqr9iOUpi8bLIIbNucZm2mvYWhocDnz1AleuTHGoHfJxZILiQIYPIU5VM0hoJGONAj62oPaxZSiVszEKDBPZDTTVjgsXuO682mzEfVA9e0ihf3tyAUF+wyAnNkR7H+8MnrwA+iPlbPgnMBquuUq33nfJZlkuoCr3I= 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=mrakO/+R; arc=none smtp.client-ip=209.85.219.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="mrakO/+R" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e399d4ef55cso4928806276.2 for ; Sun, 15 Dec 2024 17:46:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1734313610; x=1734918410; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=6hgXWFWdI7UOHyMHNmnwoqLPHk2iqhyZAlZkweGRato=; b=mrakO/+RFdm+nPNt6nRY4WNHsgN7GgUI3og/GJMueUlH5JzN/IhfjH2DEFsi0BZjxX 42xLmCYnnkFPZKIHCo47UbIWAnqptRyyMOMNqjAT71rp9+6oKaAW/qBx5CUEgv8UShY9 n/n0bqiVvM7yicugcxDd+dWOXLhyex8EVjtr5zEEAZ/uqviz9sljo2URC+Is2egzT6HP L5utqq6vmtjCrvgdMilNhjhj0BalF/TTe4LVz178FfMjw6DMGb3S+atDyw7G90iRJshP 8Rb9M0eY7Y8ToHsf9uR5B4tCoPK8t9DKaA/FHB9Q7YmQrjEFrfY0qQSupsLPslt9dooi q6Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734313610; x=1734918410; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6hgXWFWdI7UOHyMHNmnwoqLPHk2iqhyZAlZkweGRato=; b=IvL9cULZfFuFFTa8SvyP1fXUKF5/GvVtkIIEZh6VHvH0xk2coFXp5jKrKrBF1DICbk 4+t0BEkYr6TrBzjbZNdvwt1pVzz8pZ18+BOQmG+qWd/DXP0/sfJ0L1SbY+ppzsUJrYeL bkueLZfuU0woao6qTawGsxYdijTjOqcS+T8+JVSv318U+0LR037fzIH7xLI/BUQKNh7x 00Xpj0NrCl1VsxbC6qnlDbHxXkXrmc4TYLwbjvoO/c9SCAM3e1STB4zW4f3fWnfJPz3C 6eMyc1i5i7TwfsaEg8D5w1L2ge/kjhaiADJP4pfK6Sokg2wewNly8A/H1DQNOrBtO+Uu u9Ug== X-Forwarded-Encrypted: i=1; AJvYcCU5aVMRycHqD67Y4zjfuWs2YKJQ0eCIsMSknQ+klw65nZuQ90Ulyffp+fZ1YgOasAUYlGFsHkSXUXUTzlA=@vger.kernel.org X-Gm-Message-State: AOJu0YyOCuKAwYOGKSxaYtIEA4SYwCHCjnxn8KFtdI6blZ7c73jzed3N iScSXKkYsb5ZMGNEqckunaEOtbwZW92JQBkFmEHGXsdNl+AHyJXJi7grza3IohrANzyjQPF36iv 7QCAPkg== X-Google-Smtp-Source: AGHT+IHxNKOZXQRqXFBh0Em/H+iNSlDNtLvXHYWQSDa5n8zbCETpNRs8QA+iIutGKx825WSX+uZFAOsSUWPP X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:175d:4db2:deb4:d450]) (user=irogers job=sendgmr) by 2002:a25:dc0e:0:b0:e3c:9c76:b2cd with SMTP id 3f1490d57ef6-e434ecab7d4mr17133276.5.1734313609783; Sun, 15 Dec 2024 17:46:49 -0800 (PST) Date: Sun, 15 Dec 2024 17:46:34 -0800 In-Reply-To: <20241216014637.304761-1-irogers@google.com> Message-Id: <20241216014637.304761-2-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241216014637.304761-1-irogers@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Subject: [PATCH v2 1/4] perf header: Write out even empty die_cpus_list 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 , Sun Haiyong , Yanteng Si , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Reading the CPU topology is tolerant to the dies_cpus_list being missing by using the feature's size in the data file/pipe. However, the feature's size is just the header size and may be unaligned. Making the header size aligned breaks detecting a missing die_cpus_list. To allow the header size to be aligned always write the die_cpus_lists even if empty. Signed-off-by: Ian Rogers --- tools/perf/util/header.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 048e563069bc..03e43a9894d4 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -628,9 +628,6 @@ static int write_cpu_topology(struct feat_fd *ff, return ret; } =20 - if (!tp->die_cpus_lists) - goto done; - ret =3D do_write(ff, &tp->die_cpus_lists, sizeof(tp->die_cpus_lists)); if (ret < 0) goto done; --=20 2.47.1.613.gc27f4b7a9f-goog From nobody Wed Dec 17 18:01:16 2025 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.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 D4B512D047 for ; Mon, 16 Dec 2024 01:46:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734313614; cv=none; b=jGIbiFBBUAL1dvocnDhTdUbuWeyBYrh5/zvUtiIQjSrW5iE+8lShGjyKGNhKeud3gCfJe7Lf5AS3e9bofzn7VdarLBkxkqt++DQ6AD7Dva0TU+njnKfN6l2QFEAgT+W82psBPI4ByUng6mCYh5OM7IgID8zGmx0ihZndzsS4JWM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734313614; c=relaxed/simple; bh=BrUJvr7HXzMJyoNYnziI4wlrd5p8WOXp8dhXnVgi80k=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=YSQyI7sjaUQJd6IQnSncy38YjOUjKpJlo1D+3gCjFQXZGI+Po5//m+kMHTJUKDQBO/aXpKR9HfOH46qTMzQt68vxVSbiPU4aMb1dHwf0qQ+OKk/F8m1G4wfzjOD/2GlUSUoUKOJ7+r+rGyAA0pskPJTBg1FX8FHa867uPYltjWU= 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=HtVt+Ncb; arc=none smtp.client-ip=209.85.128.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="HtVt+Ncb" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6eff377fdc1so43367127b3.2 for ; Sun, 15 Dec 2024 17:46:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1734313612; x=1734918412; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=cLJ1stvpEh/i9mxehEqquhSJV82oFfMq3Eq8V809bTo=; b=HtVt+Ncbj0ke2mXvsTWPVqooTA7cR4aTCPPleArCr0mDd/Y7K13uzqxpHWD3XIkmrY JDKMb8T9XdBbvZwoSSxT5tIBWxDuUOS4Jy9Emb4b/3XUhfE+VFxHPz8A4yNUJoc9UZJc 00UjjDvXY2u/MDFnEtJ9JX7Bt9wlQE3puVXCjEDUzm/ICzhI6cSsRVcgKkKxwSXPepBr SXR8kqvkI9EMQT2VLvUEmEA3qjmkHfiBcSIF/Gr36YRxAER8wQT5lh/7rDyqvERyCeei D2upK1zEh/ryGCZeI9T1FJEe4OeKe+tHSM1J0emSPhFpl3euwncPt/D+Edm2quLS8J+a 1fyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734313612; x=1734918412; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cLJ1stvpEh/i9mxehEqquhSJV82oFfMq3Eq8V809bTo=; b=hPXoHgszKsfa46cliTkZdQQ+3Z/9ekPMBPpv8/YUG/PlJqmLxLBu3fIftXzTFmSCES fvHUyiT60KyjyQ4Tr9x7Nthsg4SiYu9lYHhE5w4pSc75J1dGeCouL5m4lVMteSxvUFPy TMqUu+L7D63tQiTkl1wPYAgJXADivJ/mB5/KyFs+GcfO9iGxwKX7ozZ/ygU1/1a8OQvq dPKk4WsfllXR0vU6mLiwZorkman/ZVWqTjdf4fviQbJXjIWO5QrkK/ob0p8xiFPmH1X7 H96CSvTLuVK8HMuIMow/7VDBLCXf73aRzbuv1n7l3ule6ghmgNXlHSs1QnUzGnJiiGPx AYRg== X-Forwarded-Encrypted: i=1; AJvYcCWgXrW4pneBiv48T+CY05MakSlWRuwMrfTC3yFuvk3GSSD16WXnT8PVfxGDgnjGa5giLfGFHsxDIUqVhQg=@vger.kernel.org X-Gm-Message-State: AOJu0Ywict8S4QfSVwMW5HJPsT3E2Y4+6UPlQf8NiKAE3IjMYgfLwMi9 /vDOARqc+uwYlU7lHQSiVD+jdYkSKa0fmPkSs2y3iY30dzwN01LwXfw5J3/4D641htakqGDMX9G fuGkYuQ== X-Google-Smtp-Source: AGHT+IH2cUWwsL9JMjl42pSLLJeRpiHnjnnVLW9VC1RCfNNSRe+MuZYjvNjozP5TUM4BheqLIjfDT3IzB3go X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:175d:4db2:deb4:d450]) (user=irogers job=sendgmr) by 2002:a0d:d107:0:b0:6e3:d670:f603 with SMTP id 00721157ae682-6f279ba2810mr1250687b3.3.1734313611808; Sun, 15 Dec 2024 17:46:51 -0800 (PST) Date: Sun, 15 Dec 2024 17:46:35 -0800 In-Reply-To: <20241216014637.304761-1-irogers@google.com> Message-Id: <20241216014637.304761-3-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241216014637.304761-1-irogers@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Subject: [PATCH v2 2/4] perf synthetic-events: Ensure features are aligned 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 , Sun Haiyong , Yanteng Si , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Features like hostname have arbitrary size and break the assumed 8-byte alignment of perf events. Pad all feature events until 8-byte alignment is restored. Rather than invent a new mechanism, reuse write_padded but pass an empty buffer as what to write. As no alignment may be necessary, update write_padded to be tolerant of 0 as a count and count_aligned value. Signed-off-by: Ian Rogers --- tools/perf/util/header.c | 7 ++++--- tools/perf/util/synthetic-events.c | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 03e43a9894d4..d10703090e83 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -168,11 +168,12 @@ int write_padded(struct feat_fd *ff, const void *bf, size_t count, size_t count_aligned) { static const char zero_buf[NAME_ALIGN]; - int err =3D do_write(ff, bf, count); + int err =3D count > 0 ? do_write(ff, bf, count) : 0; =20 - if (!err) + if (!err && count_aligned > count) { + assert(count_aligned - count < sizeof(zero_buf)); err =3D do_write(ff, zero_buf, count_aligned - count); - + } return err; } =20 diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index f8ac2ac2da45..ee6e9c2fb11b 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -2401,6 +2401,8 @@ int perf_event__synthesize_features(const struct perf= _tool *tool, struct perf_se pr_debug("Error writing feature\n"); continue; } + write_padded(&ff, /*bf=3D*/NULL, /*count=3D*/0, + /*count_aligned=3D*/PERF_ALIGN(ff.offset, sizeof(u64)) - ff.offset= ); /* ff.buf may have changed due to realloc in do_write() */ fe =3D ff.buf; memset(fe, 0, sizeof(*fe)); --=20 2.47.1.613.gc27f4b7a9f-goog From nobody Wed Dec 17 18:01:16 2025 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.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 057C58289A for ; Mon, 16 Dec 2024 01:46:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734313616; cv=none; b=HCMZxUvMNQW1uc4i6KSnnl8HhDOEGxCQPlvLGEClhu+p/1gEUkMEj+A8+dOL13zTVityXEgMQpxWXbihymdA9q7NtUByqsZZbosOpntATc5CaYjQxq3oSRrb/3gxw4O6ia8TPEKuHyO7c2Cvz7mf2MgkYxMmAcf1nWT1kb9eFm4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734313616; c=relaxed/simple; bh=6N1g9uANonuB1X5ujQfQoFLZ8OgRQZPDGmKT28hZDMg=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=QaaR8AjHsBojFmX6o+r99ZdsfYTjQzCn0FLa+DEjXZ2xq8EILx3yCtbImiqvi7KBQAzrjJvK7EhkeWCV4KZyWNZHWACMiUgMUEWjPCtVCAXap6LDRsqW1tavUB6OvJ6DySk65GvkNUrxSnj9bUgLHST0nFJWAE9zVPNoT2gAV3U= 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=fqCXimzf; arc=none smtp.client-ip=209.85.219.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="fqCXimzf" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e3c61a11a40so5250114276.2 for ; Sun, 15 Dec 2024 17:46:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1734313614; x=1734918414; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=ZvACGcoM6KJ0hrZi/+tcGlPsYcMWSS3N/4SFXVszCzA=; b=fqCXimzfZNOpAJwcasNf/cGSulePMvyaVFsQv39RcXGS9L901P/0NdyqMWkmLPFCcJ M4ZtoHiPJHLaxu0sj2Q8eZRt6tTJA65WSMOiJA2i1HRL6qFNJKskrEwkCNq4msq8Ye6t B6CuDkh0fr6/DHFKxEiOt9cpd3hnFaEZ2a0EbLucoTPnuBGStpIWVRbngSe5rIrbyA5G DJ+wOmslVOYeD5jkgoAsR7Jeq7VC4qtA6mxvodX8z38id4ecykoMBhZi+bekt4AAOuxT DHJs/g7Wigy0fQ9dVw9RQQdokPKgOsQeVbgPtzXu4jcI66XHswzudMG41LAeBryX0wfM RwUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734313614; x=1734918414; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZvACGcoM6KJ0hrZi/+tcGlPsYcMWSS3N/4SFXVszCzA=; b=w2L+ZOJXvp16mIE6iITbDhO6nmYEE2MfdacDxWYjQTxloKoCnQMJS7M8Jp+yGKUcXS P7FnteHu4avVdCuQKaSX/lK8LcPbGTh8QuWK0YSiVYmQWoIY8l4pIqge4OVs/UQBvMkU XkLV2Wu9wacEhYqq+RAoFM90u8oGLYmmi3we3MoY75pNlDhNG1+D6auEGLeeK67wUN7f V0J76xonliUY81Q6FqU15Qjw3XbRQHGlmlnQW+e/08Sa3Q2ljLdEFGPiRVZmE6zQdjLu 2yfVxbCks/ciybm9VHV/HDO4b/KI0ERC4PR94PJhxKo7G8TtoUOJEzB/Hb5R5IKvIad0 IN/A== X-Forwarded-Encrypted: i=1; AJvYcCVXcWU/F/bWZGSckRCWiRKW4V4fIr27sHLn4gEThEI0Sc7KUu267LcERaJnBjRBONfmfAN5h7qFt+FdF0Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yzx1fVmrmG7hDSwwWg6fdYM7/HpgkmxH4x5Q8WQjy6UHaR2BSAL hmtWPCMaT2dSNk0599WsxTnTwjBFAH9Ukxuvtj5t1BZA2YyMkprhAQ08K7veRh/PI7F/oA3kqar nhlO2vA== X-Google-Smtp-Source: AGHT+IEJI4OnjwPwIbrmZcw/cre+ES3OYknRsW/w05Ns/lgKMyEqnXJlq9KI1hfL6zbr00Cql871xgXmUp+t X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:175d:4db2:deb4:d450]) (user=irogers job=sendgmr) by 2002:a25:adc1:0:b0:e3a:512a:dca7 with SMTP id 3f1490d57ef6-e4349ba1ccemr5441276.3.1734313614042; Sun, 15 Dec 2024 17:46:54 -0800 (PST) Date: Sun, 15 Dec 2024 17:46:36 -0800 In-Reply-To: <20241216014637.304761-1-irogers@google.com> Message-Id: <20241216014637.304761-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241216014637.304761-1-irogers@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Subject: [PATCH v2 3/4] perf machine: Avoid UB by delaying computing branch entries 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 , Sun Haiyong , Yanteng Si , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If the branch_stack is NULL then perf_sample__branch_entries may return NULL+1 which triggers ubsan (undefined behavior sanitizer). Avoid this by making the computation conditional on branch existing. Signed-off-by: Ian Rogers --- tools/perf/util/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 84661d950104..7b1e1c254c17 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -2670,7 +2670,6 @@ static int thread__resolve_callchain_sample(struct th= read *thread, bool symbols) { struct branch_stack *branch =3D sample->branch_stack; - struct branch_entry *entries =3D perf_sample__branch_entries(sample); struct ip_callchain *chain =3D sample->callchain; int chain_nr =3D 0; u8 cpumode =3D PERF_RECORD_MISC_USER; @@ -2712,6 +2711,7 @@ static int thread__resolve_callchain_sample(struct th= read *thread, */ =20 if (branch && callchain_param.branch_callstack) { + struct branch_entry *entries =3D perf_sample__branch_entries(sample); int nr =3D min(max_stack, (int)branch->nr); struct branch_entry be[nr]; struct iterations iter[nr]; --=20 2.47.1.613.gc27f4b7a9f-goog From nobody Wed Dec 17 18:01:16 2025 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.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 77501136337 for ; Mon, 16 Dec 2024 01:46:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734313618; cv=none; b=q/NDN6gGjjWtgbc0EOHJRGLz+N2SUHIf/ntb4AGEPVzaat8ohdQoUDvBg+LROJm9UTJPShRBsZHPPmmANsbvGSSUD8rkfECiiE86NkiMARQNh8T+sWjRHbEqcemabnk5CSHJdeyd4ulpNRm65FyUzbisPOJgBl8dwGj08pWQh58= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734313618; c=relaxed/simple; bh=iEVYgx/hxX84VyoDEpscAjkrNLwDJylilFK5OuBYN9g=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=k1TCIY0ZY8WP84JkwZyOx5Os5miD6H31rRgt6o6TF8qUXEneU+0hmBR2vd6t+3Lr+3L5xhs97qZMz2aeTDZyfqXes0p2eJIiRwqEraYHkEzguAgLb4h382yvpG5zyxS8By+8JdyXopjc1rqg2TK3PF400/bmb/z7gIX0zocln9U= 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=2bQo9Or2; arc=none smtp.client-ip=209.85.219.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="2bQo9Or2" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e4c27270591so819457276.1 for ; Sun, 15 Dec 2024 17:46:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1734313616; x=1734918416; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=FTHl2TPsCH6LymZInluDoB5DdWMc8GssygaKpaKL3WI=; b=2bQo9Or2DQaDZb+IOytzFpTNi0ar+5mtAPEDnoCgunmAMMS996O8TwFI0hMVGuuaFa oqb8vj4Fd5HZAPqxkSRcSG1ZH3gK5+EMyzzALKZhBYhqDq7/aZ6DqRg8zdbssHWG36WW OkzCUyxnf1lo0/0ccWuCmxlFaNWqaxWhUe+wmhpl/gpPJqrxSk+8QJiEq9H1Puati8/6 wYPye/vMAVxEARNf66mzaQDz/5RVFkDLZnQ7weEGbFSi5T759bgSmF91uU1Equlx1hu4 fLW4E9klkNMPLIuG9Y+5HwsEkjxkBF5LcWApcEeigRRtGG2Ye7w+SMU7vG3r4lYh+J7s j2lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734313616; x=1734918416; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FTHl2TPsCH6LymZInluDoB5DdWMc8GssygaKpaKL3WI=; b=QhCkNqVciiOatIC4ttGFrHL1wKOvsuZOzSSbkX25mPkWJp3Dl51eOBDdX/ToH+Jhe1 /x3a6wtZ0x3/CJcZeqmfF3G6/5w02CmF2k6KAI7qr0TjwLchUcPcM2/BNHZVdxxlU42K 1SUV5go2BD0G9ANNl2zElkik+1SS/lwp7JXyNcHqSfQ/I8ToPvKqxAwdzl3xya9PGTNm yyFDvvoSl53gHCPoFO2TyldmZzcOOJjszgXY8j0lb6mOFaiVBVRd4CVL+SFEwT7Sov3Q QKhMdl/ANloFiMF5/Q1/rz0VqynpiqXsdFZCd3C+x4GPI9ScB55ZHVcR4gaaKdGSwM20 HXZw== X-Forwarded-Encrypted: i=1; AJvYcCV3IO1HaOyoR56y+fu6l6yVf0PEg+Y+kA/pzb1eMCyHmZG70hP7mh23LooPbLyDAHGUeO1E0UxMYgQuTRo=@vger.kernel.org X-Gm-Message-State: AOJu0YwFodzMKS1uU4w3DJklC2ypDmGNovx5i0uVyO11INyuyPr32Qdj aUBMCpDBXGg/IcjDJVXovFLtNIfZIl8yBDacBTHZkbtncH1dzEiTrtM50CX6IN19JTGcAejcA5F ozCCmkg== X-Google-Smtp-Source: AGHT+IHzhopf++xHJgpWcD61mnNsp8wVUb1egX9jwPAyVVZFjVKzSAtoohRp+jls2hjdFscyiBoONmBj9leR X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:175d:4db2:deb4:d450]) (user=irogers job=sendgmr) by 2002:a25:ce0e:0:b0:e25:d46a:a6b6 with SMTP id 3f1490d57ef6-e434fd22102mr7287276.8.1734313616433; Sun, 15 Dec 2024 17:46:56 -0800 (PST) Date: Sun, 15 Dec 2024 17:46:37 -0800 In-Reply-To: <20241216014637.304761-1-irogers@google.com> Message-Id: <20241216014637.304761-5-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241216014637.304761-1-irogers@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Subject: [PATCH v2 4/4] perf record: Assert synthesized events are 8-byte aligned 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 , Sun Haiyong , Yanteng Si , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Capture that events are 8-byte aligned and avoid later misaligned event problems. Signed-off-by: Ian Rogers --- tools/perf/builtin-record.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index adbaf80b398c..a5689d0e93ad 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -624,7 +624,10 @@ static int process_synthesized_event(const struct perf= _tool *tool, struct machine *machine __maybe_unused) { struct record *rec =3D container_of(tool, struct record, tool); - return record__write(rec, NULL, event, event->header.size); + size_t size =3D event->header.size; + + assert(PERF_ALIGN(size, sizeof(u64)) =3D=3D size); + return record__write(rec, NULL, event, size); } =20 static struct mutex synth_lock; --=20 2.47.1.613.gc27f4b7a9f-goog