From mboxrd@z Thu Jan 1 00:00:00 1970 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 3AD12C54E58 for ; Tue, 12 Mar 2024 17:34:47 +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=N8O2rVRga7hKD1zdjNOR7e3NM4p1146Z+MgDA9KrPTo=; b=CDpTypUaWYcYay NN1deCd4KvPoaoxx/puMAwIX1USLOzCudWFDTQjCCXUH/J8d2GrdQ5xwwxB9w5SNFmO/MV0EB62w5 7/7PqI1stl+wCA31t1KIthCKvAyiYi7jGTH0WxpiIdeKmZpIC5uDD2pdbVKzVY7nod4n60ONADC4M ZN63490gc+xjo5L1vRSZ0TsqxJZc/aubGZnM0d6L/OEAhae4aoCvarPeA7AcNJxmv9FBpEsAdTPti kP/+HA1rZZYwSWB8wg/YpOwaack3NKDsuWqX+D0bR5ZMFeloAVwyLLaAgDcYh3cbrPNmxi3FOUM+h 9BdGS/UT10Sn2tMK+iqA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rk61I-00000006sBl-2qiT; Tue, 12 Mar 2024 17:34:32 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rk61G-00000006s9v-1sFn for linux-arm-kernel@lists.infradead.org; Tue, 12 Mar 2024 17:34:31 +0000 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 571A315BF; Tue, 12 Mar 2024 10:35:04 -0700 (PDT) Received: from e121345-lin.cambridge.arm.com (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0740E3F762; Tue, 12 Mar 2024 10:34:24 -0700 (PDT) From: Robin Murphy To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Will Deacon Cc: Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org, linux-perf-users@vger.kernel.org, jialong.yang@shingroup.cn, Shuai Xue Subject: [PATCH 01/10] perf/alibaba_uncore_drw: Use correct CPU affinity Date: Tue, 12 Mar 2024 17:34:03 +0000 Message-Id: X-Mailer: git-send-email 2.39.2.101.g768bb238c484.dirty In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240312_103430_567879_4987D4A6 X-CRM114-Status: GOOD ( 15.54 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Although this driver is trying to use the IRQ-multiplexing mechanism to handle context migration correctly, it's failing to make events follow the IRQ instance, instead forcing them onto a per-PMU CPU which is set once at probe time then never maintained. Fix this by using the correct CPU from the IRQ instance, and remove the erroneous per-PMU data plus the redundant check which does not mean what it thinks it means. CC: Shuai Xue Fixes: cf7b61073e45 ("drivers/perf: add DDR Sub-System Driveway PMU driver for Yitian 710 SoC") Signed-off-by: Robin Murphy --- drivers/perf/alibaba_uncore_drw_pmu.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/perf/alibaba_uncore_drw_pmu.c b/drivers/perf/alibaba_uncore_drw_pmu.c index 19d459a36be5..b37e9794823a 100644 --- a/drivers/perf/alibaba_uncore_drw_pmu.c +++ b/drivers/perf/alibaba_uncore_drw_pmu.c @@ -96,8 +96,6 @@ struct ali_drw_pmu { struct list_head pmus_node; struct ali_drw_pmu_irq *irq; - int irq_num; - int cpu; DECLARE_BITMAP(used_mask, ALI_DRW_PMU_COMMON_MAX_COUNTERS); struct perf_event *events[ALI_DRW_PMU_COMMON_MAX_COUNTERS]; int evtids[ALI_DRW_PMU_COMMON_MAX_COUNTERS]; @@ -221,7 +219,7 @@ static ssize_t ali_drw_pmu_cpumask_show(struct device *dev, { struct ali_drw_pmu *drw_pmu = to_ali_drw_pmu(dev_get_drvdata(dev)); - return cpumap_print_to_pagebuf(true, buf, cpumask_of(drw_pmu->cpu)); + return cpumap_print_to_pagebuf(true, buf, cpumask_of(drw_pmu->irq->cpu)); } static struct device_attribute ali_drw_pmu_cpumask_attr = @@ -550,11 +548,7 @@ static int ali_drw_pmu_event_init(struct perf_event *event) return -EOPNOTSUPP; } - event->cpu = drw_pmu->cpu; - if (event->cpu < 0) { - dev_err(dev, "Per-task mode not supported!\n"); - return -EOPNOTSUPP; - } + event->cpu = drw_pmu->irq->cpu; if (event->group_leader != event && !is_software_event(event->group_leader)) { @@ -701,8 +695,6 @@ static int ali_drw_pmu_probe(struct platform_device *pdev) /* clearing interrupt status */ writel(0xffffff, drw_pmu->cfg_base + ALI_DRW_PMU_OV_INTR_CLR); - drw_pmu->cpu = smp_processor_id(); - ret = ali_drw_pmu_init_irq(drw_pmu, pdev); if (ret) return ret; -- 2.39.2.101.g768bb238c484.dirty _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel