From patchwork Mon Jun 3 09:28:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yicong Yang X-Patchwork-Id: 13683467 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0B707C27C44 for ; Mon, 3 Jun 2024 09:34:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EyomjVfnhG1sM5LPdtKXb0FkYiO3lXLxgxMLQJN9lGA=; b=Alep7oVkx6ec8F EG9sz+ZnWFUUHUXVbfGZ+AQneK+Td2gECrW/28oOSkFs1sQq90Q1Q/zzQBsi+T/riydI0Kra/QQ+q kzL9ewdiBcbny25M5c6DJmJa1x0qj1W+KIzTwG8BmQGL1/T8rYsSTeHtns/D4kRZjppZxIxScr4pi GmagN4Xp+kWn8+YoBKPHpcRkz1mhwekKjDB+ylwoOVLO/hFmaZEuaHVCD7cB8RFFqpwS5ZYVwxQ/o OnC/LlAkaqTE84xJ8nXHaU3Y0sS7By5/rOF7D+UMwkEe9/OZgfd4aPg7+ZfLx7m7C5/ph48lKQ+jd 6Yg5/lKPAl03dGJrwO1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sE44t-0000000GEzz-2yhM; Mon, 03 Jun 2024 09:34:07 +0000 Received: from szxga05-in.huawei.com ([45.249.212.191]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sE44b-0000000GEmf-0KvV for linux-arm-kernel@lists.infradead.org; Mon, 03 Jun 2024 09:33:57 +0000 Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Vt7lw6C5Dz1HCv1; Mon, 3 Jun 2024 17:31:56 +0800 (CST) Received: from kwepemd200014.china.huawei.com (unknown [7.221.188.8]) by mail.maildlp.com (Postfix) with ESMTPS id 0306A1A0188; Mon, 3 Jun 2024 17:33:42 +0800 (CST) Received: from localhost.localdomain (10.50.165.33) by kwepemd200014.china.huawei.com (7.221.188.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.34; Mon, 3 Jun 2024 17:33:41 +0800 From: Yicong Yang To: , , , , , , CC: , , , , , , , , , , Subject: [PATCH 3/3] perf: arm_spe: Only show online CPUs in device's "cpumask" attribute Date: Mon, 3 Jun 2024 17:28:12 +0800 Message-ID: <20240603092812.46616-4-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20240603092812.46616-1-yangyicong@huawei.com> References: <20240603092812.46616-1-yangyicong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.50.165.33] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemd200014.china.huawei.com (7.221.188.8) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240603_023350_271731_E4A06487 X-CRM114-Status: GOOD ( 13.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Yicong Yang When there're CPUs offline after system booting, perf will failed: [root@localhost ~]# /home/yang/perf record -e arm_spe_0// Error: The sys_perf_event_open() syscall returned with 19 (No such device) for event (arm_spe_0//). /bin/dmesg | grep -i perf may provide additional information. This is due to PMU's "cpumask" is not updated and still contains offline CPUs and perf will try to open perf event on the offlined CPUs. Make "cpumask" attribute only shows online CPUs and introduced a new "supported_cpus" where users can get the range of the CPUs this PMU supported monitoring. Signed-off-by: Yicong Yang --- drivers/perf/arm_spe_pmu.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c index 9100d82bfabc..2182f214c587 100644 --- a/drivers/perf/arm_spe_pmu.c +++ b/drivers/perf/arm_spe_pmu.c @@ -254,13 +254,33 @@ static ssize_t cpumask_show(struct device *dev, struct device_attribute *attr, char *buf) { struct arm_spe_pmu *spe_pmu = dev_get_drvdata(dev); + cpumask_var_t mask; + ssize_t n; - return cpumap_print_to_pagebuf(true, buf, &spe_pmu->supported_cpus); + /* If allocation failed then show the supported_cpus */ + if (!alloc_cpumask_var(&mask, GFP_KERNEL)) + return cpumap_print_to_pagebuf(true, buf, &spe_pmu->supported_cpus); + + cpumask_and(mask, &spe_pmu->supported_cpus, cpu_online_mask); + n = cpumap_print_to_pagebuf(true, buf, mask); + free_cpumask_var(mask); + + return n; } static DEVICE_ATTR_RO(cpumask); +static ssize_t supported_cpus_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct arm_spe_pmu *spe_pmu = dev_get_drvdata(dev); + + return cpumap_print_to_pagebuf(true, buf, &spe_pmu->supported_cpus); +} +static DEVICE_ATTR_RO(supported_cpus); + static struct attribute *arm_spe_pmu_attrs[] = { &dev_attr_cpumask.attr, + &dev_attr_supported_cpus.attr, NULL, };