From patchwork Mon Nov 7 06:25:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 16252 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1869395wru; Sun, 6 Nov 2022 22:29:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf59dXAZEFnicer+SKxqxGVZz5ak76ft1+jwc6Xu9ds83BC1n8JthbyzYINooNrcCEUtksTb X-Received: by 2002:a05:6402:111a:b0:466:849d:eb5c with SMTP id u26-20020a056402111a00b00466849deb5cmr366187edv.131.1667802556376; Sun, 06 Nov 2022 22:29:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667802556; cv=none; d=google.com; s=arc-20160816; b=RXmGCXZ8cepp7MAFkicUo3tsVYXpoGxkF8/7pRtjjesEQEOcyYWPqqV0862grgTlkn 7cu2O+Su5L6TZ8ybAnc14hlQetKZwVmStZoAZmfE7InmcHxVwmyEzC8g19arN5nmZ1sv 5fIMSLjAqWXpANjxq2Q6st1lnBiUP8XVnoWAbNi4J17vasshXNPczqwm7Jqway1yPIKn PXFID5TX26Xei0kFOc76Ur5pMW0Y4Jj4mBLObYXhZeSshh914TufFO6UcedttfPaYM87 Jo1A4TtCBBSmMrJqVBYaX6Wbh7B3vt02/Yo0nXDsPhXlT5WJzJjPcEamKLGQNsFpLoj+ k1Iw== 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=agDJp7zatiBR+mLOzJfKT3bAIHTIAxFyHnThaZDAjBc=; b=JlxglQSigNsfFBKJJrHbDgi/uRlefNIvX9ViPCXwRaNW7KUdgdXY1SuD61jFsqS9on JrfpQwR3OcfatkwPhNXpK7JqYrH7hZ6kXcjiiaW0GYlA7eeS18/BbhF+qseCz5+HATs+ lvnzf6bmlz3zkU9xPEh0xjpmS9yO5qqoorkkaqow/x9tc1sQKO9KPAPAmlvhy/kqZ+9i c5WZWRNNJhBwPnPfRpRCCp3Z1e0f1x9BPWESANTXeA4cXskds7ltHcbdTrzU/qiIGg7X UAn6/a2MTOhafvhey7gxxspKhMP8hz4l0fKlYij0ybjIhj3dMm9AMKrddezYCLbCD2Dd xLxg== 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 e22-20020a17090658d600b007836ec6999dsi3434867ejs.904.2022.11.06.22.28.49; Sun, 06 Nov 2022 22:29:16 -0800 (PST) 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 S231328AbiKGG0g (ORCPT + 99 others); Mon, 7 Nov 2022 01:26:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231324AbiKGG0T (ORCPT ); Mon, 7 Nov 2022 01:26:19 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2809612AC9; Sun, 6 Nov 2022 22:26:14 -0800 (PST) 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 1752C113E; Sun, 6 Nov 2022 22:26:20 -0800 (PST) Received: from a077893.blr.arm.com (unknown [10.162.42.7]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E30903F534; Sun, 6 Nov 2022 22:26:08 -0800 (PST) From: Anshuman Khandual To: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, peterz@infradead.org, acme@kernel.org, mark.rutland@arm.com, will@kernel.org, catalin.marinas@arm.com Cc: Anshuman Khandual , Mark Brown , James Clark , Rob Herring , Marc Zyngier , Suzuki Poulose , Ingo Molnar Subject: [PATCH V5 7/7] arm64/perf: Enable branch stack sampling Date: Mon, 7 Nov 2022 11:55:14 +0530 Message-Id: <20221107062514.2851047-8-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221107062514.2851047-1-anshuman.khandual@arm.com> References: <20221107062514.2851047-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 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?1748817610980106743?= X-GMAIL-MSGID: =?utf-8?q?1748817732926118784?= Now that all the required pieces are already in place, just enable the perf branch stack sampling support on arm64 platform, by removing the gate which blocks it in armpmu_event_init(). Cc: Mark Rutland Cc: Will Deacon Cc: Catalin Marinas Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Anshuman Khandual --- drivers/perf/arm_pmu.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 1a8dca4e513e..dc5e4f9aca22 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -537,9 +537,28 @@ 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)) - return -EOPNOTSUPP; + if (has_branch_stack(event)) { + /* + * BRBE support is absent. Select CONFIG_ARM_BRBE_PMU + * in the config, before branch stack sampling events + * can be requested. + */ + if (!IS_ENABLED(CONFIG_ARM_BRBE_PMU)) { + pr_info("BRBE is disabled, select CONFIG_ARM_BRBE_PMU\n"); + return -EOPNOTSUPP; + } + + /* + * Branch stack sampling event can not be supported in + * case either the required driver itself is absent or + * BRBE buffer, is not supported. Besides checking for + * the callback prevents a crash in case it's absent. + */ + if (!armpmu->brbe_supported || !armpmu->brbe_supported(event)) { + pr_info("BRBE is not supported\n"); + return -EOPNOTSUPP; + } + } if (armpmu->map_event(event) == -ENOENT) return -ENOENT;