From nobody Fri Dec 19 02:49:56 2025 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 58450140E5B for ; Mon, 29 Apr 2024 20:02:41 +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=1714420962; cv=none; b=tG7+C54oHUl6a2W9+8ssNhVD6uKrVATGrUnASsQInFxkSwTBuqp2qjNNsFeL8ps2Uud2Vbs0R8jWuMgo0j3PKV/WpAsB+DoDJDEt0M1Q7bDiIcW03v7rXacl38DWSWUwCBJLnoyFeYssqPGxfR9UwCbdhz7YiDavzGzaItzh+qc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714420962; c=relaxed/simple; bh=BSADm/2St2RzD/ArABRW7n8F/sOX5AJupKxZq1RwerQ=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=eCN9tShDrxSC5ZgMwpxpjluSJj1BfJZG9r81xAOK03G0mJMblOlKEb/ZvJsnVT9n9HpMrbpFaCN9RZYGlQEFk1H6nHeu/kJ84/qecu1D39jEIVQKiVFttuEkEIU1iQLxputJc8qU6ToaqazT1oTdOUbCZxMvpQfhAvgExktL7MA= 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=ZPQgllPT; 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="ZPQgllPT" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-61ab7fc5651so80163597b3.2 for ; Mon, 29 Apr 2024 13:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1714420960; x=1715025760; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=guh8O4YIfp8ysMStU/pCY+FOTLUwi/avvI0eH709Ct4=; b=ZPQgllPTC/vbo1pVkLD4y00ol4uFZnbh5Em2UtlY/ze3LdVrouLU5YCzzsceDGsj2h mkjYO+h2FXSMMMceXEXlXRh1T7P7Q/186F846yl+o8ES7c1VMYgH2us8uhBjc1iqK9x4 mpwgdbrMEE2GoVtPAf8Yzzd6CzvJeZh2zdih2iNnXrwYvGoeXJeouMLcypw7BQwCed6x h2jBG2q2BkWE6shYN0rteXgSYScH0IfduRwLqqUScB6gY2MHdFVHXvlZS1lc0Aosm2Qv dx+/CNxw8W2pYyCqaJfdku7egmjMUmFpLDVh9jTa+EwzmQ0zw0a1uhZMXeCCg06yAOuY Mwhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714420960; x=1715025760; h=cc: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=guh8O4YIfp8ysMStU/pCY+FOTLUwi/avvI0eH709Ct4=; b=s5DKXya/7LX5Bxz3LqAF5nb2Zb4zpxtSN2yTH+MpqB793n0ybFoN4uqwCc5BdzZKI0 m0pYdniLcvBv5xYuFiPVuCMtuh63Ahd9hRBzjFTHrsSc0bKQbWoVcNhicIoe6xWSjqOW m0aamsuqLirxbKCqy2D3ccmiHKNT5dnWBXvSUXlSoMdCQJS4uDlod4uYzpfmhCRZ4Juf JSQuGD54m+/qcslSN4Ry9BS4V1r8sOLpwVwum9Xf4338IBZhYSS5JpE0dJMLpApFNGpS aV6sboss87nOm0DZo+wvx41ak7vWNx+v8zzr5DPaxJDIoEa/mQYDvtqK/dzsqaafb9+E UP8A== X-Forwarded-Encrypted: i=1; AJvYcCW3X7FPOwPw1652UyDUYKX7rNoBMikr9zTdVzkxqiDPs4jZrrxLpgcZo3hL4FyNWqRG8eOPtO2Q+CeGTTrdhQlPXcngkf0/B+2rWSi8 X-Gm-Message-State: AOJu0Yyz+SfqozI180bhgnBrka/WtRE/OFyjiBK0zwkf5y3gQR5I2nt0 Giue0krDNtHhg9aFmJ5XE7N6qHGCPwt/8svaUHPnab2ke7XMOo4ueOgzXjgGHob+Ac1eieWhAdo +z1fq0g== X-Google-Smtp-Source: AGHT+IHsWxlUWy6g/QWt0+iDzcjMhkg6SD3jd20yeYftef7GWrhyIwD1a8Pu4G93AtwEugDgPe8iE8WWE4kS X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:c137:aa10:25e1:8f1e]) (user=irogers job=sendgmr) by 2002:a81:91d5:0:b0:61b:7dd6:1b24 with SMTP id i204-20020a8191d5000000b0061b7dd61b24mr3035436ywg.8.1714420960342; Mon, 29 Apr 2024 13:02:40 -0700 (PDT) Date: Mon, 29 Apr 2024 13:02:20 -0700 In-Reply-To: <20240429200225.1271876-1-irogers@google.com> Message-Id: <20240429200225.1271876-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: <20240429200225.1271876-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Subject: [PATCH v3 1/6] perf test pmu-events: Make it clearer that pmu-events tests json events From: Ian Rogers To: Kan Liang , Thomas Richter , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Bjorn Helgaas , Jonathan Corbet , Randy Dunlap , Jing Zhang , James Clark , Ravi Bangoria , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Ian Rogers Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add json to the test name. Signed-off-by: Ian Rogers --- tools/perf/tests/pmu-events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index 47a7c3277540..7b2c34462fcb 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -1105,6 +1105,6 @@ static struct test_case pmu_events_tests[] =3D { }; =20 struct test_suite suite__pmu_events =3D { - .desc =3D "PMU events", + .desc =3D "PMU json event tests", .test_cases =3D pmu_events_tests, }; --=20 2.44.0.769.g3c40516874-goog From nobody Fri Dec 19 02:49:56 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 D57371420C8 for ; Mon, 29 Apr 2024 20:02:43 +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=1714420965; cv=none; b=Cvs2yj1LvLMn7JOz0GmTjb8k1n/7JO+ydb9ORUodoP1W37O6OtoZm5uY4Sb0ZQOD7y2/1nJp/742DC77UfIB96zEL0YQ8xdD2dOZknGx3XtE0K3NSVSyJMjR0L+/zevWGpKsnKCrh3X3ljMCl6Hg/xanSubqLJWsUXUtKBvxXNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714420965; c=relaxed/simple; bh=r6Q0nzWd1ZDsObAExwG1cgxL3ocuqsKb/0LPlEHr6oo=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=L0Yb6u5ABQfMbDvcwsLw5362jnbKoV5DpxyL6PAqz4WDiagScZdb7BbC8jDitNpDGJHLuIEgnCyGgwqu2IgRpAjyHcgrnz4TPC1GTbj6zAdTzbN1hTy/xvTaWIDSK7N6pQif71vgQfvcu0JuNornDNsTp3LO2BakdzBuud8kjz0= 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=ovhFGgAX; 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="ovhFGgAX" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-de5a8638579so5807653276.1 for ; Mon, 29 Apr 2024 13:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1714420963; x=1715025763; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=PG3MsFbzKXuMYVhzdetV6dfQOniDDSPTL8GyKyGGWq0=; b=ovhFGgAX6TmrLu2MF3CS/BJ0x3w+AdBj1m/zWBec2ruFTX1dXO4KnoA+pwOzYoWhmS DF5YSp4VFwW/FmgBbREGuLN0fsFahJPpBINbOnFEo0AMeOt+Hpez2STWWp2lhOWNU18D wpjaDMvwyrgdDwbrEXMVEIFNh5fLbn7R2ZHmUIzbolPY6uYFgpfKFX9UA5rskDIoJguq pkKuXUQrIMR3dU3RlQ+fmj6CdHtUWOuzVx5HBV7lk6mO5A9W0xt5UqeIOhFw5YWBPjP+ SOnhGvXxyI4dTx6q7KCmjMymXiUiObvMu+UAzUarLdnnZ7Ks1v9PktLxiwd+C9H32Eyo LNOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714420963; x=1715025763; h=cc: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=PG3MsFbzKXuMYVhzdetV6dfQOniDDSPTL8GyKyGGWq0=; b=pwCvt1XQ3UD/VvDI/8WDL0OsWaUp9smbt0i8+J+vXWo0J+8ZVV2mFfEJ6ZUdZmrebD rWYg3pJGfojbAGn/+QwyQ4MEgSM6ZbatIVUj4Lr7fonPV7oBwn9f5Kt9AwZL8T9LFZXs 3lGBifm7E8in0jEk7pXmQKaq1FC1VId7ZK9QlyFh5M72t6mzOThRadDYoaMYA2/gICoQ L61YUXz9ntr0rqPFiymiCJgyyY2qQ6j2hyVfMzhP0wi7w/Al8wflVywV3lM6eXDPkmkY qX7vBpAynrGerh82dAz4Sjx+MGrOGOak3ApULY93/zKluYO1S1YrPjn2ZkNRPIUteFTh tyoA== X-Forwarded-Encrypted: i=1; AJvYcCWHrclO3co2TXm9A8B7V8+xLNTCsweeOntDic7JkjHXFdPdqu/EHpbXEjT4Zeyg5EtqZ0LhgygNscXO3fgaSDS5wfSNu2nEJtRN3qg9 X-Gm-Message-State: AOJu0Yw/OevF541lrsyCcwnMXeRn6VyZmj1a7ggXYCAsTNITjmxR9750 bIFWJ9LYKb8EvgKdMO1FCeSeMD7LXbP+ssEIawGGlb4SMoHzWHeNjfl3uVS493k3WzC1usiHnjc 8/Foz2g== X-Google-Smtp-Source: AGHT+IH7v18SP6SyNvViyH58YP8Uh+9qXPeg/EpSjD89cxZN5TRvsLnjH+Am76ywHnuHqGFQl4RUJD7Y7rZS X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:c137:aa10:25e1:8f1e]) (user=irogers job=sendgmr) by 2002:a25:ea44:0:b0:de5:53f2:f614 with SMTP id o4-20020a25ea44000000b00de553f2f614mr66567ybe.12.1714420962772; Mon, 29 Apr 2024 13:02:42 -0700 (PDT) Date: Mon, 29 Apr 2024 13:02:21 -0700 In-Reply-To: <20240429200225.1271876-1-irogers@google.com> Message-Id: <20240429200225.1271876-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: <20240429200225.1271876-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Subject: [PATCH v3 2/6] perf Document: Sysfs event names must be lower or upper case From: Ian Rogers To: Kan Liang , Thomas Richter , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Bjorn Helgaas , Jonathan Corbet , Randy Dunlap , Jing Zhang , James Clark , Ravi Bangoria , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Ian Rogers Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To avoid directory scans in perf it is going to be assumed that sysfs event names are either lower or upper case. Signed-off-by: Ian Rogers --- .../ABI/testing/sysfs-bus-event_source-devices-events | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-event_source-devices-event= s b/Documentation/ABI/testing/sysfs-bus-event_source-devices-events index 77de58d03822..e7efeab2ee83 100644 --- a/Documentation/ABI/testing/sysfs-bus-event_source-devices-events +++ b/Documentation/ABI/testing/sysfs-bus-event_source-devices-events @@ -37,6 +37,12 @@ Description: Per-pmu performance monitoring events speci= fic to the running syste performance monitoring event supported by the . The name of the file is the name of the event. =20 + As performance monitoring event names are case + insensitive in the perf tool, the perf tool only looks + for lower or upper case event names in sysfs to avoid + scanning the directory. It is therefore required the + name of the event here is either lower or upper case. + File contents: =20 [=3D][,[=3D]]... --=20 2.44.0.769.g3c40516874-goog From nobody Fri Dec 19 02:49:56 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 229B9142918 for ; Mon, 29 Apr 2024 20:02:45 +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=1714420968; cv=none; b=d6JmvD/FyUv3S0nRta6IPMfWlvfoa5S1NiwLUrgK4Ivp4ErGfKNcUBgNNBZaOVO/d1zGYQPTvSEi0PXTXVzGIFDDS1LMIvb4f44K0jOCKU2V0m5nj3HUlltVL8ISd4Ryg/AwKb2eiTxz/G9HMUUmZZZy+hiPD6ouaJQ4dZpiwdc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714420968; c=relaxed/simple; bh=bL+CEVIuMHM6/EZqz8M8ze1hB99CYHuHVp10aMF6Yrc=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=XaERvyFQvYVlvk8QKKpDwE5k9cYs7f9UhzovpTfensqNX4aK0QxZF2CtSCcLgh4wkrgju9D70ej4ce6J1/JbDm20SXOfKgZ6gn3IxOPGTrT/EhaPmgxaSXxFH4x6//WKwGSBlpM1UEh7/QSPow4OzyIWE3ixed8ZCpCCNf9ewIU= 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=yWRrFGv9; 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="yWRrFGv9" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6b269686aso8256367276.1 for ; Mon, 29 Apr 2024 13:02:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1714420965; x=1715025765; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=LZc68CqXR23Y4cUvZ/vVDOpzr1zCrNIUIjTcFw/Q9Gc=; b=yWRrFGv9QB7iJ+/wrFMjwruEMbfGT1Yz9TQe7ZSG6NVrOzR/KrNEwIj668XJ5OopgR JS7cty+3xYkpCzLwmB6ea3BNHeo8n+Z6o6QNqNGIxLVzzM9Vsp9X/FaP5TfDXo+wS5dO 4tmb2XKHICQiEQhLpAlis5NUoCxpZUBfDetGQ7jm+NGYJrhbGVNvczkdbJQ2qI5iIKMG qy0frO8gJ+rsiBpct9frtOxM9lKzJpMOW4JFGspGfFG3PqOrwIsykxILi3fyXTGFPKne RGFFcxhU43cqoXb5ule1iiz1ScNKigsyQC9sasDAb8lN7EVxKHPmz8O8nrz0Bn1foh5N /k5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714420965; x=1715025765; h=cc: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=LZc68CqXR23Y4cUvZ/vVDOpzr1zCrNIUIjTcFw/Q9Gc=; b=qeKAZ1FqdAbDNl/iW59ZADwHt95VSc+kbH9Gpc/LmYv6YA20+lQD+XbNyyHOyEJtzv zYls4h3+grGeC/MS00TnS6w2uZHns0pv0tdJlYuSsqkCkP9bb7Py/R9fek23LKz5J7yd aIOB2BwPBfoZU/QgyQOpou3/h4q2qAw7qcxoRdd+zVT8+BVdW8K5iJLIfg5alejgGniU L7Gju7B5GTjSyb/iDxkdySi16xEwJIYhkURDNzhpETgGRNY67fEdSvPYmyDHGx5zo7y/ muJ3gbQSNuxXQe8NaL36xcYlx18OBZ2nhDlmDnPwt8jwxPrUyhkFWMGTqxbQzcFaffpQ Ym2A== X-Forwarded-Encrypted: i=1; AJvYcCVSN4HekLaa5jmDZwaHrHUj+mqv6GAiK7d+kpCBj+3rqmxtVmkKJboF6LQZ16V/tXbyG+BEjymgf/tkHYWB+ZOMfbMc/QD43zBmacY0 X-Gm-Message-State: AOJu0YzjiwoqOxam3wZa0wyUivhxILO0NrSvGiqY3wPBZJAQ/UoFxHbw 2aGxj2dXZqdlrJIzNymmRul4KU/BXey9xH6XQPJYS5Cmfo9kIoBr7m2ItZj97Vtx6e1wwscI67q szImQTA== X-Google-Smtp-Source: AGHT+IGjW9AtZ8NnggWp3/16TUrBowzkO+iTko+o5HexhD5829WU76shCjPvrXbYhhZ1cQ56teCkG91SSgfS X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:c137:aa10:25e1:8f1e]) (user=irogers job=sendgmr) by 2002:a05:6902:1244:b0:de5:60b6:fb9 with SMTP id t4-20020a056902124400b00de560b60fb9mr781099ybu.1.1714420965108; Mon, 29 Apr 2024 13:02:45 -0700 (PDT) Date: Mon, 29 Apr 2024 13:02:22 -0700 In-Reply-To: <20240429200225.1271876-1-irogers@google.com> Message-Id: <20240429200225.1271876-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: <20240429200225.1271876-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Subject: [PATCH v3 3/6] perf test pmu: Refactor format test and exposed test APIs From: Ian Rogers To: Kan Liang , Thomas Richter , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Bjorn Helgaas , Jonathan Corbet , Randy Dunlap , Jing Zhang , James Clark , Ravi Bangoria , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Ian Rogers Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In tests/pmu.c, make a common utility that creates a PMU in mkdtemp directory and uses regular PMU parsing logic to load that PMU. Formats must still be eagerly loaded as by default the PMU code assumes devices are going to be in sysfs. In util/pmu.[ch], hide perf_pmu__format_parse but add the eager argument to perf_pmu__lookup called by perf_pmus__add_test_pmu. Later patches will eagerly load other non-sysfs files when eager loading is enabled. In tests/pmu.c, rather than manually constructing a list of term arguments, just use the term parsing code from a string. Add more comments and debug logging. Signed-off-by: Ian Rogers --- tools/perf/tests/pmu.c | 313 +++++++++++++++------------------ tools/perf/util/parse-events.c | 2 +- tools/perf/util/parse-events.h | 2 +- tools/perf/util/pmu.c | 11 +- tools/perf/util/pmu.h | 4 +- tools/perf/util/pmus.c | 16 +- tools/perf/util/pmus.h | 2 + 7 files changed, 171 insertions(+), 179 deletions(-) diff --git a/tools/perf/tests/pmu.c b/tools/perf/tests/pmu.c index 8f18127d876a..6b2d9adcc583 100644 --- a/tools/perf/tests/pmu.c +++ b/tools/perf/tests/pmu.c @@ -2,203 +2,180 @@ #include "parse-events.h" #include "pmu.h" #include "tests.h" +#include "debug.h" #include #include #include -#include -#include -#include - -/* Simulated format definitions. */ -static struct test_format { - const char *name; - const char *value; -} test_formats[] =3D { - { "krava01", "config:0-1,62-63\n", }, - { "krava02", "config:10-17\n", }, - { "krava03", "config:5\n", }, - { "krava11", "config1:0,2,4,6,8,20-28\n", }, - { "krava12", "config1:63\n", }, - { "krava13", "config1:45-47\n", }, - { "krava21", "config2:0-3,10-13,20-23,30-33,40-43,50-53,60-63\n", }, - { "krava22", "config2:8,18,48,58\n", }, - { "krava23", "config2:28-29,38\n", }, -}; +#include +#include +#include =20 -/* Simulated users input. */ -static struct parse_events_term test_terms[] =3D { - { - .config =3D "krava01", - .val.num =3D 15, - .type_val =3D PARSE_EVENTS__TERM_TYPE_NUM, - .type_term =3D PARSE_EVENTS__TERM_TYPE_USER, - }, - { - .config =3D "krava02", - .val.num =3D 170, - .type_val =3D PARSE_EVENTS__TERM_TYPE_NUM, - .type_term =3D PARSE_EVENTS__TERM_TYPE_USER, - }, - { - .config =3D "krava03", - .val.num =3D 1, - .type_val =3D PARSE_EVENTS__TERM_TYPE_NUM, - .type_term =3D PARSE_EVENTS__TERM_TYPE_USER, - }, - { - .config =3D "krava11", - .val.num =3D 27, - .type_val =3D PARSE_EVENTS__TERM_TYPE_NUM, - .type_term =3D PARSE_EVENTS__TERM_TYPE_USER, - }, - { - .config =3D "krava12", - .val.num =3D 1, - .type_val =3D PARSE_EVENTS__TERM_TYPE_NUM, - .type_term =3D PARSE_EVENTS__TERM_TYPE_USER, - }, - { - .config =3D "krava13", - .val.num =3D 2, - .type_val =3D PARSE_EVENTS__TERM_TYPE_NUM, - .type_term =3D PARSE_EVENTS__TERM_TYPE_USER, - }, - { - .config =3D "krava21", - .val.num =3D 119, - .type_val =3D PARSE_EVENTS__TERM_TYPE_NUM, - .type_term =3D PARSE_EVENTS__TERM_TYPE_USER, - }, - { - .config =3D "krava22", - .val.num =3D 11, - .type_val =3D PARSE_EVENTS__TERM_TYPE_NUM, - .type_term =3D PARSE_EVENTS__TERM_TYPE_USER, - }, - { - .config =3D "krava23", - .val.num =3D 2, - .type_val =3D PARSE_EVENTS__TERM_TYPE_NUM, - .type_term =3D PARSE_EVENTS__TERM_TYPE_USER, - }, -}; +/* Fake PMUs created in temp directory. */ +static LIST_HEAD(test_pmus); =20 -/* - * Prepare format directory data, exported by kernel - * at /sys/bus/event_source/devices//format. - */ -static char *test_format_dir_get(char *dir, size_t sz) -{ - unsigned int i; - - snprintf(dir, sz, "/tmp/perf-pmu-test-format-XXXXXX"); - if (!mkdtemp(dir)) - return NULL; - - for (i =3D 0; i < ARRAY_SIZE(test_formats); i++) { - char name[PATH_MAX]; - struct test_format *format =3D &test_formats[i]; - FILE *file; - - scnprintf(name, PATH_MAX, "%s/%s", dir, format->name); - - file =3D fopen(name, "w"); - if (!file) - return NULL; - - if (1 !=3D fwrite(format->value, strlen(format->value), 1, file)) - break; - - fclose(file); - } - - return dir; -} - -/* Cleanup format directory. */ -static int test_format_dir_put(char *dir) +/* Cleanup test PMU directory. */ +static int test_pmu_put(const char *dir, struct perf_pmu *pmu) { char buf[PATH_MAX + 20]; + int ret; =20 - snprintf(buf, sizeof(buf), "rm -f %s/*\n", dir); - if (system(buf)) - return -1; + if (scnprintf(buf, sizeof(buf), "rm -fr %s", dir) < 0) { + pr_err("Failure to set up buffer for \"%s\"\n", dir); + return -EINVAL; + } + ret =3D system(buf); + if (ret) + pr_err("Failure to \"%s\"\n", buf); =20 - snprintf(buf, sizeof(buf), "rmdir %s\n", dir); - return system(buf); + list_del(&pmu->list); + perf_pmu__delete(pmu); + return ret; } =20 -static void add_test_terms(struct parse_events_terms *terms) +/* + * Prepare test PMU directory data, normally exported by kernel at + * /sys/bus/event_source/devices//. Give as input a buffer to hold th= e file + * path, the result is PMU loaded using that directory. + */ +static struct perf_pmu *test_pmu_get(char *dir, size_t sz) { - unsigned int i; + /* Simulated format definitions. */ + const struct test_format { + const char *name; + const char *value; + } test_formats[] =3D { + { "krava01", "config:0-1,62-63\n", }, + { "krava02", "config:10-17\n", }, + { "krava03", "config:5\n", }, + { "krava11", "config1:0,2,4,6,8,20-28\n", }, + { "krava12", "config1:63\n", }, + { "krava13", "config1:45-47\n", }, + { "krava21", "config2:0-3,10-13,20-23,30-33,40-43,50-53,60-63\n", }, + { "krava22", "config2:8,18,48,58\n", }, + { "krava23", "config2:28-29,38\n", }, + }; + char name[PATH_MAX]; + int dirfd, file; + struct perf_pmu *pmu =3D NULL; + + /* Create equivalent of sysfs mount point. */ + scnprintf(dir, sz, "/tmp/perf-pmu-test-XXXXXX"); + if (!mkdtemp(dir)) { + pr_err("mkdtemp failed\n"); + dir[0] =3D '\0'; + return NULL; + } + dirfd =3D open(dir, O_DIRECTORY); + if (dirfd < 0) { + pr_err("Failed to open test directory \"%s\"\n", dir); + goto err_out; + } =20 - for (i =3D 0; i < ARRAY_SIZE(test_terms); i++) { - struct parse_events_term *clone; + /* Create the test PMU directory and give it a perf_event_attr type numbe= r. */ + if (mkdirat(dirfd, "perf-pmu-test", 0755) < 0) { + pr_err("Failed to mkdir PMU directory\n"); + goto err_out; + } + file =3D openat(dirfd, "perf-pmu-test/type", O_WRONLY | O_CREAT, 0600); + if (!file) { + pr_err("Failed to open for writing file \"type\"\n"); + goto err_out; + } + write(file, "9999\n", 5); + close(file); =20 - parse_events_term__clone(&clone, &test_terms[i]); - list_add_tail(&clone->list, &terms->terms); + /* Create format directory and files. */ + if (mkdirat(dirfd, "perf-pmu-test/format", 0755) < 0) { + pr_err("Failed to mkdir PMU format directory\n)"); + goto err_out; } + for (size_t i =3D 0; i < ARRAY_SIZE(test_formats); i++) { + const struct test_format *format =3D &test_formats[i]; + + if (scnprintf(name, PATH_MAX, "perf-pmu-test/format/%s", format->name) <= 0) { + pr_err("Failure to set up path for \"%s\"\n", format->name); + goto err_out; + } + file =3D openat(dirfd, name, O_WRONLY | O_CREAT, 0600); + if (!file) { + pr_err("Failed to open for writing file \"%s\"\n", name); + goto err_out; + } + + if (write(file, format->value, strlen(format->value)) < 0) { + pr_err("Failed to write to file \"%s\"\n", name); + close(file); + goto err_out; + } + close(file); + } + + /* Make the PMU reading the files created above. */ + pmu =3D perf_pmus__add_test_pmu(dirfd, "perf-pmu-test"); + if (!pmu) + pr_err("Test PMU creation failed\n"); + +err_out: + if (!pmu) + test_pmu_put(dir, pmu); + if (dirfd >=3D 0) + close(dirfd); + return pmu; } =20 -static int test__pmu(struct test_suite *test __maybe_unused, int subtest _= _maybe_unused) +static int test__pmu_format(struct test_suite *test __maybe_unused, int su= btest __maybe_unused) { char dir[PATH_MAX]; - char *format; - struct parse_events_terms terms; struct perf_event_attr attr; - struct perf_pmu *pmu; - int fd; - int ret; + struct parse_events_terms terms; + int ret =3D TEST_FAIL; + struct perf_pmu *pmu =3D test_pmu_get(dir, sizeof(dir)); =20 - parse_events_terms__init(&terms); - add_test_terms(&terms); - pmu =3D zalloc(sizeof(*pmu)); - if (!pmu) { - parse_events_terms__exit(&terms); - return -ENOMEM; - } + if (!pmu) + return TEST_FAIL; =20 - INIT_LIST_HEAD(&pmu->format); - INIT_LIST_HEAD(&pmu->aliases); - INIT_LIST_HEAD(&pmu->caps); - format =3D test_format_dir_get(dir, sizeof(dir)); - if (!format) { - free(pmu); - parse_events_terms__exit(&terms); - return -EINVAL; + parse_events_terms__init(&terms); + if (parse_events_terms(&terms, + "krava01=3D15,krava02=3D170,krava03=3D1,krava11=3D27,krava12=3D1," + "krava13=3D2,krava21=3D119,krava22=3D11,krava23=3D2", + NULL)) { + pr_err("Term parsing failed\n"); + goto err_out; } =20 memset(&attr, 0, sizeof(attr)); - - fd =3D open(format, O_DIRECTORY); - if (fd < 0) { - ret =3D fd; - goto out; + ret =3D perf_pmu__config_terms(pmu, &attr, &terms, /*zero=3D*/false, /*er= r=3D*/NULL); + if (ret) { + pr_err("perf_pmu__config_terms failed"); + goto err_out; } =20 - pmu->name =3D strdup("perf-pmu-test"); - ret =3D perf_pmu__format_parse(pmu, fd, /*eager_load=3D*/true); - if (ret) - goto out; + if (attr.config !=3D 0xc00000000002a823) { + pr_err("Unexpected config value %llx\n", attr.config); + goto err_out; + } + if (attr.config1 !=3D 0x8000400000000145) { + pr_err("Unexpected config1 value %llx\n", attr.config1); + goto err_out; + } + if (attr.config2 !=3D 0x0400000020041d07) { + pr_err("Unexpected config2 value %llx\n", attr.config2); + goto err_out; + } =20 - ret =3D perf_pmu__config_terms(pmu, &attr, &terms, /*zero=3D*/false, /*er= r=3D*/NULL); - if (ret) - goto out; - - ret =3D -EINVAL; - if (attr.config !=3D 0xc00000000002a823) - goto out; - if (attr.config1 !=3D 0x8000400000000145) - goto out; - if (attr.config2 !=3D 0x0400000020041d07) - goto out; - - ret =3D 0; -out: - test_format_dir_put(format); - perf_pmu__delete(pmu); + ret =3D TEST_OK; +err_out: parse_events_terms__exit(&terms); + test_pmu_put(dir, pmu); return ret; } =20 -DEFINE_SUITE("Parse perf pmu format", pmu); +static struct test_case tests__pmu[] =3D { + TEST_CASE("Parsing with PMU format directory", pmu_format), + { .name =3D NULL, } +}; + +struct test_suite suite__pmu =3D { + .desc =3D "Sysfs PMU tests", + .test_cases =3D tests__pmu, +}; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 0f308b4db2b9..2b9ede311c31 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -2585,7 +2585,7 @@ int parse_events_term__term(struct parse_events_term = **term, } =20 int parse_events_term__clone(struct parse_events_term **new, - struct parse_events_term *term) + const struct parse_events_term *term) { char *str; struct parse_events_term temp =3D *term; diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 5695308efab9..e7ac1f13376d 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -178,7 +178,7 @@ int parse_events_term__term(struct parse_events_term **= term, enum parse_events__term_type term_rhs, void *loc_term, void *loc_val); int parse_events_term__clone(struct parse_events_term **new, - struct parse_events_term *term); + const struct parse_events_term *term); void parse_events_term__delete(struct parse_events_term *term); =20 void parse_events_terms__delete(struct parse_events_terms *terms); diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 74dd5bd49d9a..fbbc535ed93f 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -182,7 +182,7 @@ static void perf_pmu_format__load(const struct perf_pmu= *pmu, struct perf_pmu_fo * Parse & process all the sysfs attributes located under * the directory specified in 'dir' parameter. */ -int perf_pmu__format_parse(struct perf_pmu *pmu, int dirfd, bool eager_loa= d) +static int perf_pmu__format_parse(struct perf_pmu *pmu, int dirfd, bool ea= ger_load) { struct dirent *evt_ent; DIR *format_dir; @@ -232,7 +232,7 @@ int perf_pmu__format_parse(struct perf_pmu *pmu, int di= rfd, bool eager_load) * located at: * /sys/bus/event_source/devices//format as sysfs group attributes. */ -static int pmu_format(struct perf_pmu *pmu, int dirfd, const char *name) +static int pmu_format(struct perf_pmu *pmu, int dirfd, const char *name, b= ool eager_load) { int fd; =20 @@ -241,7 +241,7 @@ static int pmu_format(struct perf_pmu *pmu, int dirfd, = const char *name) return 0; =20 /* it'll close the fd */ - if (perf_pmu__format_parse(pmu, fd, /*eager_load=3D*/false)) + if (perf_pmu__format_parse(pmu, fd, eager_load)) return -1; =20 return 0; @@ -994,7 +994,8 @@ perf_pmu__arch_init(struct perf_pmu *pmu) pmu->mem_events =3D perf_mem_events; } =20 -struct perf_pmu *perf_pmu__lookup(struct list_head *pmus, int dirfd, const= char *name) +struct perf_pmu *perf_pmu__lookup(struct list_head *pmus, int dirfd, const= char *name, + bool eager_load) { struct perf_pmu *pmu; __u32 type; @@ -1023,7 +1024,7 @@ struct perf_pmu *perf_pmu__lookup(struct list_head *p= mus, int dirfd, const char * type value and format definitions. Load both right * now. */ - if (pmu_format(pmu, dirfd, name)) + if (pmu_format(pmu, dirfd, name, eager_load)) goto err; =20 pmu->is_core =3D is_pmu_core(name); diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 93d03bd3ecbe..561716aa2b25 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -214,7 +214,6 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct = parse_events_terms *head_ struct parse_events_error *err); int perf_pmu__find_event(struct perf_pmu *pmu, const char *event, void *st= ate, pmu_event_callback cb); =20 -int perf_pmu__format_parse(struct perf_pmu *pmu, int dirfd, bool eager_loa= d); void perf_pmu_format__set_value(void *format, int config, unsigned long *b= its); bool perf_pmu__has_format(const struct perf_pmu *pmu, const char *name); int perf_pmu__for_each_format(struct perf_pmu *pmu, void *state, pmu_forma= t_callback cb); @@ -272,7 +271,8 @@ int perf_pmu__pathname_scnprintf(char *buf, size_t size, int perf_pmu__event_source_devices_fd(void); int perf_pmu__pathname_fd(int dirfd, const char *pmu_name, const char *fil= ename, int flags); =20 -struct perf_pmu *perf_pmu__lookup(struct list_head *pmus, int dirfd, const= char *lookup_name); +struct perf_pmu *perf_pmu__lookup(struct list_head *pmus, int dirfd, const= char *lookup_name, + bool eager_load); struct perf_pmu *perf_pmu__create_placeholder_core_pmu(struct list_head *c= ore_pmus); void perf_pmu__delete(struct perf_pmu *pmu); struct perf_pmu *perf_pmus__find_core_pmu(void); diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index 2fd369e45832..b9b4c5eb5002 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -124,7 +124,8 @@ struct perf_pmu *perf_pmus__find(const char *name) return NULL; =20 dirfd =3D perf_pmu__event_source_devices_fd(); - pmu =3D perf_pmu__lookup(core_pmu ? &core_pmus : &other_pmus, dirfd, name= ); + pmu =3D perf_pmu__lookup(core_pmu ? &core_pmus : &other_pmus, dirfd, name, + /*eager_load=3D*/false); close(dirfd); =20 if (!pmu) { @@ -159,7 +160,8 @@ static struct perf_pmu *perf_pmu__find2(int dirfd, cons= t char *name) if (core_pmu && read_sysfs_core_pmus) return NULL; =20 - return perf_pmu__lookup(core_pmu ? &core_pmus : &other_pmus, dirfd, name); + return perf_pmu__lookup(core_pmu ? &core_pmus : &other_pmus, dirfd, name, + /*eager_load=3D*/false); } =20 static int pmus_cmp(void *priv __maybe_unused, @@ -696,3 +698,13 @@ struct perf_pmu *perf_pmus__find_core_pmu(void) { return perf_pmus__scan_core(NULL); } + +struct perf_pmu *perf_pmus__add_test_pmu(int test_sysfs_dirfd, const char = *name) +{ + /* + * Some PMU functions read from the sysfs mount point, so care is + * needed, hence passing the eager_load flag to load things like the + * format files. + */ + return perf_pmu__lookup(&other_pmus, test_sysfs_dirfd, name, /*eager_load= =3D*/true); +} diff --git a/tools/perf/util/pmus.h b/tools/perf/util/pmus.h index eec599d8aebd..9d4ded80b8e9 100644 --- a/tools/perf/util/pmus.h +++ b/tools/perf/util/pmus.h @@ -24,4 +24,6 @@ int perf_pmus__num_core_pmus(void); bool perf_pmus__supports_extended_type(void); char *perf_pmus__default_pmu_name(void); =20 +struct perf_pmu *perf_pmus__add_test_pmu(int test_sysfs_dirfd, const char = *name); + #endif /* __PMUS_H */ --=20 2.44.0.769.g3c40516874-goog From nobody Fri Dec 19 02:49:56 2025 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 6B2931442F1 for ; Mon, 29 Apr 2024 20:02:48 +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=1714420971; cv=none; b=q6zdVsAtzo4JUE2mbRcbWQn0k4fhmrBsFrB5TJMf8PbJxkXoyM51veBKmXE/i3PGTlk7hOOpj3SP31i9rlbc0NCJXcQp6K/au+0CR3XO/5WWI9HU/DE21nzrqIpp2kO0ZE2VfXZgCzksVAbx+OFahksQGlQtXjIY+y4+BgWlG3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714420971; c=relaxed/simple; bh=aRErZOQOc1AuWz2ngvFgWDEadxLuk0Lya9jNtJdY5UI=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=jB3SGndFRoqHO/RQcy57Eu+fBiKAgMxpHDHGc6dF6PYAGFaIEZBI4TAXN/EEvfB1iDUbWcOivxB7u9IjjHD3c/Nvjkbqeqcj/5+S7Ii2xLDZTEdHrFayodpPMrskyEdcKQiE7NJSteeaVXi7YzVBdiTb41oXUW7P8CmOaqRsu10= 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=1RZeqV08; 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="1RZeqV08" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-61be25000a4so12527817b3.2 for ; Mon, 29 Apr 2024 13:02:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1714420967; x=1715025767; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=f0Izv2KGLy9LH7rwwW2cK7zl7UVJXq8kwesOPOZwgM4=; b=1RZeqV08XEnWpeEX1zsKERylGvZkCE8veSbijs0ITQpTSiKJBumn2Tvw+Ria/v6U8g A+7kZooTT9gFItLBqv6laTnAuZXRqGT/JisUrtnJlzDvX3HVua9aIuZM30NEqFHQ2l/C E72dIPjZiJYfQgmYkB8gI+EL3dVrzYsT1R8b+kycW8ydfTHlpxnGHOyPsoZVTCYwc1PI BW7RSthGfYPbZOBmm3vTbuXWCKHdKY0xGInCdlBQ80WNNNyC/wja2uPcVrYRSUy1MSyZ srwe2Tbc/E/fWCbtxfy9Tbm1dHNHIY9/1KYnSz6MYZR90QLXCv9SVBPg0qZuDig+JcY9 63zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714420967; x=1715025767; h=cc: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=f0Izv2KGLy9LH7rwwW2cK7zl7UVJXq8kwesOPOZwgM4=; b=NyxjyeevBc/D32i4ybWxe9Z6B5SzenGqdPYiKTLzigqxdxzNrubuTE4phf9pkHFUzK WpBLOSz7ZnKdwnpMDIT/Yz8GAKbZQVrBLWhjsnXy38/9Ds8X/cQi6zTTJNauAkQoMRzO nh3fdDLSIwumogbViHdeO38gmMyulELJMFeQB8R8cxqJSRFtfeIuAdQrCLxFB8Sr6lat QkiXLMa0WQzUm9eAa9TRlTEM0GcVUYqVyiJzLtv7wZZZJ4IeblOFn0xdC9MF0CyGJ2HW E0EJJtzIeAD/SWfrU0h8jkINuljkTXt6YTuE2hlfVPvCmC9t84wbC+aMkNbRDVL3pUxT 05rA== X-Forwarded-Encrypted: i=1; AJvYcCWP6m+CkTNH97NWLalhO09Xk2jwNuJjvn4OrEFfzpNptY96N0RY414pRDFhV0cUNAyfTpawJIfceIxQb93XXTxL2eLPKaCJY1hrOtrM X-Gm-Message-State: AOJu0Yz+R6OVn98VM0ogACeqv2lKKufAzfU7VmKXIZdJZ0ZR3LK8BDH4 3pMju48fzlKtMHPUM+Cl/o3ks+K319jzzDY8/R3OzNuUW1cgLAf2M94W4S4cyduXo5FSotzO3k9 orJ44Fw== X-Google-Smtp-Source: AGHT+IGJMWLhWjMUa+hrqLexBexqYaIaHFiZOg/MUs3BtautY0bZ2mhRPL1HoHDX/iYWdBtGJmueejTcFCAZ X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:c137:aa10:25e1:8f1e]) (user=irogers job=sendgmr) by 2002:a81:840a:0:b0:61b:e2e7:e127 with SMTP id u10-20020a81840a000000b0061be2e7e127mr349026ywf.1.1714420967496; Mon, 29 Apr 2024 13:02:47 -0700 (PDT) Date: Mon, 29 Apr 2024 13:02:23 -0700 In-Reply-To: <20240429200225.1271876-1-irogers@google.com> Message-Id: <20240429200225.1271876-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: <20240429200225.1271876-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Subject: [PATCH v3 4/6] perf test pmu: Add an eagerly loaded event test From: Ian Rogers To: Kan Liang , Thomas Richter , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Bjorn Helgaas , Jonathan Corbet , Randy Dunlap , Jing Zhang , James Clark , Ravi Bangoria , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Ian Rogers Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Allow events/aliases to be eagerly loaded for a PMU. Factor out the pmu_aliases_parse to allow this. Parse a test event and check it configures the attribute as expected. There is overlap with the parse-events tests, but this test is done with a PMU created in a temp directory and doesn't rely on PMUs in sysfs. Signed-off-by: Ian Rogers --- tools/perf/tests/pmu.c | 72 ++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/pmu.c | 69 ++++++++++++++++++++++++++++------------ 2 files changed, 120 insertions(+), 21 deletions(-) diff --git a/tools/perf/tests/pmu.c b/tools/perf/tests/pmu.c index 6b2d9adcc583..f4e9a39534cb 100644 --- a/tools/perf/tests/pmu.c +++ b/tools/perf/tests/pmu.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 +#include "evlist.h" +#include "evsel.h" #include "parse-events.h" #include "pmu.h" #include "tests.h" @@ -54,6 +56,9 @@ static struct perf_pmu *test_pmu_get(char *dir, size_t sz) { "krava22", "config2:8,18,48,58\n", }, { "krava23", "config2:28-29,38\n", }, }; + const char *test_event =3D "krava01=3D15,krava02=3D170,krava03=3D1,krava1= 1=3D27,krava12=3D1," + "krava13=3D2,krava21=3D119,krava22=3D11,krava23=3D2\n"; + char name[PATH_MAX]; int dirfd, file; struct perf_pmu *pmu =3D NULL; @@ -110,6 +115,19 @@ static struct perf_pmu *test_pmu_get(char *dir, size_t= sz) close(file); } =20 + /* Create test event. */ + if (mkdirat(dirfd, "perf-pmu-test/events", 0755) < 0) { + pr_err("Failed to mkdir PMU events directory\n"); + goto err_out; + } + file =3D openat(dirfd, "perf-pmu-test/events/test-event", O_WRONLY | O_CR= EAT, 0600); + if (!file) { + pr_err("Failed to open for writing file \"type\"\n"); + goto err_out; + } + write(file, test_event, strlen(test_event)); + close(file); + /* Make the PMU reading the files created above. */ pmu =3D perf_pmus__add_test_pmu(dirfd, "perf-pmu-test"); if (!pmu) @@ -170,8 +188,62 @@ static int test__pmu_format(struct test_suite *test __= maybe_unused, int subtest return ret; } =20 +static int test__pmu_events(struct test_suite *test __maybe_unused, int su= btest __maybe_unused) +{ + char dir[PATH_MAX]; + struct parse_events_error err; + struct evlist *evlist; + struct evsel *evsel; + struct perf_event_attr *attr; + int ret; + struct perf_pmu *pmu =3D test_pmu_get(dir, sizeof(dir)); + const char *event =3D "perf-pmu-test/test-event/"; + + + if (!pmu) + return TEST_FAIL; + + evlist =3D evlist__new(); + if (evlist =3D=3D NULL) { + pr_err("Failed allocation"); + goto err_out; + } + parse_events_error__init(&err); + ret =3D parse_events(evlist, event, &err); + if (ret) { + pr_debug("failed to parse event '%s', err %d\n", event, ret); + parse_events_error__print(&err, event); + ret =3D TEST_FAIL; + if (parse_events_error__contains(&err, "can't access trace events")) + ret =3D TEST_SKIP; + goto err_out; + } + evsel =3D evlist__first(evlist); + attr =3D &evsel->core.attr; + if (attr->config !=3D 0xc00000000002a823) { + pr_err("Unexpected config value %llx\n", attr->config); + goto err_out; + } + if (attr->config1 !=3D 0x8000400000000145) { + pr_err("Unexpected config1 value %llx\n", attr->config1); + goto err_out; + } + if (attr->config2 !=3D 0x0400000020041d07) { + pr_err("Unexpected config2 value %llx\n", attr->config2); + goto err_out; + } + + ret =3D TEST_OK; +err_out: + parse_events_error__exit(&err); + evlist__delete(evlist); + test_pmu_put(dir, pmu); + return ret; +} + static struct test_case tests__pmu[] =3D { TEST_CASE("Parsing with PMU format directory", pmu_format), + TEST_CASE("Parsing with PMU event", pmu_events), { .name =3D NULL, } }; =20 diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index fbbc535ed93f..7849be4bfea1 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -597,33 +597,18 @@ static inline bool pmu_alias_info_file(const char *na= me) * Reading the pmu event aliases definition, which should be located at: * /sys/bus/event_source/devices//events as sysfs group attributes. */ -static int pmu_aliases_parse(struct perf_pmu *pmu) +static int __pmu_aliases_parse(struct perf_pmu *pmu, int events_dir_fd) { - char path[PATH_MAX]; struct dirent *evt_ent; DIR *event_dir; - size_t len; - int fd, dir_fd; =20 - len =3D perf_pmu__event_source_devices_scnprintf(path, sizeof(path)); - if (!len) - return 0; - scnprintf(path + len, sizeof(path) - len, "%s/events", pmu->name); - - dir_fd =3D open(path, O_DIRECTORY); - if (dir_fd =3D=3D -1) { - pmu->sysfs_aliases_loaded =3D true; - return 0; - } - - event_dir =3D fdopendir(dir_fd); - if (!event_dir){ - close (dir_fd); + event_dir =3D fdopendir(events_dir_fd); + if (!event_dir) return -EINVAL; - } =20 while ((evt_ent =3D readdir(event_dir))) { char *name =3D evt_ent->d_name; + int fd; FILE *file; =20 if (!strcmp(name, ".") || !strcmp(name, "..")) @@ -635,7 +620,7 @@ static int pmu_aliases_parse(struct perf_pmu *pmu) if (pmu_alias_info_file(name)) continue; =20 - fd =3D openat(dir_fd, name, O_RDONLY); + fd =3D openat(events_dir_fd, name, O_RDONLY); if (fd =3D=3D -1) { pr_debug("Cannot open %s\n", name); continue; @@ -653,11 +638,50 @@ static int pmu_aliases_parse(struct perf_pmu *pmu) } =20 closedir(event_dir); - close (dir_fd); pmu->sysfs_aliases_loaded =3D true; return 0; } =20 +static int pmu_aliases_parse(struct perf_pmu *pmu) +{ + char path[PATH_MAX]; + size_t len; + int events_dir_fd, ret; + + if (pmu->sysfs_aliases_loaded) + return 0; + + len =3D perf_pmu__event_source_devices_scnprintf(path, sizeof(path)); + if (!len) + return 0; + scnprintf(path + len, sizeof(path) - len, "%s/events", pmu->name); + + events_dir_fd =3D open(path, O_DIRECTORY); + if (events_dir_fd =3D=3D -1) { + pmu->sysfs_aliases_loaded =3D true; + return 0; + } + ret =3D __pmu_aliases_parse(pmu, events_dir_fd); + close(events_dir_fd); + return ret; +} + +static int pmu_aliases_parse_eager(struct perf_pmu *pmu, int sysfs_fd) +{ + char path[FILENAME_MAX + 7]; + int ret, events_dir_fd; + + scnprintf(path, sizeof(path), "%s/events", pmu->name); + events_dir_fd =3D openat(sysfs_fd, path, O_DIRECTORY, 0); + if (events_dir_fd =3D=3D -1) { + pmu->sysfs_aliases_loaded =3D true; + return 0; + } + ret =3D __pmu_aliases_parse(pmu, events_dir_fd); + close(events_dir_fd); + return ret; +} + static int pmu_alias_terms(struct perf_pmu_alias *alias, int err_loc, stru= ct list_head *terms) { struct parse_events_term *term, *cloned; @@ -1042,6 +1066,9 @@ struct perf_pmu *perf_pmu__lookup(struct list_head *p= mus, int dirfd, const char =20 perf_pmu__arch_init(pmu); =20 + if (eager_load) + pmu_aliases_parse_eager(pmu, dirfd); + return pmu; err: zfree(&pmu->name); --=20 2.44.0.769.g3c40516874-goog From nobody Fri Dec 19 02:49:56 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 EA14E14534F for ; Mon, 29 Apr 2024 20:02: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=1714420972; cv=none; b=H6Rt/mc8wexJiSuneyylNutT5FNU8UXSstQBes6DL4SnOzZgZpz07Hx4rx2Bm6ddll1qNcSZCupwNDpVp9lr2DgeXdaTBRCIjE0q8vaqIRzc/cpOV+2RJzIc1vb2gGqpXfPWCB1hzx9ctukli11bltOci/ZK69UgkPY+9Wnib5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714420972; c=relaxed/simple; bh=i7OIixObrBK6wLYTL3j3asD5BAu4/Nn0mVDSiF2+fSc=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=FnHsJ5BYyrecNw0A/Q5jBpqVgvbcMgU+F0GpS33cuADX18nuav6vwTA732d3/tTPoxFmCNOo121be2lJ99EgWU/BNVY82w72h3gGDvh2RIr1vPMOIiBOqWkadwQfk6kYEmsTvtm6T3Jv3j63wazfXp/bsT6rAMFRcJEVt7ruIBc= 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=yEPD+lg1; 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="yEPD+lg1" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc64f63d768so9610377276.2 for ; Mon, 29 Apr 2024 13:02:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1714420970; x=1715025770; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ST8QMxONeyaCSSADxQ7gE/hk81EFR0HpWu5Q0a0nK/c=; b=yEPD+lg1F8kAXPEHKQXsDxPiGfRIUfBtyRYk6hB4/RNhsCLah894gvZkIoGHTcKFne HMDKe0afvrfPxOlXy+6WyHaQyv9WiVUpe3n6m9crGN2qrs+UDZakugsQlfRl3JZQFITT RRiputSmbYhlJmBXDrrE6o00j+oP1EUNkTRU+LWH4riYVnDqPS5viKUeZwpNn75BgBbP GX7vGYRkpG/5nAij/4bsMSp2vY/QEY3Zlfk4CyLKTwTNznWRvTupyKYxwxEKkOEHP7a0 abo7IQdD9hc56EbYiT46tTse5aIhXmZUGHspLCGKWfdtQjCHCk3J6PsXg1u1ZEvpkvAF Gtww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714420970; x=1715025770; h=cc: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=ST8QMxONeyaCSSADxQ7gE/hk81EFR0HpWu5Q0a0nK/c=; b=F8g5PSGhTyKhHiBEs7gdZCiUZFqHILdn00lvxY/4BiLLitdzPueM2a2WcTNKykp4ZC CfV7hb5T0mCs/IDFrPWsZR4F3bfoEhJ683e0Pov43ZSFpRrrdk9hOSjSTpERqZ2ivkii LQfM8xZRttHYHUdqco0pFyswvF/yZAQIJVoTgJampagCQl/2VjWREWChkcuBCsKu14sx cv9/Iw9m6NyyqgO7L2qinGpDFCx0RdvdZY1NPd+Cg2aUS1Urg9cALenrF9GTAtwn+ryp q+QCww7fhgQ4Cpte1Tb7d3TYlSVxW1LwYXAtl5viOe28sFjFP9WoViAQVVvxenH8RxXA 1HNg== X-Forwarded-Encrypted: i=1; AJvYcCW/AdKbuw9vde+r/iMJl7YD2gJtR4/NJdgTQzjHkqP58oIcJvCmYnRXXabFRbh151i/KBMNPOfYyvJNfHAufOqC2Aia2yJ2KT+GzZVt X-Gm-Message-State: AOJu0YysRs/8Az93KSKtmlDyOxUoVgOC5W8TH6Wir64ls+eN4EQncaDH TbOhqxmRDy74XS155cACSj2vQ2n2HJDeo+drFglWu7kM/K/02jtPnkFwAkXKnbbhhwP01xTll4+ OMGLElw== X-Google-Smtp-Source: AGHT+IEdshl6jAfPfpA6iqxesOkw60DMf+W+01LOHg9JXbD7BDh8K4GQj/MJappVF0/dTW7wyFQ/T3jqlrO2 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:c137:aa10:25e1:8f1e]) (user=irogers job=sendgmr) by 2002:a05:6902:18ca:b0:dcc:c57c:8873 with SMTP id ck10-20020a05690218ca00b00dccc57c8873mr3789929ybb.9.1714420969922; Mon, 29 Apr 2024 13:02:49 -0700 (PDT) Date: Mon, 29 Apr 2024 13:02:24 -0700 In-Reply-To: <20240429200225.1271876-1-irogers@google.com> Message-Id: <20240429200225.1271876-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: <20240429200225.1271876-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Subject: [PATCH v3 5/6] perf test pmu: Test all sysfs PMU event names are the same case From: Ian Rogers To: Kan Liang , Thomas Richter , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Bjorn Helgaas , Jonathan Corbet , Randy Dunlap , Jing Zhang , James Clark , Ravi Bangoria , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Ian Rogers Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Being either lower or upper case means event name probes can avoid scanning the directory doing case insensitive comparisons, just the lower or upper case version of the name can be checked for existence. For the majority of PMUs event names are all lower case, upper case names are present on S390. Signed-off-by: Ian Rogers --- tools/perf/tests/pmu.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/tools/perf/tests/pmu.c b/tools/perf/tests/pmu.c index f4e9a39534cb..ea21b4db10e1 100644 --- a/tools/perf/tests/pmu.c +++ b/tools/perf/tests/pmu.c @@ -5,12 +5,17 @@ #include "pmu.h" #include "tests.h" #include "debug.h" +#include "fncache.h" +#include +#include +#include #include #include #include #include #include #include +#include =20 /* Fake PMUs created in temp directory. */ static LIST_HEAD(test_pmus); @@ -241,9 +246,94 @@ static int test__pmu_events(struct test_suite *test __= maybe_unused, int subtest return ret; } =20 +static bool permitted_event_name(const char *name) +{ + bool has_lower =3D false, has_upper =3D false; + + for (size_t i =3D 0; i < strlen(name); i++) { + char c =3D name[i]; + + if (islower(c)) { + if (has_upper) + return false; + has_lower =3D true; + continue; + } + if (isupper(c)) { + if (has_lower) + return false; + has_upper =3D true; + continue; + } + if (!isdigit(c) && c !=3D '.' && c !=3D '_' && c !=3D '-') + return false; + } + return true; +} + +static int test__pmu_event_names(struct test_suite *test __maybe_unused, + int subtest __maybe_unused) +{ + char path[PATH_MAX]; + DIR *pmu_dir, *event_dir; + struct dirent *pmu_dent, *event_dent; + const char *sysfs =3D sysfs__mountpoint(); + int ret =3D TEST_OK; + + if (!sysfs) { + pr_err("Sysfs not mounted\n"); + return TEST_FAIL; + } + + snprintf(path, sizeof(path), "%s/bus/event_source/devices/", sysfs); + pmu_dir =3D opendir(path); + if (!pmu_dir) { + pr_err("Error opening \"%s\"\n", path); + return TEST_FAIL; + } + while ((pmu_dent =3D readdir(pmu_dir))) { + if (!strcmp(pmu_dent->d_name, ".") || + !strcmp(pmu_dent->d_name, "..")) + continue; + + snprintf(path, sizeof(path), "%s/bus/event_source/devices/%s/type", + sysfs, pmu_dent->d_name); + + /* Does it look like a PMU? */ + if (!file_available(path)) + continue; + + /* Process events. */ + snprintf(path, sizeof(path), "%s/bus/event_source/devices/%s/events", + sysfs, pmu_dent->d_name); + + event_dir =3D opendir(path); + if (!event_dir) { + pr_debug("Skipping as no event directory \"%s\"\n", path); + continue; + } + while ((event_dent =3D readdir(event_dir))) { + const char *event_name =3D event_dent->d_name; + + if (!strcmp(event_name, ".") || !strcmp(event_name, "..")) + continue; + + if (!permitted_event_name(event_name)) { + pr_err("Invalid sysfs event name: %s/%s\n", + pmu_dent->d_name, event_name); + ret =3D TEST_FAIL; + } + } + closedir(event_dir); + } + closedir(pmu_dir); + return ret; +} + static struct test_case tests__pmu[] =3D { TEST_CASE("Parsing with PMU format directory", pmu_format), TEST_CASE("Parsing with PMU event", pmu_events), + TEST_CASE("PMU event names", pmu_event_names), { .name =3D NULL, } }; =20 --=20 2.44.0.769.g3c40516874-goog From nobody Fri Dec 19 02:49:56 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 349F6146A6C for ; Mon, 29 Apr 2024 20:02:53 +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=1714420974; cv=none; b=Ygs3wdRihx8WZYCH15/iC0YLcxYbp7zo5SgbG6Cowf2aj3MuLnXIxVzLULIFk7bjKZKcfkDObTBzMkgjKnBCcqjMR1g1GGMJr9UH7iqkb3CHNMb/3J5PheOICapOd1Te5BjUv/UjoX+Grcr1i+dqNtyI/S0hIGsMZbDbWl4U6WQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714420974; c=relaxed/simple; bh=Unxtsgv9pMjovJEC2q3+izNqU1jvDayjR6yTMLvqpEc=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=moXajjcXs9n8rOTtf4PxYt7sa4ptDoAlPd3734yCWCWLjwqfYSddTPWppcOoHvaDlTprTmFqplgY+lFaylB6Ci8EcPZnJQtv2erh6Umiz4UiFlzKcgsF1a7klalFOJzBx3tRwv29O/ygd2mZVeLRpYqNL9G5WNxtxNBq1oVdqRg= 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=jyCg1iCF; 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="jyCg1iCF" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-61be8f9ca09so859037b3.2 for ; Mon, 29 Apr 2024 13:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1714420972; x=1715025772; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=sNfu8Xy7Q56dzltFDRS+tQNs0guv+YCXtYt4P68p4eQ=; b=jyCg1iCFJC+rXZABCEfXaVW54lDhrlfHLxgtPNayFNAElh35jD4CicQSUVjvwxxwl4 7Nbnf+OuApgqu5OOKhG6tofS9aQzeCunz6LtIKf6Ax5tMcND6u3Fod7WWakMrRqEPVL4 JxDSneHO6ag2Od98jzvwC+SYt+Ho9DJihTnOBSckGcN4lMf1Aw1WcV6u4jx9nCynECqB t8eQ1R7YI5ck6oqijst4wG7mJYk0seEqLMuBlDojwq72OiAoWx9iinCibGhocNH1FvpN m8jmFj2ap3Hs/zCPcWoG7+acebLS0NzZSDmkq/c27moeDWXkKz6D7IyfbNmbCSZ3sOLo r4yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714420972; x=1715025772; h=cc: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=sNfu8Xy7Q56dzltFDRS+tQNs0guv+YCXtYt4P68p4eQ=; b=Kyb/V1fDVMCUCz7JQn8UG+7OV+mr26RO3tVAm/zkM2NcpMD6zG1bgDeuEfo4FGI16F 8/Iu987AZBMmN9yhSaf2N1obf47jgzvlIiqBViprg0RnOlY/s5j6e4zbonWxJu/M82C3 dXBGVTKNsHMgrpLUVTdQo1VJFTS6iRXiTKjYxkJs65WYe2PDO25y9aemmafn8VCc4ZRV 1fpIZ7Cl1ubLN6NyGe0lC6KOks4EoAUNpAHDfRbe8ViiHbRT0/2aueR/9DOU+ZOJpeMl MvgNR5doDw6K25UPNF5isNMqGV7ZwsB9zfUDIf+i+DcDR0626UiEpvWMSyN4KNDB29+z z8qw== X-Forwarded-Encrypted: i=1; AJvYcCV8B0kALuFhwBdieHIRkDnw3aSRSoo6oqOxl3TkU6NdNTMim0M55jQaTU8tpJc+m9SRNuXO44fE2KQKsBIQ+nxJdI3GTBQUJFugBlY3 X-Gm-Message-State: AOJu0YzR7jT8O7+rzE02oFMjVbURZKQUv3JzzorGw1EsAWipQG27esi7 +sJKbsp4IQnz9WFbSlPhDhYBex9lL0lqblkh7Hc7nBt05HkHLJe4xchIzxniUiZpktMqph087bZ 9kD5AJg== X-Google-Smtp-Source: AGHT+IGsVhZGsNjKtERvwq/fiWI1kJ9TCPCN8BzaO5p7q3MXouSFdqmTCi5SbWmF4ilVx8kgfLeJYQulq5YF X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:c137:aa10:25e1:8f1e]) (user=irogers job=sendgmr) by 2002:a0d:dd81:0:b0:618:9007:a15d with SMTP id g123-20020a0ddd81000000b006189007a15dmr3201802ywe.9.1714420972132; Mon, 29 Apr 2024 13:02:52 -0700 (PDT) Date: Mon, 29 Apr 2024 13:02:25 -0700 In-Reply-To: <20240429200225.1271876-1-irogers@google.com> Message-Id: <20240429200225.1271876-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: <20240429200225.1271876-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Subject: [PATCH v3 6/6] perf pmu: Assume sysfs events are always the same case From: Ian Rogers To: Kan Liang , Thomas Richter , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Bjorn Helgaas , Jonathan Corbet , Randy Dunlap , Jing Zhang , James Clark , Ravi Bangoria , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Ian Rogers Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Perf event names aren't case sensitive. For sysfs events the entire directory of events is read then iterated comparing names in a case insensitive way, most often to see if an event is present. Consider: $ perf stat -e inst_retired.any true The event inst_retired.any may be present in any PMU, so every PMU's sysfs events are loaded and then searched with strcasecmp to see if any match. This event is only present on the cpu PMU as a json event so a lot of events were loaded from sysfs unnecessarily just to prove an event didn't exist there. This change avoids loading all the events by assuming sysfs event names are always either lower or uppercase. It uses file exists and only loads the events when the desired event is present. For the example above, the number of openat calls measured by perf trace on a tigerlake laptop goes from 325 down to 255. The reduction will be larger for machines with many PMUs, particularly replicated uncore PMUs. Ensure pmu_aliases_parse is called before all uses of the aliases list, but remove some "pmu->sysfs_aliases_loaded" tests as they are now part of the function. Signed-off-by: Ian Rogers --- tools/perf/util/pmu.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 7849be4bfea1..7275076e6d83 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -425,9 +425,30 @@ static struct perf_pmu_alias *perf_pmu__find_alias(str= uct perf_pmu *pmu, { struct perf_pmu_alias *alias; =20 - if (load && !pmu->sysfs_aliases_loaded) - pmu_aliases_parse(pmu); + if (load && !pmu->sysfs_aliases_loaded) { + bool has_sysfs_event; + char event_file_name[FILENAME_MAX + 8]; =20 + /* + * Test if alias/event 'name' exists in the PMU's sysfs/events + * directory. If not skip parsing the sysfs aliases. Syfs event + * name must be all lower or all upper case. + */ + scnprintf(event_file_name, sizeof(event_file_name), "events/%s", name); + for (size_t i =3D 7, n =3D 7 + strlen(name); i < n; i++) + event_file_name[i] =3D tolower(event_file_name[i]); + + has_sysfs_event =3D perf_pmu__file_exists(pmu, event_file_name); + if (!has_sysfs_event) { + for (size_t i =3D 7, n =3D 7 + strlen(name); i < n; i++) + event_file_name[i] =3D toupper(event_file_name[i]); + + has_sysfs_event =3D perf_pmu__file_exists(pmu, event_file_name); + } + if (has_sysfs_event) + pmu_aliases_parse(pmu); + + } list_for_each_entry(alias, &pmu->aliases, list) { if (!strcasecmp(alias->name, name)) return alias; @@ -1717,9 +1738,7 @@ size_t perf_pmu__num_events(struct perf_pmu *pmu) { size_t nr; =20 - if (!pmu->sysfs_aliases_loaded) - pmu_aliases_parse(pmu); - + pmu_aliases_parse(pmu); nr =3D pmu->sysfs_aliases; =20 if (pmu->cpu_aliases_added) @@ -1778,6 +1797,7 @@ int perf_pmu__for_each_event(struct perf_pmu *pmu, bo= ol skip_duplicate_pmus, struct strbuf sb; =20 strbuf_init(&sb, /*hint=3D*/ 0); + pmu_aliases_parse(pmu); pmu_add_cpu_aliases(pmu); list_for_each_entry(event, &pmu->aliases, list) { size_t buf_used; @@ -2193,6 +2213,7 @@ const char *perf_pmu__name_from_config(struct perf_pm= u *pmu, u64 config) if (!pmu) return NULL; =20 + pmu_aliases_parse(pmu); pmu_add_cpu_aliases(pmu); list_for_each_entry(event, &pmu->aliases, list) { struct perf_event_attr attr =3D {.config =3D 0,}; --=20 2.44.0.769.g3c40516874-goog