From nobody Sun Feb 8 23:23:01 2026 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 6DEA316DC01 for ; Sat, 31 Aug 2024 07:04:29 +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=1725087871; cv=none; b=M7PQIiumfI3mkTjrKGFA//s617ETa3Eb2IdCrjoIAQQf2MJ4CZ0Ne/iHoIvF/dI1PVdoGOmGRP+BGfKR+jt/xziduALB3cNRf8eUBmBjKk3eNpr4UGlIbK6LFwbfBeX5Dkn1glCbNFhJ8Znk1ppYG+mTlghW59hzrcWX1MYq9OM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725087871; c=relaxed/simple; bh=e7twF7D4RZxswFbYZbFUFk/hv4Xp6qmoMYXmywlWvMQ=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=YtkKguOzCNj98mrWlHCjshvzoCV6w3V+FsX30b2P96DJFtVf8kaClo8JykGxACuMzF5yqpcaBbK0CLyZsP74YiOuLhcyN1X1hwjM8gPsa30us7WCeSx4LvUs8ilRJfTNemI0A8BrQqxIJWNAIhygwStAQgACCJhmZkJg9nXZKhI= 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=LO55cXUg; 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="LO55cXUg" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e0b8fa94718so4432372276.0 for ; Sat, 31 Aug 2024 00:04:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725087868; x=1725692668; 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=5JYnw2dXbPbmg3NZBXlioPl/0JNNRzqtalz3T5B9FgQ=; b=LO55cXUgFO9f58d+MRZBv35n+pVpR4useOAwGWcn4XVMrfJ8WO68IMzmTp/mwhEQ1j DVJnHRgINOkZzRHLj3/vZMrvyehKlklGgM6RM51XfUZYgueanx3MH8RUvta3/4VznHMW Xi6u4vt8Z9VK68MQz9VB7N5Mey01XmlxOA1tlYUNQBcE0tzzypC9hh3zULKpB26GRvfJ vdifa/S9P1AT8nCiIsLZJkwuqqtWzmzxvTNciNxHYICCf9W+/PyyIWUBgJZ8Cryqb5ZG I7P3fsSkwIlU9Qe+vKbhMPYHV1BGVoIW0skCWEFXkTs7HjNJPwxnmZQQxw64enOVfGqI Ulmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725087868; x=1725692668; 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=5JYnw2dXbPbmg3NZBXlioPl/0JNNRzqtalz3T5B9FgQ=; b=B4u0nhJ9o1et9InevHPUnd9z6BWLxZ7m8vuhnQYwy3cef0Za3KJIcwZRyFgzUCImMd ckM5mdk7l1P1lV0JKBr1UNTr9m4R+YjDoAvWas31cMB9g7OobTphZbNiIdTS7Wvnkkib Lpgrluocz8HAOFsLa/18nBRqpDylUrhWkYBWyKdJXOw8OFcLiiX6BTNCKWsUWMMTtpa9 h7YnbdcSZK7COeOyS67VejUTzVEdWOUdBVMjq4y9aqui3XhW5i4EuBcgUIpR965Trfva u6craeORQSE3P9zqMh4LG21+skr8jGibR9dRtvMvpYTzYtB+ClBpHlUyjzFv5uAttlVO +RbQ== X-Forwarded-Encrypted: i=1; AJvYcCXUFKTEPc12r9oMA/onoBB7pPSiHSJzHG2kkzh9E78bsJEbsiO1XfcQ9XIKqWry7zobnsN0wTGEgiOAYEA=@vger.kernel.org X-Gm-Message-State: AOJu0YzfVjhKW/3VjECvp33lmT+vsY9sfcWJt4ubedvmvH/04Zm8PnNB x7dnH4+tyyf7FUW3KLKXHQSevmOvdi71KARrCvxa6stoddvYIihmQa8/tNbnSQsfVUheT98Yqjg PGj2eJQ== X-Google-Smtp-Source: AGHT+IGdUhZFJPlK/Qxv//Vm6pYoy9bw5mKZTru8Hmeo9HYUH5eUEev/E5gQd0OB4l5BuG8DCERNpBMJv/70 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:4974:82ff:2f9:edb6]) (user=irogers job=sendgmr) by 2002:a25:6883:0:b0:e17:c4c5:bcb2 with SMTP id 3f1490d57ef6-e1a7a1a6710mr228774276.7.1725087868388; Sat, 31 Aug 2024 00:04:28 -0700 (PDT) Date: Sat, 31 Aug 2024 00:04:10 -0700 In-Reply-To: <20240831070415.506194-1-irogers@google.com> Message-Id: <20240831070415.506194-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: <20240831070415.506194-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Subject: [PATCH v1 1/6] perf pmus: Fix name comparisons on 32-bit systems 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 , Dominique Martinet , Yang Jihong , Colin Ian King , Chaitanya S Prakash , "Masami Hiramatsu (Google)" , James Clark , John Garry , Junhao He , David Ahern , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The hex PMU suffix maybe 64-bit but the comparisons were "unsigned long" or 32-bit on 32-bit systems. This was causing the "PMU name comparison" test to fail in a 32-bit build. Signed-off-by: Ian Rogers --- tools/perf/util/pmus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index 3fcabfd8fca1..769b920d9250 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -69,7 +69,7 @@ size_t pmu_name_len_no_suffix(const char *str) =20 int pmu_name_cmp(const char *lhs_pmu_name, const char *rhs_pmu_name) { - unsigned long lhs_num =3D 0, rhs_num =3D 0; + unsigned long long lhs_num =3D 0, rhs_num =3D 0; size_t lhs_pmu_name_len =3D pmu_name_len_no_suffix(lhs_pmu_name); size_t rhs_pmu_name_len =3D pmu_name_len_no_suffix(rhs_pmu_name); int ret =3D strncmp(lhs_pmu_name, rhs_pmu_name, @@ -79,9 +79,9 @@ int pmu_name_cmp(const char *lhs_pmu_name, const char *rh= s_pmu_name) return ret; =20 if (lhs_pmu_name_len + 1 < strlen(lhs_pmu_name)) - lhs_num =3D strtoul(&lhs_pmu_name[lhs_pmu_name_len + 1], NULL, 16); + lhs_num =3D strtoull(&lhs_pmu_name[lhs_pmu_name_len + 1], NULL, 16); if (rhs_pmu_name_len + 1 < strlen(rhs_pmu_name)) - rhs_num =3D strtoul(&rhs_pmu_name[rhs_pmu_name_len + 1], NULL, 16); + rhs_num =3D strtoull(&rhs_pmu_name[rhs_pmu_name_len + 1], NULL, 16); =20 return lhs_num < rhs_num ? -1 : (lhs_num > rhs_num ? 1 : 0); } --=20 2.46.0.469.g59c65b2a67-goog From nobody Sun Feb 8 23:23:01 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.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 A748016E860 for ; Sat, 31 Aug 2024 07:04:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725087873; cv=none; b=HkEt0pJ9tEm18Uj0xlToxzE/JC8132bWLGzHGuEcjo4Waj04DVR2qNLFDZaL+fT35RbtNlGP8yFCpqIevAYvwVhdub8lxjttolJ63S+l+/Xs/7321mmRfTt9TeOl2XKuUNIHbnuYncBtBGjUvWskgOqFzMG7PxcMTo9HNW7D9gw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725087873; c=relaxed/simple; bh=QDLVJmTj2vf/hVHdQ6L7zR2dfVNf7BD0kyHNVViDvMk=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=o7OBsIXm8ui02IQKNy5aR74LP/45iDpSNeCFGW5mbmK64eoydodUbRzv/dlt4PnlXrhG0XE5mzRrWzCT92FpUhTt9UF46VwigHM12mZx5W3OJUoDLedkKzOXvJ0Z8n5qd3LalThj7gV28J9W+47IDB/HSLRxu3qQFLbJwiFJ9hk= 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=JXNSD1do; arc=none smtp.client-ip=209.85.128.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="JXNSD1do" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6b43e6b9c82so64714867b3.0 for ; Sat, 31 Aug 2024 00:04:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725087871; x=1725692671; 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=xXQyzsuqXOgxY2EbjHgMehvTpafBAnrj6hlvtmn8jRc=; b=JXNSD1dopHI4p5aDw/kHAi7TmVzq1hYeETV2LLQTWUm3K8p8glR7NHCfaqEySAlMYE TNxtKFAAn169PGi+Xp8Gy0uAnvMxYDRWeWxmGA77raHh/gjA8w4nX8x+0e9r5ix4K2OY vQSB4fRRWkVAtS2+jU4xhsoUJZM8++PdOBXiYVUis8Ay2XDMdYjBqsnUocXoVXDaPxRJ e8O/cKhrPPoeEGVmu66SBUPRqAwug/Nxreh0gnRKi+t7cXa2MX/QOzwLFaNnYvsarCwi Tu6JnMjvDNEaZ8vC8aZK7/kRDYuWHascjiZGHFv5/I8RSck5izIYQDVONLvwhWTIMlUE gAzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725087871; x=1725692671; 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=xXQyzsuqXOgxY2EbjHgMehvTpafBAnrj6hlvtmn8jRc=; b=rD7n0c9TL9A0wY2r/tCddnG7UzhGLvX4sv+f421qM+hz9MBVbCln7P+5f6hr/vqjXk Mv+oBiqKI0qCcif7hu8ypXvWvS7ruRKHbs6cpmNUhudD1m7DzMl9suBUgq+7mYEfw0hc lx+tMBnZHlQ0DYzlxbAymzcpu9YgX3XuZF4s8MAoE7nOUSy1VfUgaO1aJH2AiTumBmpw ubGBoafcmwr5mCtEffDR8XqIov/nbGxq9xmg+X0EukyKlwifBSkwFtAO90WMkBDOzPbj N0NS0XIV+StZu0Y82hzSKw+ZCcyuTjk9WqEOjBz++aRavg5nwaLR4nU6JLYtxHx9et/2 4sng== X-Forwarded-Encrypted: i=1; AJvYcCXMZHPG52f0da7Q40G79fBS+CnPVDDj9TWBUputlxk4d7BHzYkZDIPb+2lZBvNupOAg1rEzb6iJfY7fc6o=@vger.kernel.org X-Gm-Message-State: AOJu0Yyck4TI+QSYaQwT2X1H7+lqmYfLVTR84I5YysJxvoAkcMQtFj5F m/cAkWIHjAofdyOduydVjMHAvuHXJbS/v0AWxtX/cuvD0QlPkGs8xayRzxogVkDMmmhtmYpvHxH dqIRiEA== X-Google-Smtp-Source: AGHT+IH/XwkINJDTLYatGH3+bylUfIVzyT/ephgeuedK4Ucm3QSS0qZ7j1RoXIYjjyGAVuio2MJSg+p7XQQa X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:4974:82ff:2f9:edb6]) (user=irogers job=sendgmr) by 2002:a05:690c:6d8b:b0:6be:9d4a:f097 with SMTP id 00721157ae682-6d40fc1ee69mr1994767b3.7.1725087870719; Sat, 31 Aug 2024 00:04:30 -0700 (PDT) Date: Sat, 31 Aug 2024 00:04:11 -0700 In-Reply-To: <20240831070415.506194-1-irogers@google.com> Message-Id: <20240831070415.506194-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: <20240831070415.506194-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Subject: [PATCH v1 2/6] perf time-utils: Fix 32-bit nsec parsing 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 , Dominique Martinet , Yang Jihong , Colin Ian King , Chaitanya S Prakash , "Masami Hiramatsu (Google)" , James Clark , John Garry , Junhao He , David Ahern , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The "time utils" test fails in 32-bit builds: ``` ... parse_nsec_time("18446744073.709551615") Failed. ptime 4294967295709551615 expected 18446744073709551615 ... ``` Switch strtoul to strtoull as an unsigned long in 32-bit build isn't 64-bits. Fixes: c284d669a20d ("perf tools: Move parse_nsec_time to time-utils.c") Signed-off-by: Ian Rogers --- tools/perf/util/time-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/time-utils.c b/tools/perf/util/time-utils.c index 302443921681..1b91ccd4d523 100644 --- a/tools/perf/util/time-utils.c +++ b/tools/perf/util/time-utils.c @@ -20,7 +20,7 @@ int parse_nsec_time(const char *str, u64 *ptime) u64 time_sec, time_nsec; char *end; =20 - time_sec =3D strtoul(str, &end, 10); + time_sec =3D strtoull(str, &end, 10); if (*end !=3D '.' && *end !=3D '\0') return -1; =20 @@ -38,7 +38,7 @@ int parse_nsec_time(const char *str, u64 *ptime) for (i =3D strlen(nsec_buf); i < 9; i++) nsec_buf[i] =3D '0'; =20 - time_nsec =3D strtoul(nsec_buf, &end, 10); + time_nsec =3D strtoull(nsec_buf, &end, 10); if (*end !=3D '\0') return -1; } else --=20 2.46.0.469.g59c65b2a67-goog From nobody Sun Feb 8 23:23:01 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.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 D56F0170855 for ; Sat, 31 Aug 2024 07:04:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725087875; cv=none; b=dxVSg1ODamenvASCbUvN4MfApgmoQ+lZOvixVCZFr2gGUMgBTLG4u0iU74Y0sgVN3hmDWbvh3n6c8k5kz1wjoSMtTJgpTMeQIA2QpCRI1MAhIaR2wCFdi8ub45XHCtrccdCDQ+Eiw2BoLtxPo6LuiEM7fQwy/5MfRY1ylQ6ir/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725087875; c=relaxed/simple; bh=5gbFoYoAAv+z9iYcQzJxmKjtjoR9rkjq5SseKmfmyZc=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=ZB3SEjEHI7TkCOPA9r2Jxw1e8rD6P5x2JZ54EOrFiN2nZ7EMHq/wBQZ//gy5jNjWXQSg7XUs/7nNUUQ3p7009LBp4UlVpWxvAB99Lz07mUxE8QeBHVrGjK5pLVaQllrFgO75EmLp7GoDuLZ9DNNuWDhJKf9aeDJeGeCP/PsOfv8= 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=piMKGFgF; arc=none smtp.client-ip=209.85.128.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="piMKGFgF" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6b41e02c255so52023357b3.3 for ; Sat, 31 Aug 2024 00:04:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725087873; x=1725692673; 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=pHNCvvAGAccTwrROKiH6oXmaoTXEGMqssDdptckzxqE=; b=piMKGFgFqa9wQ1E5K2F437ur+RkQq/2mcjFbrElaAr9+UTZChhqSBkxRH+bYcm9d8v 29F7EQQqoahoIsnt13NTdeaBP/zJAUuvjYnJ/uwJXcQOb91+UiBHAs+vP4ssnRq/4lec bh+b4jJBSa0n0gT55xnqWWZ2xtYKI97OuDGgKluKa13d3jUwfOsYE23b4VcaJgqXsRUU otB40M3VXHoM3eNXEDe5me8hKdh+LQ+sFoYYNBaP8J3Llr7t/5iP5kvSe/9CS6NggNRU cxzncTdTltmFDTgJHniTxibEX0ye4NofJSja4onT5av6kI4dKvh8ojS24ev+HebPDse0 eifw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725087873; x=1725692673; 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=pHNCvvAGAccTwrROKiH6oXmaoTXEGMqssDdptckzxqE=; b=JXr4G64+Etd5Ax0k1ef0N3MF6f8WN0rxJItva+xHZXb6AV0orTqruNdBekcajwDnjO gC+xXBniWlwLK1/VjIHm+/+oSr/oXyRbvMtwSKDFv33OzrH0ZxiQQuY5PDWm5F+/pc6B ibq4mdkAQ8J8HAUUCscX0DwdmlsD6ANecwNUOTLXLjPRlgOVNbLFqtPIMiUPGz2pvXnL V/jq4ZcARBPjEJpBjTFkuWyXg4hO0uKBeLiQ5jApuz7ZrvSLdEi2BJ+YJbSdSSi65xoh 19lFjpU2rIox5dgNn09SX2z8tRAEH19YN3qoNG082LEup9UzMs1BJdvCiY1TqDMzQtmU 5Z9g== X-Forwarded-Encrypted: i=1; AJvYcCUtr9u6kyjW48lAUIoNHDf333jf472sjV8gPUewnWtwBGlU1Cap7/2uuhm0jVGHILKiU1wA0yKGpas0Mdc=@vger.kernel.org X-Gm-Message-State: AOJu0YwQYFGwe+VfP9b5yj6HF6qw6cHFpuIjHp6rBfiyVzNcP3YZAz+V pyOcjazdpMjx4BBKUQseafAOyoZ8OUhGWBZyV0/msnRvfr/Gwik624PLCUjZs7v6YxaBqWWpL6b cKHA7XQ== X-Google-Smtp-Source: AGHT+IHP+Q4nMc9YeG5NMkEAMx87MhHBoryoHgfbR7qMaWbgos9SQIWlIWLQeYrfoOeLCo+Z/SO7M3dGHGl5 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:4974:82ff:2f9:edb6]) (user=irogers job=sendgmr) by 2002:a05:690c:3386:b0:68e:8de6:618b with SMTP id 00721157ae682-6d40d88f6a3mr1853387b3.2.1725087872962; Sat, 31 Aug 2024 00:04:32 -0700 (PDT) Date: Sat, 31 Aug 2024 00:04:12 -0700 In-Reply-To: <20240831070415.506194-1-irogers@google.com> Message-Id: <20240831070415.506194-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: <20240831070415.506194-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Subject: [PATCH v1 3/6] perf test: Skip uprobe test if probe command isn't present 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 , Dominique Martinet , Yang Jihong , Colin Ian King , Chaitanya S Prakash , "Masami Hiramatsu (Google)" , James Clark , John Garry , Junhao He , David Ahern , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The probe command is dependent on libelf. Skip the test if the required probe command isn't present. Signed-off-by: Ian Rogers --- tools/perf/tests/shell/test_uprobe_from_different_cu.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/perf/tests/shell/test_uprobe_from_different_cu.sh b/tool= s/perf/tests/shell/test_uprobe_from_different_cu.sh index 82bc774a078a..33387c329f92 100755 --- a/tools/perf/tests/shell/test_uprobe_from_different_cu.sh +++ b/tools/perf/tests/shell/test_uprobe_from_different_cu.sh @@ -4,6 +4,13 @@ =20 set -e =20 +# Skip if there's no probe command. +if ! perf | grep probe +then + echo "Skip: probe command isn't present" + exit 2 +fi + # skip if there's no gcc if ! [ -x "$(command -v gcc)" ]; then echo "failed: no gcc compiler" --=20 2.46.0.469.g59c65b2a67-goog From nobody Sun Feb 8 23:23:01 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.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 7D99C175D3D for ; Sat, 31 Aug 2024 07:04:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725087879; cv=none; b=fJc8vorwpKMaqQu2ixUkB2xNwzw6GyejAu5znnnRDZylyHr7D1NbbXQZ8bfd48PM8xRQ9hWLQJacOJh797KrzqMdac/9g8qB+BL+NrIJmkUh53VBvK+0OGB/LGepbqZhdFc0NYAqxkXbhEXKEoMgW2ytbS4igaNs7r4xdUytJ78= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725087879; c=relaxed/simple; bh=8UPkJyqmMUZX6rxp//OAQh9bbpxpB7gHGefxdcxc+Iw=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=BjdXl7oD2/hJjmLQmaZf6g5wXT6g39rC2fpCGlKEiPuEM82VQ8eLkzYqAsru7hwa4rZxcJfmK82K8aF7dre2UiX40guN92WOhEj1lqYYAjanL6brK8vyRA4I+H8dStKmtaZDK2HsN7NbVKupxH+xq8TFezXMNzOCY7fGHspe2xs= 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=1QVuN1YZ; arc=none smtp.client-ip=209.85.128.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="1QVuN1YZ" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6b052c5939cso33071597b3.1 for ; Sat, 31 Aug 2024 00:04:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725087875; x=1725692675; 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=3TY7dleA8hoe/b0STghmEa4EVbup5XFL8ChSr6jPnf0=; b=1QVuN1YZOdCQ4cRtAIjf2rOxQH70jwbVmI42HpY7v1TpFVJu8xsbvEHYJlSGPNyDeH igeq98AlmuD4/hWVb0h0D6AFuVUqVYatslbifMLGn8uIZVY4S3KubPocW8IsJ9Rvy+1u l/VGC/HRvBr/PHcYqIyrLGziUUL0oLr8fdfWzv7QQvbVmtDfPl2IwoCOw6ONNxjZFSZe bjE4ISxmR4zZrmqsrmVoymV+X++OKlo7tv6LuUNcTERRGDr37CUL31erfwJrM4dHE2U7 M7U47C0A0qZ7duLqErB8YOSIV09aSHIxhiwBC+GvjLdGwcsvmOdqrDKizskyzjiLSkJQ WqnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725087875; x=1725692675; 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=3TY7dleA8hoe/b0STghmEa4EVbup5XFL8ChSr6jPnf0=; b=iRk2k0N6L0tGd136TMQFDplau8RqxgxYH98G2tKyI5VPKetyEKlJLXonHxv+8yLqXn wnKUsjXeIZ75tXqKuHh42kViNz+DxkMZ32xCCCOVNIYJbTdy4gtwc9oyazOvmrc1D72d k8TViEoMUh7M/a18mh/97WZk4wkAnqt3ybEcST65tdgn6Of9SUK2Fau1Y2uM26x74ZkP KrfRH7r5oJE1Aq1GQ3WTneq05pkgCu7Zblywg6RRb3RgQ1m7Y9qpNfmR7U33h4+uU+Py m7stgEkHlum5/vCvkxVZ7fjLycS3Rxwoa4NtJH+9qn53+4pB+ovbzI7Wx1jZWCuXLshL BQKA== X-Forwarded-Encrypted: i=1; AJvYcCXE5GFoY2irYkLWC8zhk/cDW7n3GxhItLNXCMbMMsL/8SXufW4wfPb7CYhFPMTPPzbNVlprFXgGWRukIoA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyv6TpJngcommj6RomhXj7MjEa130eypkU80mBNggklne4EcW/e fEBdAiolHguiYKbqN0whDXWRuMAq2Z9seuEAoUOEs7Yw9tRa6OQeQsDENjo0Ypd/FxW+VhXKRk0 25AwOUg== X-Google-Smtp-Source: AGHT+IGnoAl7EJ4WctiSw6Y64whqdTB5BzobJZ3VDTVwGagWDxUuDNSHQY1Pw0RhThEdjT9oJNjsj9+X+qt9 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:4974:82ff:2f9:edb6]) (user=irogers job=sendgmr) by 2002:a0d:ce07:0:b0:6be:523:af53 with SMTP id 00721157ae682-6d2868a316amr2536287b3.3.1725087875282; Sat, 31 Aug 2024 00:04:35 -0700 (PDT) Date: Sat, 31 Aug 2024 00:04:13 -0700 In-Reply-To: <20240831070415.506194-1-irogers@google.com> Message-Id: <20240831070415.506194-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: <20240831070415.506194-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Subject: [PATCH v1 4/6] perf parse-events: Add default_breakpoint_len helper 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 , Dominique Martinet , Yang Jihong , Colin Ian King , Chaitanya S Prakash , "Masami Hiramatsu (Google)" , James Clark , John Garry , Junhao He , David Ahern , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The default breakpoint length is "sizeof(long)" however this is incorrect on platforms like Aarch64 where sizeof(long) is 8 but the breakpoint length is 4. Add a helper function that can be used to determine the correct breakpoint length, in this change it just returns the existing default sizeof(long) value. Use the helper in the bp_account test so that, when modifying the event from a watchpoint to a breakpoint, the breakpoint length is appropriate for the architecture and not just sizeof(long). Signed-off-by: Ian Rogers --- tools/perf/tests/bp_account.c | 4 +++- tools/perf/tests/bp_signal.c | 3 ++- tools/perf/tests/bp_signal_overflow.c | 3 ++- tools/perf/tests/parse-events.c | 3 ++- tools/perf/util/parse-events.c | 7 ++++++- tools/perf/util/parse-events.h | 2 ++ 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/tools/perf/tests/bp_account.c b/tools/perf/tests/bp_account.c index 6f921db33cf9..4cb7d486b5c1 100644 --- a/tools/perf/tests/bp_account.c +++ b/tools/perf/tests/bp_account.c @@ -16,6 +16,7 @@ #include "tests.h" #include "debug.h" #include "event.h" +#include "parse-events.h" #include "../perf-sys.h" #include "cloexec.h" =20 @@ -50,7 +51,7 @@ static int __event(bool is_x, void *addr, struct perf_eve= nt_attr *attr) attr->config =3D 0; attr->bp_type =3D is_x ? HW_BREAKPOINT_X : HW_BREAKPOINT_W; attr->bp_addr =3D (unsigned long) addr; - attr->bp_len =3D sizeof(long); + attr->bp_len =3D is_x ? default_breakpoint_len() : sizeof(long); =20 attr->sample_period =3D 1; attr->sample_type =3D PERF_SAMPLE_IP; @@ -92,6 +93,7 @@ static int bp_accounting(int wp_cnt, int share) attr_mod =3D attr; attr_mod.bp_type =3D HW_BREAKPOINT_X; attr_mod.bp_addr =3D (unsigned long) test_function; + attr_mod.bp_len =3D default_breakpoint_len(); =20 ret =3D ioctl(fd[0], PERF_EVENT_IOC_MODIFY_ATTRIBUTES, &attr_mod); TEST_ASSERT_VAL("failed to modify wp\n", ret =3D=3D 0); diff --git a/tools/perf/tests/bp_signal.c b/tools/perf/tests/bp_signal.c index 1f2908f02389..3faeb5b6fe0b 100644 --- a/tools/perf/tests/bp_signal.c +++ b/tools/perf/tests/bp_signal.c @@ -26,6 +26,7 @@ #include "tests.h" #include "debug.h" #include "event.h" +#include "parse-events.h" #include "perf-sys.h" #include "cloexec.h" =20 @@ -111,7 +112,7 @@ static int __event(bool is_x, void *addr, int sig) pe.config =3D 0; pe.bp_type =3D is_x ? HW_BREAKPOINT_X : HW_BREAKPOINT_W; pe.bp_addr =3D (unsigned long) addr; - pe.bp_len =3D sizeof(long); + pe.bp_len =3D is_x ? default_breakpoint_len() : sizeof(long); =20 pe.sample_period =3D 1; pe.sample_type =3D PERF_SAMPLE_IP; diff --git a/tools/perf/tests/bp_signal_overflow.c b/tools/perf/tests/bp_si= gnal_overflow.c index 4e897c2cf26b..ee560e156be6 100644 --- a/tools/perf/tests/bp_signal_overflow.c +++ b/tools/perf/tests/bp_signal_overflow.c @@ -25,6 +25,7 @@ #include "tests.h" #include "debug.h" #include "event.h" +#include "parse-events.h" #include "../perf-sys.h" #include "cloexec.h" =20 @@ -88,7 +89,7 @@ static int test__bp_signal_overflow(struct test_suite *te= st __maybe_unused, int pe.config =3D 0; pe.bp_type =3D HW_BREAKPOINT_X; pe.bp_addr =3D (unsigned long) test_function; - pe.bp_len =3D sizeof(long); + pe.bp_len =3D default_breakpoint_len(); =20 pe.sample_period =3D THRESHOLD; pe.sample_type =3D PERF_SAMPLE_IP; diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index edc2adcf1bae..0681653b12d2 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -5,6 +5,7 @@ #include #include "tests.h" #include "debug.h" +#include "parse-events.h" #include "pmu.h" #include "pmus.h" #include @@ -262,7 +263,7 @@ static int test__checkevent_breakpoint_x(struct evlist = *evlist) TEST_ASSERT_VAL("wrong config", test_config(evsel, 0)); TEST_ASSERT_VAL("wrong bp_type", HW_BREAKPOINT_X =3D=3D evsel->core.attr.bp_type); - TEST_ASSERT_VAL("wrong bp_len", sizeof(long) =3D=3D evsel->core.attr.bp_l= en); + TEST_ASSERT_VAL("wrong bp_len", default_breakpoint_len() =3D=3D (int)evse= l->core.attr.bp_len); return TEST_OK; } =20 diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index fab01ba54e34..dfb951bb184b 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -670,6 +670,11 @@ static int add_tracepoint_multi_sys(struct parse_event= s_state *parse_state, } #endif /* HAVE_LIBTRACEEVENT */ =20 +int default_breakpoint_len(void) +{ + return sizeof(long); +} + static int parse_breakpoint_type(const char *type, struct perf_event_attr *attr) { @@ -728,7 +733,7 @@ int parse_events_add_breakpoint(struct parse_events_sta= te *parse_state, /* Provide some defaults if len is not specified */ if (!len) { if (attr.bp_type =3D=3D HW_BREAKPOINT_X) - len =3D sizeof(long); + len =3D default_breakpoint_len(); else len =3D HW_BREAKPOINT_LEN_4; } diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index b735cd9e0acf..f79d076cd1bd 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -286,4 +286,6 @@ static inline bool is_sdt_event(char *str __maybe_unuse= d) } #endif /* HAVE_LIBELF_SUPPORT */ =20 +int default_breakpoint_len(void); + #endif /* __PERF_PARSE_EVENTS_H */ --=20 2.46.0.469.g59c65b2a67-goog From nobody Sun Feb 8 23:23:01 2026 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 73BEF178398 for ; Sat, 31 Aug 2024 07:04:38 +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=1725087879; cv=none; b=ahBFw/XpxzzQDGVmpML7ykbgiwy2ZyrR/Afc2Hb9xRcPC4N0zwYoYZOeUfa+pJQayl6uNLABwXyt6lNorOyjQw32Cu+Z9l9tmHd0SEPbamtLX66I3RykHSHtEePHqFSvBgaGDR5otIMMv0tvqbjeWPF7Fj3ENQjeOdr1sW7SFfA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725087879; c=relaxed/simple; bh=neE8KUj5swSBbTAvkEmb7HlGQpVC/JyPFNunQxVwu/U=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=DK2u6Mw7mjkOlucFn5zC7z3oGL0NlpFb22GA+TUauLrI16SW9DwDLg/gVPoHR5c6S4HFRC8bbnmCnwnwB+gp5QH3c8QQhJAT6qtIDYRGPdf0Z+zQtXUUfe+B+cITrxvff3UewXlTTojyc5QMjRCvUBPfOH+zCpUxIkkPgo5LWM4= 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=bTYqouWs; 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="bTYqouWs" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e1a6d328eacso3653589276.3 for ; Sat, 31 Aug 2024 00:04:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725087877; x=1725692677; 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=hMHouUPm/pUbpqXHpAwu3f/Ggg/o8qY6+an2XmPnD00=; b=bTYqouWsvhPu/wRbjJDDrLM9vx9g9U/ljPv/SCltgoZKaAKi9laHtmCY+8CDdKyD4q XHWJirKM6rruYrjRN21+5Hspl5xvaj3LBov1vfCJf56i5mXwFtqS+7occ5upO0oS23N8 mvz3bQ8eORRS44ip3EGyxG6JCTYBMshOkeYeiVLPEIcdOy6xAGDI0K7hTFCQVeBEuNcG i6OEMlglaoj3p1jmRuPGkA4bwYnHmICnib5Qit2pr4VkY9onSo0EIxDwzFa0F48cyTKc kKFN6MGYqVpDChUF2O1i0P1dN27rTISoK8kNH2JMXXh6w+zHA91chg2V0Sdjp/t0KwhY Efhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725087877; x=1725692677; 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=hMHouUPm/pUbpqXHpAwu3f/Ggg/o8qY6+an2XmPnD00=; b=rKsD8daAFZJ7hQoXSZ1nXXpM+iMK9rbC7QHuXBER5lVFlQYHlYcLPVf2tR6n4kjrO2 galbXN5hsvxAonoeTJ0wwHiIbQfFcaeY/ytSxoSeDBcQYWq5x0DrJQls8+CjeEsIdcT+ euuAhxmvyGcfdEZA82EYXVaaU/DTC8C+GvcoEQdM4XNQE4OGkcVf5Ktia0TtryEIjU1R KURcOF9CCJK9Wt8RjTKWaaHrIGD8CpWUewjz+C0HAzdrQkjvvDqDdCr4dUU/6VBdZC7d 848SpwW5lTYyxuXMwybSldrN/lF+Dh+K9yEoInFCySNVnwVvaFOmBA44kHd5gyz+mRHl BZ5w== X-Forwarded-Encrypted: i=1; AJvYcCW+8Gljxlj8GjlfYsdg5KmDFif003lMqbgu012+WwVRK8kLxNMSaA/xXWyHs8GZe2Q81r5h87bwjZvbsXo=@vger.kernel.org X-Gm-Message-State: AOJu0Yzkz9OSseWHqBs/xeCwxfvsei1HsfaqvWcutdkKo2HSiVzW/zZY 7n7+ZGrWhAh/7RkZmJ0NmZSvc2MkBqCW27MosLFdVfj6g6pDaUvfswxSDojbr6DJfzurCRZAQCI zRR961w== X-Google-Smtp-Source: AGHT+IEQRxwFyMDSw6Mj2d4DGqVL/glGW1ecwaCsu3ve2y6MdyDP3o6KRg8tCHoQeSLhIeD+/Ar8hkGrgI+x X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:4974:82ff:2f9:edb6]) (user=irogers job=sendgmr) by 2002:a5b:1:0:b0:e0e:8b26:484e with SMTP id 3f1490d57ef6-e1a7a176b02mr7463276.8.1725087877533; Sat, 31 Aug 2024 00:04:37 -0700 (PDT) Date: Sat, 31 Aug 2024 00:04:14 -0700 In-Reply-To: <20240831070415.506194-1-irogers@google.com> Message-Id: <20240831070415.506194-6-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240831070415.506194-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Subject: [PATCH v1 5/6] perf parse-events: Vary default_breakpoint_len on i386 and arm64 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 , Dominique Martinet , Yang Jihong , Colin Ian King , Chaitanya S Prakash , "Masami Hiramatsu (Google)" , James Clark , John Garry , Junhao He , David Ahern , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On arm64 the breakpoint length should be 4-bytes but 8-bytes is tolerated as perf passes that as sizeof(long). Just pass the correct value. On i386 the sizeof(long) check in the kernel needs to match the kernel's long size. Check using an environment (uname checks) whether 4 or 8 bytes needs to be passed. Cache the value in a static. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index dfb951bb184b..c7fe8b4167d7 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -8,6 +8,7 @@ #include #include #include "term.h" +#include "env.h" #include "evlist.h" #include "evsel.h" #include @@ -672,7 +673,22 @@ static int add_tracepoint_multi_sys(struct parse_event= s_state *parse_state, =20 int default_breakpoint_len(void) { +#if defined(__i386__) + static int len; + + if (len =3D=3D 0) { + struct perf_env env =3D {}; + + perf_env__init(&env); + len =3D perf_env__kernel_is_64_bit(&env) ? sizeof(u64) : sizeof(long); + perf_env__exit(&env); + } + return len; +#elif defined(__aarch64__) + return 4; +#else return sizeof(long); +#endif } =20 static int --=20 2.46.0.469.g59c65b2a67-goog From nobody Sun Feb 8 23:23:01 2026 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 CC89517B4E2 for ; Sat, 31 Aug 2024 07:04:40 +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=1725087882; cv=none; b=YjvsVjzQdVhs7/raFFv13MK628vxqCFecuNIK441oTwscaWrJvO7i/dtNbUow10AyOlvNIQOnBwsyaS8w9K8wBS26Pjv3DXOoRTCfAM81cU7HFy0PnGP1CojCG8sKHnTxi0tL3CxrR7wvoK7nAVg4ngEcnuRacXp5yHnCLEJ9aI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725087882; c=relaxed/simple; bh=Zzp47YpjJrlq/7aNuFnEG/sx74AzSK2oA4jiAlYD1m4=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=VolgSsTr29KupfMoGRD/zG1cjphz0maLU++ZdLhhFcPZinuQ+vRRsp7FlFuZF7UpHPjzxbibH6YlEc3V4k+K6XOeYemCtJTjqhhBg5hoi0TffGzBONah+xi5s5/8mJkrBPe0McvNk+bad25IbLhbsg4Pru6cxTzlMv884cMwB1A= 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=YXeqqu1/; 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="YXeqqu1/" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6d4daca4a4bso12685047b3.0 for ; Sat, 31 Aug 2024 00:04:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725087880; x=1725692680; 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=J5+jy8suatSYU8agZ+1zFUqOrIedBbY+ji9A0DmCUwg=; b=YXeqqu1/T7EB5q0Xc87ElZRffeI9/OqXF2z6+sv10twgx0LlS2FzfyLNqAb7runij4 LU/YsVB9jIQMI/tG5y8ZR/OjQWwJaue32N12goBcQxD82fTCF8hrv5a/3u4oGfnSIqoU yS6Yp4B/hKjft/JeJbQiAdetOLqgTqJ6IVz+/i1VOexTsqs4KCm/iXv3w7HXWKJVAzqo E4K/yNQy559qDdX6BkXYGBZyy/5lJSFR9FI4NU6vdWYpxyRFgoUWzvu1nQvrO/B5RspJ /KSM9ehFLRqMx2z8vD+rONSrlz6hUc0nGkFBcIsjtCJ3k4cK0WlKcrEeq7vj+PXaL4Kf WD7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725087880; x=1725692680; 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=J5+jy8suatSYU8agZ+1zFUqOrIedBbY+ji9A0DmCUwg=; b=YtYPdcpcTzMACjaBfL3SoxGTjur1HyzdOTT02rNa0Pa/bM9oSD0p3AzPVcv+n9BJ8j SsRLyozbKzC1C7Gwum50IV33J0SzD7XqyorB55TfY75rKwDyqOeIGf/QPrR5shyPAQVl KpAwWlmCq9W+1tkz9eDHwZPPmy1zrWCF8fv/braAzAr7OTEZc3kZV1B6R0qPAv36VIQU uRQnRFVIwukD3HEZ5PPYj2A45ZrU91oHL6e4yfObU1s61SJtTfrRGz/RqwowxJgBdRQ8 Jwgksg73JtzK4vJ/LoiXXL3+seKCuwmSUvgntxUy20v+OwWo+6goz8d6ms/E94/szaLv V+JQ== X-Forwarded-Encrypted: i=1; AJvYcCVEWNx0Xw3YPSl+jEDjP/FAtt1FuceqCSU/4ms960wbfXWAv7cMH8K9XRW8XE8AgCLNnwvYAFCDM2lbVFY=@vger.kernel.org X-Gm-Message-State: AOJu0YzHApzYwxCMBLFrdluDXdyrLULBj2xCeyHdMS93GOSdn+nUbKKU 0Ti9eyKr+pEgUVh01jFHRMHjSoGijNcWyEK+jbxwcVKJ1R389Z4aXpDHPBtpGNl//zipC4XimKO Cv54BIA== X-Google-Smtp-Source: AGHT+IG1XD+JUjlCpgglYclPZZLQJ4BWz+jqR+qm5DgB0ka+M75PUfqNm5Cwbhc6EFTAGgHWlo8uxtzePXRt X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:4974:82ff:2f9:edb6]) (user=irogers job=sendgmr) by 2002:a05:6902:281:b0:e11:757f:30af with SMTP id 3f1490d57ef6-e1a5c85d46amr83900276.3.1725087879809; Sat, 31 Aug 2024 00:04:39 -0700 (PDT) Date: Sat, 31 Aug 2024 00:04:15 -0700 In-Reply-To: <20240831070415.506194-1-irogers@google.com> Message-Id: <20240831070415.506194-7-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240831070415.506194-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Subject: [PATCH v1 6/6] perf test: Make watchpoint data 32-bits on i386 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 , Dominique Martinet , Yang Jihong , Colin Ian King , Chaitanya S Prakash , "Masami Hiramatsu (Google)" , James Clark , John Garry , Junhao He , David Ahern , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" i386 only supports watchpoints up to size 4, 8 bytes causes extra counts and test failures. Signed-off-by: Ian Rogers --- tools/perf/tests/wp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/perf/tests/wp.c b/tools/perf/tests/wp.c index cc8719609b19..6c178985e37f 100644 --- a/tools/perf/tests/wp.c +++ b/tools/perf/tests/wp.c @@ -20,7 +20,12 @@ do { \ TEST_ASSERT_VAL(text, count =3D=3D val); \ } while (0) =20 +#ifdef __i386__ +/* Only breakpoint length less-than 8 has hardware support on i386. */ +volatile u32 data1; +#else volatile u64 data1; +#endif volatile u8 data2[3]; =20 #ifndef __s390x__ --=20 2.46.0.469.g59c65b2a67-goog