From nobody Thu May 7 17:42:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13CC8C433F5 for ; Mon, 23 May 2022 03:40:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355550AbiEWDke (ORCPT ); Sun, 22 May 2022 23:40:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233183AbiEWDka (ORCPT ); Sun, 22 May 2022 23:40:30 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2070.outbound.protection.outlook.com [40.107.94.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5367036149; Sun, 22 May 2022 20:40:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mubXw6pEwX4xGnnPjbag6HqkvNXiCCei30PRhyJNJ++wfdUfEDCTjMIeNKJAQNRofhZ20GbI/COGynR6n7t/96I7CW0eZs0itxPlODnPvnjW0XqK1nRKIknTZ3b9N8/+3Lw7jfRaMYu2plwh4M6N6hNOXiaobpt4n/AACISlLfsMqyB/PQO23dFLx1z9JuPjNOWLCYgu2xNRguNl5wbHntgFB8pk1egzGccqacybuOsFWpBUdq/uqDYBiN5BA4FQdJLGYrot1ZZn6S0oye4kPUeZmb2x6Y3tU78SfG0geUoPB8haIXIPd5JANLF3rJ/o9UNtdtQy9jSpebV6LkzPLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3/+TlCJY4Q23MjGliKtfPGmGvLJoy7hxKRM4k+bCFcY=; b=L63nBOzS8pa2gHtj2kTWULwBVbsKtkCl+aP4nkepPLh/sz06v3yaRiJeDyaIyfgx1bchkjHxbHYHJQ67c5644mLUblSETFHYXpQmmES2lWWpfhGXnbw7zB8gMeb/zrar5bfiYky5NcjAzjNO3vZU2xHcmhQYlYufOkcXSp3Hx9NknLwkG7ZJQnpxOko9dPXmZA4YFIMWNt0cvyyamQ8qTnRDq475PjyjZ3vyfkusM0mJLnmPbg54nqszkkWaiqzfyBXA3sYD5o8HIsrslUc8NGsnS5eLHPhpUAgzM+meTV0R8UCCI7uMc/2mr8S6gOcIqRC51jo6vzeyGELq9UdzPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3/+TlCJY4Q23MjGliKtfPGmGvLJoy7hxKRM4k+bCFcY=; b=gpod7ihKzVNiS7cJCgnT82mO5oTyrtsZeOTJEx4pvuYn+ctMJYQxcBmDpJ97Kvl5s0WAa+PGt1fGasiygscgc4NNANucNTqj/nQuIgpcITHpcFMLRkinlzTyTdVlg7y3p3Ft8gVC1blJk9QIOcDnUtNutnSpBE/Z3XnDlvwUO48= Received: from DM6PR04CA0004.namprd04.prod.outlook.com (2603:10b6:5:334::9) by DM6PR12MB4878.namprd12.prod.outlook.com (2603:10b6:5:1b8::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Mon, 23 May 2022 03:40:27 +0000 Received: from DM6NAM11FT033.eop-nam11.prod.protection.outlook.com (2603:10b6:5:334:cafe::5f) by DM6PR04CA0004.outlook.office365.com (2603:10b6:5:334::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15 via Frontend Transport; Mon, 23 May 2022 03:40:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT033.mail.protection.outlook.com (10.13.172.221) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Mon, 23 May 2022 03:40:27 +0000 Received: from BLR-5CG113396H.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sun, 22 May 2022 22:40:12 -0500 From: Ravi Bangoria To: CC: , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 1/5] perf record ibs: Warn about sampling period skew Date: Mon, 23 May 2022 09:09:41 +0530 Message-ID: <20220523033945.1612-2-ravi.bangoria@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523033945.1612-1-ravi.bangoria@amd.com> References: <20220523033945.1612-1-ravi.bangoria@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa8d7b16-078f-4f79-117e-08da3c6dfa41 X-MS-TrafficTypeDiagnostic: DM6PR12MB4878:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oP2QKueLPTd5gY8JcIcK+/7c/MbaCgGsHnnv50VQxK11HcPUluGmFAWrtVvzuzs5HBjm8BFe2SZnpuOezVcM1k//EbKAtZmBsxkbgk4jMoIriwMN6uW81oXw9zEhQOmfxvO5aMXHBOXW2e8fVhe5wy/5gbLkGeK1EtuTslX1MPZzu+Clee7hovUjEmcEHzCeD9lZW+tss+wHvTCkTQ5POI4kX5t127yWGHMkqt0+QjDrpNHWiDQEjgejvKGymU9w/xAGiLxrExmliGMKDsQsya8MkQ8KbX2FR0rySeRteFVoHCRHMTn6kzJav7wzFf4sC3CAN24Lco+W2CdIdnZNfwlTwqOQ0ZiOoHMkkMhM3YAwJJg2LhUfpDinV1v6TAqqc1IKW+u2KZyY/rIELa8Qr3S3xtaH8Mqw58PYlI8D1VyuTkVjLwlJoep/eHa6HvSmHkmt5A0ZtoSPrOc29LfUMrd01d/w+igSb66orULHdjTu8kwnQGtJGEVclPmnYgTctvbSdurfNdILz/QnPm3ATkjbd59rThZUWFs2az2+PDOHxGcDkFv1RIWncduLTD9tSO8cmQFTU0HcUwUyRpEC7SkL+1lE6kr2hSUB5jUQMdxt9zmizqupsAVqcA59Z2BZkcZo0wMwuGejAQvdbRdoLLZsawKc/NsmxG8g0HgYCStudel9zpWv0YScbrUqPtZN13tOP2BtkgSMVExQsJz/YA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(7416002)(8676002)(6916009)(316002)(54906003)(5660300002)(70586007)(81166007)(7696005)(44832011)(82310400005)(70206006)(40460700003)(86362001)(6666004)(4326008)(508600001)(356005)(26005)(1076003)(8936002)(426003)(336012)(36860700001)(186003)(83380400001)(16526019)(36756003)(47076005)(2616005)(2906002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 03:40:27.2922 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa8d7b16-078f-4f79-117e-08da3c6dfa41 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT033.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4878 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Samples without an L3 miss are discarded and counter is reset with random value (between 1-15 for fetch pmu and 1-127 for op pmu) when IBS L3 miss filtering is enabled. This causes a sampling period skew but there is no way to reconstruct aggregated sampling period. So print a warning at perf record if user sets l3missonly=3D1. Ex: # perf record -c 10000 -C 0 -e ibs_op/l3missonly=3D1/ WARNING: Hw internally resets sampling period when L3 Miss Filtering is e= nabled and tagged operation does not cause L3 Miss. This causes sampling period = skew. Signed-off-by: Ravi Bangoria Acked-by: Ian Rogers --- tools/perf/arch/x86/util/evsel.c | 50 ++++++++++++++++++++++++++++++++ tools/perf/util/evsel.c | 7 +++++ tools/perf/util/evsel.h | 1 + 3 files changed, 58 insertions(+) diff --git a/tools/perf/arch/x86/util/evsel.c b/tools/perf/arch/x86/util/ev= sel.c index ac2899a25b7a..e8ff4ddb53c9 100644 --- a/tools/perf/arch/x86/util/evsel.c +++ b/tools/perf/arch/x86/util/evsel.c @@ -4,6 +4,8 @@ #include "util/evsel.h" #include "util/env.h" #include "linux/string.h" +#include "util/pmu.h" +#include "util/debug.h" =20 void arch_evsel__set_sample_weight(struct evsel *evsel) { @@ -29,3 +31,51 @@ void arch_evsel__fixup_new_cycles(struct perf_event_attr= *attr) =20 free(env.cpuid); } + +static void ibs_l3miss_warn(void) +{ + pr_warning( +"WARNING: Hw internally resets sampling period when L3 Miss Filtering is e= nabled\n" +"and tagged operation does not cause L3 Miss. This causes sampling period = skew.\n"); +} + +void arch__post_evsel_config(struct evsel *evsel, struct perf_event_attr *= attr) +{ + struct perf_pmu *evsel_pmu, *ibs_fetch_pmu, *ibs_op_pmu; + static int warned_once; + /* 0: Uninitialized, 1: Yes, -1: No */ + static int is_amd; + + if (warned_once || is_amd =3D=3D -1) + return; + + if (!is_amd) { + struct perf_env *env =3D evsel__env(evsel); + + if (!perf_env__cpuid(env) || !env->cpuid || + !strstarts(env->cpuid, "AuthenticAMD")) { + is_amd =3D -1; + return; + } + is_amd =3D 1; + } + + evsel_pmu =3D evsel__find_pmu(evsel); + if (!evsel_pmu) + return; + + ibs_fetch_pmu =3D perf_pmu__find("ibs_fetch"); + ibs_op_pmu =3D perf_pmu__find("ibs_op"); + + if (ibs_fetch_pmu && ibs_fetch_pmu->type =3D=3D evsel_pmu->type) { + if (attr->config & (1ULL << 59)) { + ibs_l3miss_warn(); + warned_once =3D 1; + } + } else if (ibs_op_pmu && ibs_op_pmu->type =3D=3D evsel_pmu->type) { + if (attr->config & (1ULL << 16)) { + ibs_l3miss_warn(); + warned_once =3D 1; + } + } +} diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 2a1729e7aee4..e9be9b94a062 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1064,6 +1064,11 @@ void __weak arch_evsel__fixup_new_cycles(struct perf= _event_attr *attr __maybe_un { } =20 +void __weak arch__post_evsel_config(struct evsel *evsel __maybe_unused, + struct perf_event_attr *attr __maybe_unused) +{ +} + static void evsel__set_default_freq_period(struct record_opts *opts, struct perf_event_attr *attr) { @@ -1339,6 +1344,8 @@ void evsel__config(struct evsel *evsel, struct record= _opts *opts, */ if (evsel__is_dummy_event(evsel)) evsel__reset_sample_bit(evsel, BRANCH_STACK); + + arch__post_evsel_config(evsel, attr); } =20 int evsel__set_filter(struct evsel *evsel, const char *filter) diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 041b42d33bf5..207de5082ee9 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -281,6 +281,7 @@ void evsel__set_sample_id(struct evsel *evsel, bool use= _sample_identifier); =20 void arch_evsel__set_sample_weight(struct evsel *evsel); void arch_evsel__fixup_new_cycles(struct perf_event_attr *attr); +void arch__post_evsel_config(struct evsel *evsel, struct perf_event_attr *= attr); =20 int evsel__set_filter(struct evsel *evsel, const char *filter); int evsel__append_tp_filter(struct evsel *evsel, const char *filter); --=20 2.31.1 From nobody Thu May 7 17:42:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48D49C433F5 for ; Mon, 23 May 2022 03:41:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355593AbiEWDky (ORCPT ); Sun, 22 May 2022 23:40:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355560AbiEWDkn (ORCPT ); Sun, 22 May 2022 23:40:43 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2040.outbound.protection.outlook.com [40.107.243.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78EAE36161; Sun, 22 May 2022 20:40:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZxUFsca+FuFdnpgAKy9oeYbHv153EDsCCc0LosTDsoJXe/HLji+dCN7pHs4tc0wVA/746lUeE0DjoIzoK395rnizLqJvzIoZg5W+fyGJ/jp8Qu2ghrXarg/1eOrOJ294Mz9hpRuL7/PqNWHtRgT6cnNiCCVSMdZdDR3jND6bvq4jC5hTROGCWZWLkL+X/44nR90pIQ1cc9fGWtNi+/Dg0kGCSFQciXk5JLlfRiwluR+Z8C9i5ZnsLRgkCzOXipWXswClGb4zHMXIrqxAIwZcH/voqKLWX/YXmltFq0zFYF9+ku6KTdjkcYnYeUggVswLy43C9+zZlWfBpcxbx+1AIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Lwi3a7cTil1QH+HePJF9UaMi8Zd3BPnGmw0f7QJGCu8=; b=eS7Avt5/9ocGwhFefBC5SSucxfqMpU8mMjFeratVN5n8UInrNFGM0lpUgMW84G4uGh4iqKbgssNBJaSNRqTQ7K4mylsNfr1DjulYosoSyPCizQxD0P+9s8eCuCD5hZO30SKlGA0wTAzQRcF/1xNPKi1iH3ioSKrCE23fWS0SjSApoCsr8RgSq/gAI6yA526ZTya8luG6Aubt6etjB3rBwYvyUCxkkic9OMFqOGHNY0mbFymN/pHTTE0JWCk4yLjcH4BL/Y1+BRZh6rNxWYn24lL9s7bmB1MwuqAVfwsQE+ZL3/N036vim2fRsLm8Pto8R2jLGZ4j6ZfKnjNugBzkxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Lwi3a7cTil1QH+HePJF9UaMi8Zd3BPnGmw0f7QJGCu8=; b=3CEVctU3hM1nJ6GiJOcYnXUrKMvphukhh/wg2Ur/Pjba76e6T3C0djoovmtojoUnHl8W/A9iXHLTLR5GyLrZgA3zo7LAtTZNHDIqCZFgMbILayCk+0zDp7pwYzfrUt1XgGynEGJ0JTiRgb9YPjlr1WuqEUm9tKS41ZRvwVoS3GQ= Received: from DM6PR14CA0043.namprd14.prod.outlook.com (2603:10b6:5:18f::20) by DM4PR12MB6256.namprd12.prod.outlook.com (2603:10b6:8:a3::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 03:40:34 +0000 Received: from DM6NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:5:18f:cafe::14) by DM6PR14CA0043.outlook.office365.com (2603:10b6:5:18f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.20 via Frontend Transport; Mon, 23 May 2022 03:40:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT056.mail.protection.outlook.com (10.13.173.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Mon, 23 May 2022 03:40:34 +0000 Received: from BLR-5CG113396H.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sun, 22 May 2022 22:40:23 -0500 From: Ravi Bangoria To: CC: , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 2/5] perf header: Parse non-cpu pmu capabilities Date: Mon, 23 May 2022 09:09:42 +0530 Message-ID: <20220523033945.1612-3-ravi.bangoria@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523033945.1612-1-ravi.bangoria@amd.com> References: <20220523033945.1612-1-ravi.bangoria@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 11fbd8e1-088e-4b27-4019-08da3c6dfe71 X-MS-TrafficTypeDiagnostic: DM4PR12MB6256:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ngyr3yjBGHlUIu8YRwp5LPmqXKAoherLoYInN49ZV26biBmaLLzRQb91sIbowelqMFeQWgrRepni4YX9Zp7laWM+I585VU/uG8NvR9sfBiKP/l+CkwGmWCzyBQAg8oN6kZzK5oanAVIIWCJE38SXnxDWrVy5Bxe7cupQiKnzl0NHFsj63xck//x3K/u2IO/mremQdXCeHbfrLfgycRIluZcmmKcKmS+vffPUN0JDZqMtwBmDAML3RHq7u32I+reirYMaqyRDHavym8jk6azdUiV6nTEhXvwf0f+p0JroSHTDpBhUIJbIVl9EwxnyHoZHcmLV3flJqOA65oHl3uLbRBJOGuRhExgkgocaFvT3hlehveaadJQz8mZGscB/h4Kww4iomx8+K4Z1mJiZjlYE9ytK/PDPp3EagLD5cyGElizDqP1Vqx67S5oSNpa47ZQclQ+YdhwAKN8w4z4y3aAFlOTA1qtuwGKsqp6GuE+W5pIVc5Y8y3hWpU2/zFndCQWpi05Pn87PLSmuldLTUI1gSv7hyi/J3+oHBNGDvkXGzba9n8tshatIit9KfLuiJXviNn7heUifEGGhglrqiLOlwiu74A9+MBnyJN7isvk5mZtUOqGe2y063t8MzvOoKGuP3vg6QdfKoOkMm41lj4w8BJEMSb0p9uas74tEMQUDg+dBrQTy5J0rY94uVQcxVOx5XNtdHoUSPCkSvSGBNDw88g== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(356005)(1076003)(81166007)(82310400005)(44832011)(30864003)(36756003)(2906002)(6666004)(47076005)(83380400001)(36860700001)(2616005)(16526019)(86362001)(7696005)(26005)(316002)(40460700003)(508600001)(54906003)(4326008)(5660300002)(70206006)(6916009)(70586007)(336012)(426003)(186003)(8676002)(7416002)(8936002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 03:40:34.3033 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 11fbd8e1-088e-4b27-4019-08da3c6dfe71 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Pmus advertise their capabilities via sysfs attribute files but perf tool currently parses only core(cpu) pmu capabilities. Add support for parsing non-cpu pmu capabilities. Signed-off-by: Ravi Bangoria --- .../Documentation/perf.data-file-format.txt | 17 ++ tools/perf/util/env.c | 47 +++++ tools/perf/util/env.h | 10 + tools/perf/util/header.c | 185 ++++++++++++++++++ tools/perf/util/header.h | 1 + tools/perf/util/pmu.c | 15 +- tools/perf/util/pmu.h | 2 + 7 files changed, 273 insertions(+), 4 deletions(-) diff --git a/tools/perf/Documentation/perf.data-file-format.txt b/tools/per= f/Documentation/perf.data-file-format.txt index f56d0e0fbff6..64dddaecda21 100644 --- a/tools/perf/Documentation/perf.data-file-format.txt +++ b/tools/perf/Documentation/perf.data-file-format.txt @@ -435,6 +435,23 @@ struct { } [nr_pmu]; }; =20 + HEADER_PMU_CAPS =3D 32, + + List of pmu capabilities (except cpu pmu which is already + covered by HEADER_CPU_PMU_CAPS / HEADER_HYBRID_CPU_PMU_CAPS) + +struct { + u32 nr_pmus; + struct { + char pmu_name[]; + u32 nr_caps; + struct { + char name[]; + char value[]; + } [nr_caps]; + } [nr_pmus]; +}; + other bits are reserved and should ignored for now HEADER_FEAT_BITS =3D 256, =20 diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index 579e44c59914..3ecdd7683e45 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -180,6 +180,7 @@ static void perf_env__purge_bpf(struct perf_env *env __= maybe_unused) void perf_env__exit(struct perf_env *env) { int i; + u32 j; =20 perf_env__purge_bpf(env); perf_env__purge_cgroups(env); @@ -222,6 +223,14 @@ void perf_env__exit(struct perf_env *env) zfree(&env->hybrid_cpc_nodes[i].pmu_name); } zfree(&env->hybrid_cpc_nodes); + + for (i =3D 0; i < env->nr_pmus_with_caps; i++) { + zfree(&env->env_pmu_caps[i].pmu_name); + for (j =3D 0; j < env->env_pmu_caps[i].nr_caps; j++) + zfree(&env->env_pmu_caps[i].pmu_caps[j]); + zfree(&env->env_pmu_caps[i].pmu_caps); + } + zfree(&env->env_pmu_caps); } =20 void perf_env__init(struct perf_env *env) @@ -527,3 +536,41 @@ int perf_env__numa_node(struct perf_env *env, struct p= erf_cpu cpu) =20 return cpu.cpu >=3D 0 && cpu.cpu < env->nr_numa_map ? env->numa_map[cpu.c= pu] : -1; } + +char *perf_env__find_pmu_cap(struct perf_env *env, const char *pmu_name, + const char *cap) +{ + struct env_pmu_caps *env_pmu_caps =3D env->env_pmu_caps; + char *cap_eq; + int cap_size; + char **ptr; + int i; + u32 j; + + if (!pmu_name || !cap) + return NULL; + + cap_size =3D strlen(cap); + cap_eq =3D zalloc(cap_size + 2); + if (!cap_eq) + return NULL; + + memcpy(cap_eq, cap, cap_size); + cap_eq[cap_size] =3D '=3D'; + + for (i =3D 0; i < env->nr_pmus_with_caps; i++) { + if (strcmp(env_pmu_caps[i].pmu_name, pmu_name)) + continue; + + ptr =3D env_pmu_caps[i].pmu_caps; + + for (j =3D 0; j < env_pmu_caps[i].nr_caps; j++) { + if (!strncmp(ptr[j], cap_eq, cap_size + 1)) { + free(cap_eq); + return &ptr[j][cap_size + 1]; + } + } + } + free(cap_eq); + return NULL; +} diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index a3541f98e1fc..a21d62ee9de8 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -50,6 +50,12 @@ struct hybrid_cpc_node { char *pmu_name; }; =20 +struct env_pmu_caps { + char *pmu_name; + u32 nr_caps; + char **pmu_caps; +}; + struct perf_env { char *hostname; char *os_release; @@ -75,6 +81,7 @@ struct perf_env { int nr_cpu_pmu_caps; int nr_hybrid_nodes; int nr_hybrid_cpc_nodes; + int nr_pmus_with_caps; char *cmdline; const char **cmdline_argv; char *sibling_cores; @@ -95,6 +102,7 @@ struct perf_env { unsigned long long memory_bsize; struct hybrid_node *hybrid_nodes; struct hybrid_cpc_node *hybrid_cpc_nodes; + struct env_pmu_caps *env_pmu_caps; #ifdef HAVE_LIBBPF_SUPPORT /* * bpf_info_lock protects bpf rbtrees. This is needed because the @@ -172,4 +180,6 @@ bool perf_env__insert_btf(struct perf_env *env, struct = btf_node *btf_node); struct btf_node *perf_env__find_btf(struct perf_env *env, __u32 btf_id); =20 int perf_env__numa_node(struct perf_env *env, struct perf_cpu cpu); +char *perf_env__find_pmu_cap(struct perf_env *env, const char *pmu_name, + const char *cap); #endif /* __PERF_ENV_H */ diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index a27132e5a5ef..b4505dbb9f4a 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1580,6 +1580,67 @@ static int write_hybrid_cpu_pmu_caps(struct feat_fd = *ff, return 0; } =20 +/* + * File format: + * + * struct { + * u32 nr_pmus; + * struct { + * char pmu_name[]; + * u32 nr_caps; + * struct { + * char name[]; + * char value[]; + * } [nr_caps]; + * } [nr_pmus]; + * }; + */ +static int write_pmu_caps(struct feat_fd *ff, struct evlist *evlist __mayb= e_unused) +{ + struct perf_pmu_caps *caps =3D NULL; + struct perf_pmu *pmu =3D NULL; + u32 nr_pmus =3D 0; + int ret; + + while ((pmu =3D perf_pmu__scan(pmu))) { + if (!pmu->name || !strncmp(pmu->name, "cpu", 3) || + perf_pmu__caps_parse(pmu) <=3D 0) + continue; + nr_pmus++; + } + + ret =3D do_write(ff, &nr_pmus, sizeof(nr_pmus)); + if (ret < 0) + return ret; + + if (!nr_pmus) + return 0; + + while ((pmu =3D perf_pmu__scan(pmu))) { + if (!pmu->name || !strncmp(pmu->name, "cpu", 3) || !pmu->nr_caps) + continue; + + ret =3D do_write_string(ff, pmu->name); + if (ret < 0) + return ret; + + ret =3D do_write(ff, &pmu->nr_caps, sizeof(pmu->nr_caps)); + if (ret < 0) + return ret; + + list_for_each_entry(caps, &pmu->caps, list) { + ret =3D do_write_string(ff, caps->name); + if (ret < 0) + return ret; + + ret =3D do_write_string(ff, caps->value); + if (ret < 0) + return ret; + } + } + return 0; +} + static void print_hostname(struct feat_fd *ff, FILE *fp) { fprintf(fp, "# hostname : %s\n", ff->ph->env.hostname); @@ -2209,6 +2270,32 @@ static void print_mem_topology(struct feat_fd *ff, F= ILE *fp) } } =20 +static void print_pmu_caps(struct feat_fd *ff, FILE *fp) +{ + struct env_pmu_caps *env_pmu_caps =3D ff->ph->env.env_pmu_caps; + int nr_pmus_with_caps =3D ff->ph->env.nr_pmus_with_caps; + const char *delimiter =3D ""; + char **ptr; + int i; + u32 j; + + if (!nr_pmus_with_caps) + return; + + for (i =3D 0; i < nr_pmus_with_caps; i++) { + fprintf(fp, "# %s pmu capabilities: ", env_pmu_caps[i].pmu_name); + + ptr =3D env_pmu_caps[i].pmu_caps; + + delimiter =3D ""; + for (j =3D 0; j < env_pmu_caps[i].nr_caps; j++) { + fprintf(fp, "%s%s", delimiter, ptr[j]); + delimiter =3D ", "; + } + fprintf(fp, "\n"); + } +} + static int __event_process_build_id(struct perf_record_header_build_id *be= v, char *filename, struct perf_session *session) @@ -3319,6 +3406,103 @@ static int process_hybrid_cpu_pmu_caps(struct feat_= fd *ff, return ret; } =20 +static int __process_pmu_caps(struct feat_fd *ff, struct env_pmu_caps *env= _pmu_caps) +{ + u32 nr_caps =3D env_pmu_caps->nr_caps; + int name_size, value_size; + char *name, *value, *ptr; + u32 i; + + env_pmu_caps->pmu_caps =3D zalloc(sizeof(char *) * nr_caps); + if (!env_pmu_caps->pmu_caps) + return -1; + + for (i =3D 0; i < nr_caps; i++) { + name =3D do_read_string(ff); + if (!name) + goto error; + + value =3D do_read_string(ff); + if (!value) + goto free_name; + + name_size =3D strlen(name); + value_size =3D strlen(value); + ptr =3D zalloc(sizeof(char) * (name_size + value_size + 2)); + if (!ptr) + goto free_value; + + memcpy(ptr, name, name_size); + ptr[name_size] =3D '=3D'; + memcpy(ptr + name_size + 1, value, value_size); + env_pmu_caps->pmu_caps[i] =3D ptr; + + free(value); + free(name); + } + return 0; + +free_value: + free(value); +free_name: + free(name); +error: + for (; i > 0; i--) + free(env_pmu_caps->pmu_caps[i - 1]); + free(env_pmu_caps->pmu_caps); + return -1; +} + +static int process_pmu_caps(struct feat_fd *ff, void *data __maybe_unused) +{ + struct env_pmu_caps *env_pmu_caps; + u32 nr_pmus; + u32 i, j; + + ff->ph->env.nr_pmus_with_caps =3D 0; + ff->ph->env.env_pmu_caps =3D NULL; + + if (do_read_u32(ff, &nr_pmus)) + return -1; + + if (!nr_pmus) + return 0; + + env_pmu_caps =3D zalloc(sizeof(struct env_pmu_caps) * nr_pmus); + if (!env_pmu_caps) + return -ENOMEM; + + for (i =3D 0; i < nr_pmus; i++) { + env_pmu_caps[i].pmu_name =3D do_read_string(ff); + if (!env_pmu_caps[i].pmu_name) + goto error; + + if (do_read_u32(ff, &env_pmu_caps[i].nr_caps)) + goto free_pmu_name; + + if (!__process_pmu_caps(ff, &env_pmu_caps[i])) + continue; + +free_pmu_name: + free(env_pmu_caps[i].pmu_name); + goto error; + } + + ff->ph->env.nr_pmus_with_caps =3D nr_pmus; + ff->ph->env.env_pmu_caps =3D env_pmu_caps; + return 0; + +error: + for (; i > 0; i--) { + free(env_pmu_caps[i - 1].pmu_name); + for (j =3D 0; j < env_pmu_caps[i - 1].nr_caps; j++) + free(env_pmu_caps[i - 1].pmu_caps[j]); + free(env_pmu_caps[i - 1].pmu_caps); + } + free(env_pmu_caps); + return -1; +} + #define FEAT_OPR(n, func, __full_only) \ [HEADER_##n] =3D { \ .name =3D __stringify(n), \ @@ -3382,6 +3566,7 @@ const struct perf_header_feature_ops feat_ops[HEADER_= LAST_FEATURE] =3D { FEAT_OPR(CLOCK_DATA, clock_data, false), FEAT_OPN(HYBRID_TOPOLOGY, hybrid_topology, true), FEAT_OPR(HYBRID_CPU_PMU_CAPS, hybrid_cpu_pmu_caps, false), + FEAT_OPR(PMU_CAPS, pmu_caps, false), }; =20 struct header_print_data { diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index 0eb4bc29a5a4..e9a067bb8b9e 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -47,6 +47,7 @@ enum { HEADER_CLOCK_DATA, HEADER_HYBRID_TOPOLOGY, HEADER_HYBRID_CPU_PMU_CAPS, + HEADER_PMU_CAPS, HEADER_LAST_FEATURE, HEADER_FEAT_BITS =3D 256, }; diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 9a1c7e63e663..8d599acb7569 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1890,16 +1890,22 @@ int perf_pmu__caps_parse(struct perf_pmu *pmu) const char *sysfs =3D sysfs__mountpoint(); DIR *caps_dir; struct dirent *evt_ent; - int nr_caps =3D 0; + + if (pmu->caps_initialized) + return pmu->nr_caps; =20 if (!sysfs) return -1; =20 + pmu->nr_caps =3D 0; + snprintf(caps_path, PATH_MAX, "%s" EVENT_SOURCE_DEVICE_PATH "%s/caps", sysfs, pmu->name); =20 - if (stat(caps_path, &st) < 0) + if (stat(caps_path, &st) < 0) { + pmu->caps_initialized =3D true; return 0; /* no error if caps does not exist */ + } =20 caps_dir =3D opendir(caps_path); if (!caps_dir) @@ -1926,13 +1932,14 @@ int perf_pmu__caps_parse(struct perf_pmu *pmu) continue; } =20 - nr_caps++; + pmu->nr_caps++; fclose(file); } =20 closedir(caps_dir); =20 - return nr_caps; + pmu->caps_initialized =3D true; + return pmu->nr_caps; } =20 void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config, diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 541889fa9f9c..4b45fd8da5a3 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -46,6 +46,8 @@ struct perf_pmu { struct perf_cpu_map *cpus; struct list_head format; /* HEAD struct perf_pmu_format -> list */ struct list_head aliases; /* HEAD struct perf_pmu_alias -> list */ + bool caps_initialized; + u32 nr_caps; struct list_head caps; /* HEAD struct perf_pmu_caps -> list */ struct list_head list; /* ELEM */ struct list_head hybrid_list; --=20 2.31.1 From nobody Thu May 7 17:42:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B837C433EF for ; Mon, 23 May 2022 03:43:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355605AbiEWDlG (ORCPT ); Sun, 22 May 2022 23:41:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355561AbiEWDku (ORCPT ); Sun, 22 May 2022 23:40:50 -0400 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08on2058.outbound.protection.outlook.com [40.107.101.58]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8DDB35DF6; Sun, 22 May 2022 20:40:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TE1b0BPHudZd/T1eorf5CibF1z1GRr8uM4vUz2qzVzn1+WuMMQso0+h4Fef0Qwhtyi5gnKRHtXS22mkcl0Fz6Yccjj4+sYGFwMN2xUeUJsqGYSDeQowsqX4ZXwl96R24wJ6dXp3PLTOIZmUvQdSiBh6DDnCPkK6z1FkTB9S5nKOPDrXSrorecqGKNZO5btF9Z+27DoBk9q0g59Iv27X3eCI4YuF8cG3PwicEMS3KE4LwPD4Az43fPIeAi2o+HkZcgc/YaFAOP/oDTXBw+HFeCBgdo2Gls0eIsflKf5h2vgKrJZMFXZhzG1VYq2j5lheTLBlI3VcuCgAG01aeoSosMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=58OUnmftGccIflpVRC3kry/dTTF/1fMLkNTsUzjZkiY=; b=QJx0wQW2T0vxl00gMXYq7feXkiG77if2QNmgTK+nlgkpxMKs4UAbShbSQfEX1swX1HDJg42/C+Oo5Pv9/dXkjr0oMnmasbBhmQgZf4CDDUbj1LRcC1Q5/1eDbCnGZLTLhOkLh1ev6YZzqPIvtSMUwfAzUzCsnGv78unFAt+BRTc3GeH9Ge7mmVYBGu7rfgIxBqjR27C3KCoi0ehXicTdjp82J5hZovalb8ryk8j60k3RvZLUlhzj7DOh9RrN2V/K/O/HAuClFdWh3VUpm+WO8JYBESUwQ6kNK07skKii3gVyNOc0ovW9GZ33+iXOj5mJpFSqAbOclxnRUU8v33qSMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=58OUnmftGccIflpVRC3kry/dTTF/1fMLkNTsUzjZkiY=; b=uo7pAJN29YFdZIgtG3hiS/Qcywd+WGKyxxGMoTTzyRHOSil9bE7NmDlqZGRAYsD8dXkBc1E/w+055c3+t8pNcY5uxvBJFbwMIoGWWgLeZRbqbBs/R7VYHqCWzHe+cntm88LHQNZL8asFps/e8JfGFu+0T86alzQAiIzWW+WEF88= Received: from DM6PR05CA0056.namprd05.prod.outlook.com (2603:10b6:5:335::25) by BYAPR12MB2870.namprd12.prod.outlook.com (2603:10b6:a03:12d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15; Mon, 23 May 2022 03:40:44 +0000 Received: from DM6NAM11FT052.eop-nam11.prod.protection.outlook.com (2603:10b6:5:335:cafe::1b) by DM6PR05CA0056.outlook.office365.com (2603:10b6:5:335::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.12 via Frontend Transport; Mon, 23 May 2022 03:40:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT052.mail.protection.outlook.com (10.13.172.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Mon, 23 May 2022 03:40:44 +0000 Received: from BLR-5CG113396H.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sun, 22 May 2022 22:40:33 -0500 From: Ravi Bangoria To: CC: , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 3/5] perf/x86/ibs: Add new IBS register bits into header Date: Mon, 23 May 2022 09:09:43 +0530 Message-ID: <20220523033945.1612-4-ravi.bangoria@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523033945.1612-1-ravi.bangoria@amd.com> References: <20220523033945.1612-1-ravi.bangoria@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 682f6cf5-857a-4548-11da-08da3c6e0447 X-MS-TrafficTypeDiagnostic: BYAPR12MB2870:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kua0w29eJoS0y7N3v2rqpzsQ0GmMGVYw6IfupwptO9NM0OzvTUunA+oX9OdSjBXSj2p5Gq1olypUZw1Dnrs4v517Du3kODmmvafv4SBsorbQDDh9E4hT3EFoN/8MD+263pPb/FeY0nMFniZU6aS6H6cjF0sWkDxtEv8Bbw/Xzw81/hHvMJRwJYoexbAdmm1WvybBiPEDMfhbWyDyJG4jHdtOk5M5BEKQwOoTzL9BWr2ekgYeOS7vVxjYaClof2UuvTquW1WSjL5NZIWhJxk5K7QGscHP4dDn4URAXVvtRAbsd2R8Yj5kuf3aLG/FxSDajkw7DFZGUe7Q+N6fkLq7FLxGTv2Qc3qTJezTt9tS1Ck/ht09f/RbmxZuQp4dHlvN3yRWxkKZm3Vm3wN6c+5qkmDXVOhAZyo4tRIU6t1uFEHDJVlkOpOZ3YdWZpnxrY4a/jabZmBgAa1hzWIusuAsB3V/zZq+orYPCBDTOU4UInuwvZ1JNo74vE4J6EW003xdawSixGbaXbNkskvu7zzU4GNGe2EOFrboW4LflhxdlJkmkH+nmnMRcExVrAAnsARIe48hAhH31TMspL/cFF5H8ce0UDTGhFfuc4Cpm5JKRahl70BCK+uLetW+znTeg0z/nAKI1fr1HvkUqVMIJdVOos3L1FZ2C/8+VvPZO1Bx4CHlAYnLSnjWoD6ZDcYbJx/bwPbICn7R67DdqjkAAEe7Qg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(2616005)(7416002)(6666004)(356005)(508600001)(2906002)(316002)(86362001)(82310400005)(26005)(44832011)(40460700003)(54906003)(6916009)(7696005)(4326008)(70206006)(70586007)(8676002)(36756003)(8936002)(186003)(16526019)(5660300002)(36860700001)(336012)(81166007)(1076003)(47076005)(426003)(83380400001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 03:40:44.1088 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 682f6cf5-857a-4548-11da-08da3c6e0447 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT052.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2870 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" IBS support has been enhanced with two new features in upcoming uarch: 1. DataSrc extension and 2. L3 miss filtering. Additional set of bits has been introduced in IBS registers to exploit these features. Define these new bits into arch/x86/ header. Signed-off-by: Ravi Bangoria Acked-by: Ian Rogers --- arch/x86/include/asm/amd-ibs.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/amd-ibs.h b/arch/x86/include/asm/amd-ibs.h index aabdbb5ab920..f3eb098d63d4 100644 --- a/arch/x86/include/asm/amd-ibs.h +++ b/arch/x86/include/asm/amd-ibs.h @@ -29,7 +29,10 @@ union ibs_fetch_ctl { rand_en:1, /* 57: random tagging enable */ fetch_l2_miss:1,/* 58: L2 miss for sampled fetch * (needs IbsFetchComp) */ - reserved:5; /* 59-63: reserved */ + l3_miss_only:1, /* 59: Collect L3 miss samples only */ + fetch_oc_miss:1,/* 60: Op cache miss for the sampled fetch */ + fetch_l3_miss:1,/* 61: L3 cache miss for the sampled fetch */ + reserved:2; /* 62-63: reserved */ }; }; =20 @@ -38,14 +41,14 @@ union ibs_op_ctl { __u64 val; struct { __u64 opmaxcnt:16, /* 0-15: periodic op max. count */ - reserved0:1, /* 16: reserved */ + l3_miss_only:1, /* 16: Collect L3 miss samples only */ op_en:1, /* 17: op sampling enable */ op_val:1, /* 18: op sample valid */ cnt_ctl:1, /* 19: periodic op counter control */ opmaxcnt_ext:7, /* 20-26: upper 7 bits of periodic op maximum count */ - reserved1:5, /* 27-31: reserved */ + reserved0:5, /* 27-31: reserved */ opcurcnt:27, /* 32-58: periodic op counter current count */ - reserved2:5; /* 59-63: reserved */ + reserved1:5; /* 59-63: reserved */ }; }; =20 @@ -71,11 +74,12 @@ union ibs_op_data { union ibs_op_data2 { __u64 val; struct { - __u64 data_src:3, /* 0-2: data source */ + __u64 data_src_lo:3, /* 0-2: data source low */ reserved0:1, /* 3: reserved */ rmt_node:1, /* 4: destination node */ cache_hit_st:1, /* 5: cache hit state */ - reserved1:57; /* 5-63: reserved */ + data_src_hi:2, /* 6-7: data source high */ + reserved1:56; /* 8-63: reserved */ }; }; =20 --=20 2.31.1 From nobody Thu May 7 17:42:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE4B7C433F5 for ; Mon, 23 May 2022 03:43:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355712AbiEWDl3 (ORCPT ); Sun, 22 May 2022 23:41:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355604AbiEWDlG (ORCPT ); Sun, 22 May 2022 23:41:06 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2040.outbound.protection.outlook.com [40.107.223.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A282FD3; Sun, 22 May 2022 20:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ok8FgDc/IwU7352l1K0ioUSNaAz1tcHBcQa68lLKNLu7OFzrTBPO0stM/knHICVBCjXzoRaqj9WkvF6qfIHVzgqr0mNumpPrZMMCwv9EX4o8xhxKTWrlmhSqh/TxfonELy0X4+RyqUtpGO6mtFiqOkLWWiY0yx58VXn2NfH9sXQlThniJvEX8KrEWYMYUPjQrVsHi23TmKD0Lgl2buADSh0Tk2fDAva4d+H9r61iEYrNAmsgBHh01zCwxkAi/ZS4XkyJ6mVy0BVY072s+2NYNemlRdvWRSXOU1sKIYZoVCC/3M+4s2GzSGFr99iskt1q4kDZMzoPA9fEPL8V1E14vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ENgn8+omoEhMK3iILyBQxGAX+iDfdi2Upi/IMDFWqgw=; b=bNeEurw7r24cvCbDliO7gNL+W7Onxam2ZSVohECAUGFRcFuVFY1364oAx7PDTQc1F1zxajlSZDdE1oxj3VmHd4IpRJWk1RZh4zToMQ6jHjBptcLStINvJkuD1C1eitMjvBEwjDZCc2TlcwKXeSvlwYICvaiqOaprnZHQEgQZEypS0Q1nLQrfirQ7Kzrs2mEhLvQozdLWaH3iUfEeYmVU8UgkFQpXNjgiNoRA0CQqwZAv67geuXBeteqxqTBxQUzSR7dfcVkwnAI5B5OLoFN/F4jwj/tXQE3CnX7B9VfLaoxZtYN5t+iJKBKUwbDY4WncVBr3NXq4CkmuZHrjZrYv0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ENgn8+omoEhMK3iILyBQxGAX+iDfdi2Upi/IMDFWqgw=; b=SHtfg7+YvPV7Zo1/2HN6UWKFZ3VQSDSL2Iq74L4fOe7xtSFmPP/Bd2ykwqRQ5Fc9FGsUzsaTNNH3IPcQI6WjVYAKu/cW1rg81rL6ZxF81Hu1EhTtZQASl6tXfTs2xpwinR++V/SOKyEoTnzVUKk2knkDG8O9ZQeu5dvtvl+98qw= Received: from DM5PR13CA0015.namprd13.prod.outlook.com (2603:10b6:3:23::25) by DM6PR12MB4060.namprd12.prod.outlook.com (2603:10b6:5:216::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13; Mon, 23 May 2022 03:40:55 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:3:23:cafe::10) by DM5PR13CA0015.outlook.office365.com (2603:10b6:3:23::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.11 via Frontend Transport; Mon, 23 May 2022 03:40:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Mon, 23 May 2022 03:40:54 +0000 Received: from BLR-5CG113396H.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sun, 22 May 2022 22:40:43 -0500 From: Ravi Bangoria To: CC: , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 4/5] perf tool ibs: Sync amd ibs header file Date: Mon, 23 May 2022 09:09:44 +0530 Message-ID: <20220523033945.1612-5-ravi.bangoria@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523033945.1612-1-ravi.bangoria@amd.com> References: <20220523033945.1612-1-ravi.bangoria@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bde91316-28b1-4959-d235-08da3c6e0abb X-MS-TrafficTypeDiagnostic: DM6PR12MB4060:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b5QF8Lr8zbTxb0xRLr4ZM1GtHLudKT9DbZwo0X1pd7G3f1GsZMGQGEnPQcr+KVEFVM9rV7RoPGno0AOiZl/LJ366F+/0BeGncuoQzIZFMeUnCR+NEhxyuAXYjJHSKpxPmb8PGpXLkC+aNzSES9fbJEtE/e3Db8W23V2dZkZMHA4A5qa6ejGNTkENXYTYcksKrduh1fKbkwNvLHpnI/0cNKSJoT+R/2R4YX8aqgeFzhX9hqHBCe+17CHPKVs3MjmBud603QyPBOLwH0uUbfK0LNAB+tVZjKrTMgY2cVdHSMo+QrEeK2T4rWIJVB7vHwhcWSk6FVOIixoJQ2GqX86aHkxju5t5iYSjHWTRGvURqR7V8knyBLEcu8gdeEBGuKffeTdsXQL1us2l/3xvXdseAMUJOWoEFdsoJ+nY/tho/C5xPjZsVTu8+3Jy/vk/YrZk8dZNnrg+1kGnq31bVwtfUQZ9IkJc9kf8xpmeUHiRWI+c9ENfW5y5It/SIZ05G6oIkk9Ffvyulb2NilstHRxnH91PIKryjQSobJv/tR0yybI6xkRrbPb+22nkpS3vzGsiNkkfW3RtiVcZgNVzf+JpyQI1OAZl+Yl7IidgOK9EfY68n0qhGh6z7TFoef8SnLUTqLnY8q4ZkYeOMAshG/tZp5slVxU7T/PqloPrPVuB1HN858CrbYCXaeuHLlcAUOWoheFgnRsuN5mglglGlY31og== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(7696005)(2616005)(16526019)(1076003)(26005)(316002)(336012)(54906003)(83380400001)(6916009)(186003)(426003)(47076005)(36756003)(70586007)(70206006)(36860700001)(8676002)(4326008)(2906002)(8936002)(508600001)(5660300002)(7416002)(44832011)(81166007)(40460700003)(82310400005)(356005)(86362001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 03:40:54.9403 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bde91316-28b1-4959-d235-08da3c6e0abb X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4060 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" IBS support has been enhanced with two new features in upcoming uarch: 1. DataSrc extension and 2. L3 miss filtering. Additional set of bits has been introduced in IBS registers to exploit these features. New bits are already defining in arch/x86/ header. Sync it with tools header file. Also rename existing ibs_op_data field 'data_src' to 'data_src_lo'. Signed-off-by: Ravi Bangoria --- tools/arch/x86/include/asm/amd-ibs.h | 16 ++++++++++------ tools/perf/util/amd-sample-raw.c | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/arch/x86/include/asm/amd-ibs.h b/tools/arch/x86/include/= asm/amd-ibs.h index 765e9e752d03..9a3312e12e2e 100644 --- a/tools/arch/x86/include/asm/amd-ibs.h +++ b/tools/arch/x86/include/asm/amd-ibs.h @@ -29,7 +29,10 @@ union ibs_fetch_ctl { rand_en:1, /* 57: random tagging enable */ fetch_l2_miss:1,/* 58: L2 miss for sampled fetch * (needs IbsFetchComp) */ - reserved:5; /* 59-63: reserved */ + l3_miss_only:1, /* 59: Collect L3 miss samples only */ + fetch_oc_miss:1,/* 60: Op cache miss for the sampled fetch */ + fetch_l3_miss:1,/* 61: L3 cache miss for the sampled fetch */ + reserved:2; /* 62-63: reserved */ }; }; =20 @@ -38,14 +41,14 @@ union ibs_op_ctl { __u64 val; struct { __u64 opmaxcnt:16, /* 0-15: periodic op max. count */ - reserved0:1, /* 16: reserved */ + l3_miss_only:1, /* 16: Collect L3 miss samples only */ op_en:1, /* 17: op sampling enable */ op_val:1, /* 18: op sample valid */ cnt_ctl:1, /* 19: periodic op counter control */ opmaxcnt_ext:7, /* 20-26: upper 7 bits of periodic op maximum count */ - reserved1:5, /* 27-31: reserved */ + reserved0:5, /* 27-31: reserved */ opcurcnt:27, /* 32-58: periodic op counter current count */ - reserved2:5; /* 59-63: reserved */ + reserved1:5; /* 59-63: reserved */ }; }; =20 @@ -71,11 +74,12 @@ union ibs_op_data { union ibs_op_data2 { __u64 val; struct { - __u64 data_src:3, /* 0-2: data source */ + __u64 data_src_lo:3, /* 0-2: data source low */ reserved0:1, /* 3: reserved */ rmt_node:1, /* 4: destination node */ cache_hit_st:1, /* 5: cache hit state */ - reserved1:57; /* 5-63: reserved */ + data_src_hi:2, /* 6-7: data source high */ + reserved1:56; /* 8-63: reserved */ }; }; =20 diff --git a/tools/perf/util/amd-sample-raw.c b/tools/perf/util/amd-sample-= raw.c index d19d765195c5..3b623ea6ee7e 100644 --- a/tools/perf/util/amd-sample-raw.c +++ b/tools/perf/util/amd-sample-raw.c @@ -98,9 +98,9 @@ static void pr_ibs_op_data2(union ibs_op_data2 reg) }; =20 printf("ibs_op_data2:\t%016llx %sRmtNode %d%s\n", reg.val, - reg.data_src =3D=3D 2 ? (reg.cache_hit_st ? "CacheHitSt 1=3DO-Stat= e " + reg.data_src_lo =3D=3D 2 ? (reg.cache_hit_st ? "CacheHitSt 1=3DO-S= tate " : "CacheHitSt 0=3DM-state ") : "", - reg.rmt_node, data_src_str[reg.data_src]); + reg.rmt_node, data_src_str[reg.data_src_lo]); } =20 static void pr_ibs_op_data3(union ibs_op_data3 reg) --=20 2.31.1 From nobody Thu May 7 17:42:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60F04C433EF for ; Mon, 23 May 2022 03:41:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355749AbiEWDlc (ORCPT ); Sun, 22 May 2022 23:41:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355653AbiEWDlR (ORCPT ); Sun, 22 May 2022 23:41:17 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2062.outbound.protection.outlook.com [40.107.92.62]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2B5C5FC3; Sun, 22 May 2022 20:41:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DrTaiKLAfiN45QVJj4GWjK+nSbJlEb4qf5SSICYramUFc/XyqefxNil+cCgPzSo8O+hCpjR+VvcPuQjd5Q3sBKei8IqC/Asoum6u/DI4zhEf92/uxdibqVw4qobg9J73XPemwlvYusLCjgA9q2mZZv34mmFH5ME+lrX8wFl8N21+FJW1RoMvoaY0EBYtOunMSm8hhVVpuPJE2lbFM5VuBzSBXsQA9z/qygEkgY54tQG/mGNZD9NBGt2qvyvZnZWt9X0DT47hS/yZggWGI/uJx6fJ6s4v5YcLUHPIY6CIB3BxIYHPaXM0MOpOuTgyFIsdl0ye3Boq67LHgm2xJC+Vkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rDr3Aud2f3bEWRA5lYEAheLaXurwbvIRmVzaryhpqQQ=; b=JzK6vmz2knkVr2YzYhowFmP6GyHbzphZrM5GF0ekmspaelvc9l0wDgTlu4JzwM6MAxGERAo5rDOibINWXPLjbWKClfym8UFlgJFfTI7A99TqIfT7jkfjiUwvQfJ6fRxOiYzEd/h5jfCoK18zl7LSfkiFG5wq1JzGo3ICrMgqHWg92QXwaY432jPBiDDUeHA0mau9fIy1e/7F3RC14cVt5oDHcHRzIYZJmnc14/o0jj/c88jpDQ5mJ2Tw83vEAryXt00BPYbLdkTN6hyfc13Ky5D8J1lv4sJqwkrvEtkvFKJJFxCsvJqI/4uWsw872RV+sg2IMSPneLJCaiAqxs+w1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rDr3Aud2f3bEWRA5lYEAheLaXurwbvIRmVzaryhpqQQ=; b=135cfCdwAm4pEyb/p3IKuiCh7gpSjf/KtcsUTVb6HC4hUSl5W1W9iZHItl5cOL1UqQU+YYSvPZ/o4otgxYEEUkmB5L5CDX6UR2k88KpUhTRBGBWhg4fRyoXcCstUAH8LMJ5A2UHUXgnd1YPQa3wXtfi16//Ysvn7aweUDUGny3w= Received: from DS7PR05CA0040.namprd05.prod.outlook.com (2603:10b6:8:2f::33) by DM6PR12MB3547.namprd12.prod.outlook.com (2603:10b6:5:18a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.17; Mon, 23 May 2022 03:41:06 +0000 Received: from DM6NAM11FT044.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2f:cafe::aa) by DS7PR05CA0040.outlook.office365.com (2603:10b6:8:2f::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.7 via Frontend Transport; Mon, 23 May 2022 03:41:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT044.mail.protection.outlook.com (10.13.173.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Mon, 23 May 2022 03:41:06 +0000 Received: from BLR-5CG113396H.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sun, 22 May 2022 22:40:54 -0500 From: Ravi Bangoria To: CC: , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 5/5] perf script ibs: Support new IBS bits in raw trace dump Date: Mon, 23 May 2022 09:09:45 +0530 Message-ID: <20220523033945.1612-6-ravi.bangoria@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220523033945.1612-1-ravi.bangoria@amd.com> References: <20220523033945.1612-1-ravi.bangoria@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e2999bf-9541-4981-6912-08da3c6e11a0 X-MS-TrafficTypeDiagnostic: DM6PR12MB3547:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kRK9CMSeMseUVOya9rHINbSyoUVFlbuTF1avmqqI2Tvf4oMG90GEm6LsiPuJaFmYo84mxl7jagIMj2xxvKjtGdomOWrXrDdFzzRRUwhkK2wDL+Yr01FnzsxhFiIKYvVKRRi2yP+pCWzatkBXfi+0bUjZSCclwewxUKAu4Mx1ncVEJ8VWPvXlScEtG+AWoK4K+h2l3L/w0iAWL+60t3uNWo9wn4CVmXwbgUt5JTh0GeW8RoNZQjY5+0g5Ae1XuBAWQsQShJcI0KYzpK1HfSD54rxRb/3AyAjRfcvdIRzRq428FBPYFPXQFGH+tSR0bLfZsVuAPW+J4e2MGUd8ERWM/63GiZ0wzeQisTJgrGueSfTc1m63HhMqVu8hrvL+wroBg5CWuwfa+eg7AailfTWX2ZbKTBrz2VUwAt07FG9kKcBkcCBNtwEz0GV4Zh4ZwzADP6lfzEC4sSKrLsnJXC7PtJFCsvYq3GgQDTkX7oQ4e7N8nw64bDsVF6dud150tEx50Lqm3RzMiF3ItSAJAhIvxYdhCxgRK/e7TMBNRjYJ6u+5VK+7bkf6gep1V4ONzokCVgd9scpfozqZDz6JtAgay6KeAkgbvylI5aE0+5UJAe3ojyeQW1H23TYZACXiFWiD64ikkshMw98lQ1qM4YWz1rB63UBLgUrir7hES1con4n5smImIzr81g8SvM6hjNr/CbQo8n7K7L1OfCbag0h8BA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(70586007)(70206006)(47076005)(7696005)(54906003)(8676002)(6916009)(83380400001)(508600001)(356005)(1076003)(426003)(16526019)(26005)(4326008)(186003)(40460700003)(336012)(86362001)(81166007)(36756003)(82310400005)(36860700001)(2616005)(7416002)(44832011)(2906002)(316002)(8936002)(6666004)(5660300002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 03:41:06.5203 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7e2999bf-9541-4981-6912-08da3c6e11a0 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT044.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3547 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Interpret Additional set of IBS register bits while doing perf report/script raw dump. IBS op pmu ex: $ sudo ./perf record -c 130 -a -e ibs_op/l3missonly=3D1/ --raw-samples $ sudo ./perf report -D ... ibs_op_ctl: 0000004500070008 MaxCnt 128 L3MissOnly 1 En 1 Val 1 CntCtl 0=3Dcycles CurCnt 69 ibs_op_data: 0000000000710002 CompToRetCtr 2 TagToRetCtr 113 BrnRet 0 RipInvalid 0 BrnFuse 0 Microcode 0 ibs_op_data2: 0000000000000002 CacheHitSt 0=3DM-state RmtNode 0 DataSrc 2=3DA peer cache in a near CCX ibs_op_data3: 000000681d1700a1 LdOp 1 StOp 0 DcL1TlbMiss 0 DcL2TlbMiss 0 DcL1TlbHit2M 0 DcL1TlbHit1G 1 DcL2TlbHit2M 0 DcMiss 1 DcMisAcc 0 DcWcMemAcc 0 DcUcMemAcc 0 DcLockedOp 0 DcMissNoMabAlloc 1 DcLinAddrValid 1 DcPhyAddrValid 1 DcL2TlbHit1G 0 L2Miss 1 SwPf 0 OpMemWidth 8 bytes OpDcMissOpenMemReqs 7 DcMissLat 104 TlbRefillLat 0 IBS Fetch pmu ex: $ sudo ./perf record -c 130 -a -e ibs_fetch/l3missonly=3D1/ --raw-samples $ sudo ./perf report -D ... ibs_fetch_ctl: 3c1f00c700080008 MaxCnt 128 Cnt 128 Lat 199 En 1 Val 1 Comp 1 IcMiss 1 PhyAddrValid 1 L1TlbPgSz 4KB L1TlbMiss 0 L2TlbMiss 0 RandEn 0 L2Miss 1 L3MissOnly 1 FetchOcMiss 1 FetchL3Miss 1 With the DataSrc extensions, the source of data can be decoded among: - Local L3 or other L1/L2 in CCX. - A peer cache in a near CCX. - Data returned from DRAM. - A peer cache in a far CCX. - DRAM address map with "long latency" bit set. - Data returned from MMIO/Config/PCI/APIC. - Extension Memory (S-Link, GenZ, etc - identified by the CS target and/or address map at DF's choice). - Peer Agent Memory. Signed-off-by: Ravi Bangoria --- tools/perf/util/amd-sample-raw.c | 64 +++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/amd-sample-raw.c b/tools/perf/util/amd-sample-= raw.c index 3b623ea6ee7e..238305868644 100644 --- a/tools/perf/util/amd-sample-raw.c +++ b/tools/perf/util/amd-sample-raw.c @@ -18,6 +18,7 @@ #include "pmu-events/pmu-events.h" =20 static u32 cpu_family, cpu_model, ibs_fetch_type, ibs_op_type; +static bool zen4_ibs_extensions; =20 static void pr_ibs_fetch_ctl(union ibs_fetch_ctl reg) { @@ -39,6 +40,7 @@ static void pr_ibs_fetch_ctl(union ibs_fetch_ctl reg) }; const char *ic_miss_str =3D NULL; const char *l1tlb_pgsz_str =3D NULL; + char l3_miss_str[sizeof(" L3MissOnly _ FetchOcMiss _ FetchL3Miss _")] =3D= ""; =20 if (cpu_family =3D=3D 0x19 && cpu_model < 0x10) { /* @@ -53,12 +55,19 @@ static void pr_ibs_fetch_ctl(union ibs_fetch_ctl reg) ic_miss_str =3D ic_miss_strs[reg.ic_miss]; } =20 + if (zen4_ibs_extensions) { + snprintf(l3_miss_str, sizeof(l3_miss_str), + " L3MissOnly %d FetchOcMiss %d FetchL3Miss %d", + reg.l3_miss_only, reg.fetch_oc_miss, reg.fetch_l3_miss); + } + printf("ibs_fetch_ctl:\t%016llx MaxCnt %7d Cnt %7d Lat %5d En %d Val %d C= omp %d%s " - "PhyAddrValid %d%s L1TlbMiss %d L2TlbMiss %d RandEn %d%s\n", + "PhyAddrValid %d%s L1TlbMiss %d L2TlbMiss %d RandEn %d%s%s\n", reg.val, reg.fetch_maxcnt << 4, reg.fetch_cnt << 4, reg.fetch_lat, reg.fetch_en, reg.fetch_val, reg.fetch_comp, ic_miss_str ? : "", reg.phy_addr_valid, l1tlb_pgsz_str ? : "", reg.l1tlb_miss, reg.l2tlb_mis= s, - reg.rand_en, reg.fetch_comp ? (reg.fetch_l2_miss ? " L2Miss 1" : " L2Mis= s 0") : ""); + reg.rand_en, reg.fetch_comp ? (reg.fetch_l2_miss ? " L2Miss 1" : " L2Mis= s 0") : "", + l3_miss_str); } =20 static void pr_ic_ibs_extd_ctl(union ic_ibs_extd_ctl reg) @@ -68,9 +77,15 @@ static void pr_ic_ibs_extd_ctl(union ic_ibs_extd_ctl reg) =20 static void pr_ibs_op_ctl(union ibs_op_ctl reg) { - printf("ibs_op_ctl:\t%016llx MaxCnt %9d En %d Val %d CntCtl %d=3D%s CurCn= t %9d\n", - reg.val, ((reg.opmaxcnt_ext << 16) | reg.opmaxcnt) << 4, reg.op_en= , reg.op_val, - reg.cnt_ctl, reg.cnt_ctl ? "uOps" : "cycles", reg.opcurcnt); + char l3_miss_only[sizeof(" L3MissOnly _")] =3D ""; + + if (zen4_ibs_extensions) + snprintf(l3_miss_only, sizeof(l3_miss_only), " L3MissOnly %d", reg.l3_mi= ss_only); + + printf("ibs_op_ctl:\t%016llx MaxCnt %9d%s En %d Val %d CntCtl %d=3D%s Cur= Cnt %9d\n", + reg.val, ((reg.opmaxcnt_ext << 16) | reg.opmaxcnt) << 4, l3_miss_only, + reg.op_en, reg.op_val, reg.cnt_ctl, + reg.cnt_ctl ? "uOps" : "cycles", reg.opcurcnt); } =20 static void pr_ibs_op_data(union ibs_op_data reg) @@ -84,7 +99,34 @@ static void pr_ibs_op_data(union ibs_op_data reg) reg.op_brn_ret, reg.op_rip_invalid, reg.op_brn_fuse, reg.op_microcode); } =20 -static void pr_ibs_op_data2(union ibs_op_data2 reg) +static void pr_ibs_op_data2_extended(union ibs_op_data2 reg) +{ + static const char * const data_src_str[] =3D { + "", + " DataSrc 1=3DLocal L3 or other L1/L2 in CCX", + " DataSrc 2=3DA peer cache in a near CCX", + " DataSrc 3=3DData returned from DRAM", + " DataSrc 4=3D(reserved)", + " DataSrc 5=3DA peer cache in a far CCX", + " DataSrc 6=3DDRAM address map with \"long latency\" bit set", + " DataSrc 7=3DData returned from MMIO/Config/PCI/APIC", + " DataSrc 8=3DExtension Memory (S-Link, GenZ, etc)", + " DataSrc 9=3D(reserved)", + " DataSrc 10=3D(reserved)", + " DataSrc 11=3D(reserved)", + " DataSrc 12=3DPeer Agent Memory", + /* 13 to 31 are reserved. Avoid printing them. */ + }; + int data_src =3D (reg.data_src_hi << 3) | reg.data_src_lo; + + printf("ibs_op_data2:\t%016llx %sRmtNode %d%s\n", reg.val, + (data_src =3D=3D 1 || data_src =3D=3D 2 || data_src =3D=3D 5) ? + (reg.cache_hit_st ? "CacheHitSt 1=3DO-State " : "CacheHitSt 0=3DM-state= ") : "", + reg.rmt_node, + data_src < (int)ARRAY_SIZE(data_src_str) ? data_src_str[data_src] : ""); +} + +static void pr_ibs_op_data2_default(union ibs_op_data2 reg) { static const char * const data_src_str[] =3D { "", @@ -103,6 +145,13 @@ static void pr_ibs_op_data2(union ibs_op_data2 reg) reg.rmt_node, data_src_str[reg.data_src_lo]); } =20 +static void pr_ibs_op_data2(union ibs_op_data2 reg) +{ + if (zen4_ibs_extensions) + return pr_ibs_op_data2_extended(reg); + pr_ibs_op_data2_default(reg); +} + static void pr_ibs_op_data3(union ibs_op_data3 reg) { char l2_miss_str[sizeof(" L2Miss _")] =3D ""; @@ -279,6 +328,9 @@ bool evlist__has_amd_ibs(struct evlist *evlist) pmu_mapping +=3D strlen(pmu_mapping) + 1 /* '\0' */; } =20 + if (perf_env__find_pmu_cap(env, "ibs_op", "zen4_ibs_extensions")) + zen4_ibs_extensions =3D 1; + if (ibs_fetch_type || ibs_op_type) { if (!cpu_family) parse_cpuid(env); --=20 2.31.1