Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1620290pxb; Sun, 22 Aug 2021 23:56:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwz967t1EZRltjnVctowL3mwT44OhBDnKiIQpCxJREl7ndq2ajX5Og1LAt9WZEJ0TqYyBZK X-Received: by 2002:a17:906:1510:: with SMTP id b16mr34758856ejd.332.1629701786417; Sun, 22 Aug 2021 23:56:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629701786; cv=none; d=google.com; s=arc-20160816; b=JxGuxTbqX8qj//wee5V98DYzzhJyyJZ3QZhuOWFcqTIMKyyvWGPW3UWHHC5QFT2Fh9 dXRjrQsBLqQHCtJS7ykBTzmMWCKNthVVmFjfDDdy/iAZ/gphZIjueSp39c5SV4GfPu21 N+LiLunAu4nMQN6aCFy1LZLSURGTS5F/dR0+7QPuysiIFv+odk48AF9A2wxd7sLIvHzH TVlmNiPQzmyGtdEmGvXSLCWlbse/Fi0R42vuath9eY2zrqBQGyETcorDsDqwJGEP7o0E dO8fRPbGLK+ehZOwyIg4u5QoLAnF+weFuLSOjhm8CZGJGVdQIfWriUncgYxefcj7XYtN nKGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=iDnQCy+YUcOur9iCtFyW9wycWDTkD8bKimm2pWvdQWc=; b=s2U/0xboUTq72EmzkhDgrK/LUjwiwHJKQb7iUwXcXYrT8BvQchcSo8vo5S1Ynf41b3 JAxXRnoGRjXfWj232MydaLlxu3CVaMUi9ny+speqwqwoGcWCKgsHL0iJS/rHBSo30xd/ pSxjbrGJwXmQpJwYsxOdcFe8EFtWnWj3/8+uqQgpkBGRgVWf6LHqWSvS59uhUPPRmcG/ J3ezwVfSdHnonjDxoanHZvD10p1bR6abx+cX93w1bzZyETOixErmkFWo6i9nZywjfoJq 4ZeUfwqpC97wv2lUjMTGjcEmAvI9hRVt+fwFoodT2S0hECiPIofot4pqvLIlpF10869B OGhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=f6xKPkTL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z11si13432569ejx.579.2021.08.22.23.56.04; Sun, 22 Aug 2021 23:56:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=f6xKPkTL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234981AbhHWGwp (ORCPT + 99 others); Mon, 23 Aug 2021 02:52:45 -0400 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:9580 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S235006AbhHWGwg (ORCPT ); Mon, 23 Aug 2021 02:52:36 -0400 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.1.2/8.16.0.43) with SMTP id 17N4YS2m012617; Sun, 22 Aug 2021 23:51:47 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=iDnQCy+YUcOur9iCtFyW9wycWDTkD8bKimm2pWvdQWc=; b=f6xKPkTL43iRvltnXNrfvbPsnCXg3wDrZuQv5eT6xxnNOWP8FDBMZtckLXRgkt+xr9Ah FG+xhpL2rvSZn6GWRqeMeAhfbY8MfDqHUXYIQZI/SpMTu1YlI7nh6eTfNWuuO0nrQJ2l sWTeO4ZKws5DdorZ6kqfkpO46TLb7/uAkWhmPFss0Aq+PYeFeA07ti3ZzzrCTiTCKtT0 IiSpn8MeDAKGcJ8R+Fx2KLtuJ80r2N/h3CNGXJ928H1+vw5ZGxhOjOKXROt0T967PXK5 e8KR6I3IvKhH8SFcfwY6tDdksKjnNzOm8ur71cOJ2LZh/pjWcrd8RwPRfgnq5pV0Jeyc 9w== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com with ESMTP id 3am4s0gck2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Sun, 22 Aug 2021 23:51:47 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Sun, 22 Aug 2021 23:51:45 -0700 Received: from bbhushan2.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.23 via Frontend Transport; Sun, 22 Aug 2021 23:51:42 -0700 From: Bharat Bhushan To: , , , , , CC: Bharat Bhushan Subject: [PATCH v3 4/4] perf/marvell: cn10k DDR perf event core ownership Date: Mon, 23 Aug 2021 12:21:21 +0530 Message-ID: <20210823065121.19494-5-bbhushan2@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210823065121.19494-1-bbhushan2@marvell.com> References: <20210823065121.19494-1-bbhushan2@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-GUID: -pbZcvqlzQM8yOl3QZxeW9Ow_dRrUorL X-Proofpoint-ORIG-GUID: -pbZcvqlzQM8yOl3QZxeW9Ow_dRrUorL X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-08-23_02,2021-08-20_03,2020-04-07_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As DDR perf event counters are not per core, so they should be accessed only by one core at a time. Select new core when previously owning core is going offline. Signed-off-by: Bharat Bhushan --- v2->v3: - No change drivers/perf/marvell_cn10k_ddr_pmu.c | 50 ++++++++++++++++++++++++++-- include/linux/cpuhotplug.h | 1 + 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/drivers/perf/marvell_cn10k_ddr_pmu.c b/drivers/perf/marvell_cn10k_ddr_pmu.c index 21fccb9090c5..bef0cee3a46a 100644 --- a/drivers/perf/marvell_cn10k_ddr_pmu.c +++ b/drivers/perf/marvell_cn10k_ddr_pmu.c @@ -129,6 +129,7 @@ struct cn10k_ddr_pmu { int active_events; struct perf_event *events[DDRC_PERF_NUM_COUNTERS]; struct hrtimer hrtimer; + struct hlist_node node; }; #define to_cn10k_ddr_pmu(p) container_of(p, struct cn10k_ddr_pmu, pmu) @@ -610,6 +611,24 @@ static enum hrtimer_restart cn10k_ddr_pmu_timer_handler(struct hrtimer *hrtimer) return HRTIMER_RESTART; } +static int cn10k_ddr_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node) +{ + struct cn10k_ddr_pmu *pmu = hlist_entry_safe(node, struct cn10k_ddr_pmu, + node); + unsigned int target; + + if (cpu != pmu->cpu) + return 0; + + target = cpumask_any_but(cpu_online_mask, cpu); + if (target >= nr_cpu_ids) + return 0; + + perf_pmu_migrate_context(&pmu->pmu, cpu, target); + pmu->cpu = target; + return 0; +} + static int cn10k_ddr_perf_probe(struct platform_device *pdev) { struct cn10k_ddr_pmu *ddr_pmu; @@ -661,18 +680,31 @@ static int cn10k_ddr_perf_probe(struct platform_device *pdev) hrtimer_init(&ddr_pmu->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ddr_pmu->hrtimer.function = cn10k_ddr_pmu_timer_handler; + cpuhp_state_add_instance_nocalls( + CPUHP_AP_PERF_ARM_MARVELL_CN10K_DDR_ONLINE, + &ddr_pmu->node); + ret = perf_pmu_register(&ddr_pmu->pmu, name, -1); if (ret) - return ret; + goto error; pr_info("CN10K DDR PMU Driver for ddrc@%llx\n", res->start); return 0; +error: + cpuhp_state_remove_instance_nocalls( + CPUHP_AP_PERF_ARM_MARVELL_CN10K_DDR_ONLINE, + &ddr_pmu->node); + return ret; } static int cn10k_ddr_perf_remove(struct platform_device *pdev) { struct cn10k_ddr_pmu *ddr_pmu = platform_get_drvdata(pdev); + cpuhp_state_remove_instance_nocalls( + CPUHP_AP_PERF_ARM_MARVELL_CN10K_DDR_ONLINE, + &ddr_pmu->node); + perf_pmu_unregister(&ddr_pmu->pmu); return 0; } @@ -695,12 +727,26 @@ static struct platform_driver cn10k_ddr_pmu_driver = { static int __init cn10k_ddr_pmu_init(void) { - return platform_driver_register(&cn10k_ddr_pmu_driver); + int ret; + + ret = cpuhp_setup_state_multi( + CPUHP_AP_PERF_ARM_MARVELL_CN10K_DDR_ONLINE, + "perf/marvell/cn10k/ddr:online", NULL, + cn10k_ddr_pmu_offline_cpu); + if (ret) + return ret; + + ret = platform_driver_register(&cn10k_ddr_pmu_driver); + if (ret) + cpuhp_remove_multi_state( + CPUHP_AP_PERF_ARM_MARVELL_CN10K_DDR_ONLINE); + return ret; } static void __exit cn10k_ddr_pmu_exit(void) { platform_driver_unregister(&cn10k_ddr_pmu_driver); + cpuhp_remove_multi_state(CPUHP_AP_PERF_ARM_MARVELL_CN10K_DDR_ONLINE); } module_init(cn10k_ddr_pmu_init); diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 47e13582d9fc..ce7f2740d7db 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -185,6 +185,7 @@ enum cpuhp_state { CPUHP_AP_PERF_ARM_QCOM_L3_ONLINE, CPUHP_AP_PERF_ARM_APM_XGENE_ONLINE, CPUHP_AP_PERF_ARM_CAVIUM_TX2_UNCORE_ONLINE, + CPUHP_AP_PERF_ARM_MARVELL_CN10K_DDR_ONLINE, CPUHP_AP_PERF_POWERPC_NEST_IMC_ONLINE, CPUHP_AP_PERF_POWERPC_CORE_IMC_ONLINE, CPUHP_AP_PERF_POWERPC_THREAD_IMC_ONLINE, -- 2.17.1