From patchwork Wed May 17 02:24:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 95003 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp837497vqo; Tue, 16 May 2023 19:50:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7VFFkMgitC9jArd3gnVGyAOT/zRDpvGbyCqTz2kzgK4AJuTLPwAnBZo9a9l4JOwa+4Itoq X-Received: by 2002:a17:90b:181:b0:247:14ac:4d3a with SMTP id t1-20020a17090b018100b0024714ac4d3amr857617pjs.20.1684291819997; Tue, 16 May 2023 19:50:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684291819; cv=none; d=google.com; s=arc-20160816; b=r0TAlL6Vl8PeJ/JZwfLuoDjA53WxYON4OFhadQXbFGPS8NJGjuJPoQ9n5wEiQnHwgB GplFDAWhMj4CXR7qzKrFMEDg7tvgifAJZSoMLbY7IDzar4zbvnbO8qf2bpwYfchbtdea QQWVZwVL4rY+NtQ3OSa2SkQ7hZ5V7L3tYDH6mga8lmVlXBLEjPuMGIW+ql6uI1zxJga8 6rcQE4mIc1DAljEVKhkY4PnYqbCxt7/Fc0g5T4SGYLMSjzhqwF/SknX/w5rMTbA85mdv lX0Za155QVLfq82eYf3trJY1bpZzXUgSp9sXTNGVkT+5WlnNjVq+ADUMiGN5LpVsaoGC A3UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=MNFBc7dORArDLHA0dFqLn6R1OVaH0makO1BjC7dht6E=; b=Mw2VzQitaQmoYYhahDprC6S6Siv4Iz1MmfoNR5o48NPBNigWivMXoxdFu1uBNWOikw N6tyR6G1Amp/xnxYI0nEyr+ugO+O6+zjweX6VAkJLX6fIqAVrBK9W3NTjJ38M2R/F0jl EK7BT+zzggyDeEZXECelwqHZTUjDbJc4aq1tsBB4fW8OFjq7JXp4jJvF/2PkN9DytST0 Mfbd/aL/xJuBx883x2Vpa9LvnRtdIERZOAT6g8nuIktTGjk+MJYMuOHEfOXVgL0eY92B M6OEvUH3NZQ7N4euTL1H9S1S1639mnc4275svTzSF6/kjSi5lQvqmnuIS4i6BZPBwqn1 6I3A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x11-20020a17090a970b00b002498408b1c5si719396pjo.39.2023.05.16.19.50.08; Tue, 16 May 2023 19:50:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231472AbjEQCYz (ORCPT + 99 others); Tue, 16 May 2023 22:24:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232048AbjEQCYr (ORCPT ); Tue, 16 May 2023 22:24:47 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D7FA24494; Tue, 16 May 2023 19:24:39 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 410002F4; Tue, 16 May 2023 19:25:24 -0700 (PDT) Received: from a077893.arm.com (unknown [10.163.70.237]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 401C63F793; Tue, 16 May 2023 19:24:33 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com Cc: Anshuman Khandual , Mark Brown , James Clark , Rob Herring , Marc Zyngier , Suzuki Poulose , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , linux-perf-users@vger.kernel.org Subject: [PATCH V10 03/10] arm64/perf: Add branch stack support in struct arm_pmu Date: Wed, 17 May 2023 07:54:03 +0530 Message-Id: <20230517022410.722287-4-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230517022410.722287-1-anshuman.khandual@arm.com> References: <20230517022410.722287-1-anshuman.khandual@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766107978946275893?= X-GMAIL-MSGID: =?utf-8?q?1766107978946275893?= This updates 'struct arm_pmu' for branch stack sampling support later. This adds a new 'features' element in the structure to track supported features, and another 'private' element to encapsulate implementation attributes on a given 'struct arm_pmu'. These updates here will help in tracking any branch stack sampling support, which is being added later. This also adds a helper arm_pmu_branch_stack_supported(). This also enables perf branch stack sampling event on all 'struct arm pmu', supporting the feature but after removing the current gate that blocks such events unconditionally in armpmu_event_init(). Instead a quick probe can be initiated via arm_pmu_branch_stack_supported() to ascertain the support. Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual --- drivers/perf/arm_pmu.c | 3 +-- include/linux/perf/arm_pmu.h | 12 +++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index aada47e3b126..d4a4f2bd89a5 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -510,8 +510,7 @@ static int armpmu_event_init(struct perf_event *event) !cpumask_test_cpu(event->cpu, &armpmu->supported_cpus)) return -ENOENT; - /* does not support taken branch sampling */ - if (has_branch_stack(event)) + if (has_branch_stack(event) && !arm_pmu_branch_stack_supported(armpmu)) return -EOPNOTSUPP; return __hw_perf_event_init(event); diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index f7fbd162ca4c..0da745eaf426 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -102,7 +102,9 @@ struct arm_pmu { int (*map_event)(struct perf_event *event); void (*sched_task)(struct perf_event_pmu_context *pmu_ctx, bool sched_in); int num_events; - bool secure_access; /* 32-bit ARM only */ + unsigned int secure_access : 1, /* 32-bit ARM only */ + has_branch_stack: 1, /* 64-bit ARM only */ + reserved : 30; #define ARMV8_PMUV3_MAX_COMMON_EVENTS 0x40 DECLARE_BITMAP(pmceid_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS); #define ARMV8_PMUV3_EXT_COMMON_EVENT_BASE 0x4000 @@ -118,8 +120,16 @@ struct arm_pmu { /* Only to be used by ACPI probing code */ unsigned long acpi_cpuid; + + /* Implementation specific attributes */ + void *private; }; +static inline bool arm_pmu_branch_stack_supported(struct arm_pmu *armpmu) +{ + return armpmu->has_branch_stack; +} + #define to_arm_pmu(p) (container_of(p, struct arm_pmu, pmu)) u64 armpmu_event_update(struct perf_event *event);