Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1664914pxb; Mon, 20 Sep 2021 02:14:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJWRyybyrQE2qEUASC6IWu313YD2oH5d/7uB/cL9qnektTVVkq360FveKX/pVgXOBXHN3K X-Received: by 2002:a50:d8ce:: with SMTP id y14mr22312695edj.92.1632129246756; Mon, 20 Sep 2021 02:14:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632129246; cv=none; d=google.com; s=arc-20160816; b=W+C7Y9Y8E+WQ4882Buft9JnwZWLLy7XxYKScvoankblfgYPa41t5CeGTL+Vjk/2yAP m/O7NybDUpBHo8sMusOPENtHMwC4PFFEmC256jtPzMDCOnuJAhaMDFWo0zHiwmMaGaws ebSZxFs2VlrRrThrOltkptDbevJ1I1xJqjHl3zXLnXFMR8z21nFAOx4FivoRBkWIN+Sx b0LieF7XT0AdbOLd8SjH3hjgqqKahuDmvtjn9MUX2SPwGVAoPqwpGxpofcUZ5DZqlXJX rP6xEJQ7SWtF2sHO8kkWr2OBOfqmcIC0Lnq1Cn3AJsSvwFC+5E4XfgUH7ZiyoqxJYml2 3zug== 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=qyV8+vEm4sZjB/wyqo1NOpKnxfPITMzCujbPuvHPUbY=; b=y1sfhhN3nhR+KxadR48Q5M/jXc97drM8KnuaRIDHsZ9+CRhEfQdMf3d7/rMKAThtHD 3AKYGkDUMXRG5ABLNAmJ8qmCP+YeVt0IOSc3+mipDaT9V9x07NKXUnGn987yFRqAetm/ 2BlZbt8etAGBYj7d9bzJs+Va8TdF23cpmkd2lI8zcdQ12kv7hUmpwNkCmX+EgyfUNpeq Apu0ASqHUyG4SnYJw5BdNmSMN5vg4cC46WQKdLeS2SaraDOamNFlq/fQ/3fNe0iR9nAW Vw2pN8+xFkZaDMVJPvai+JASuzXG45P/kRXZcJ2zxJwtqS4upVPb/bZ3JUBOluq5nLXo zHqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=RBKFbwtn; 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 e23si15544400edj.198.2021.09.20.02.13.42; Mon, 20 Sep 2021 02:14:06 -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=RBKFbwtn; 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 S232607AbhITFK0 (ORCPT + 99 others); Mon, 20 Sep 2021 01:10:26 -0400 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:32664 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231550AbhITFKR (ORCPT ); Mon, 20 Sep 2021 01:10:17 -0400 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18JNT3bO017248; Sun, 19 Sep 2021 22:08:45 -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=qyV8+vEm4sZjB/wyqo1NOpKnxfPITMzCujbPuvHPUbY=; b=RBKFbwtndq4oVobqaTsLkoSzzucVGwxDGonuGfSOYhFsU5vywZWYAgJYf3fr3SkHgGIG 6zTmxwYQBO0vIJ5PsuB6QMOH9P+xDqZ7uZC0aSHZrNgi2kR9BhpnYdp8+1vcUsrAEviK MeS9cvW2oweywQvSbiY9IhkDL56KDgQDb4U5BEUvipgL8LiBRQgp7d2K2/RzT86yMKy6 GB8peOANBDXr/5r+udO93+O0s3c0uyveGFXi0mdS3AyJKwC72y7zbcyIrtZi94N1vhJ+ 7f9Opal3X2W0TjFZkenK4to+hCPTnZfPRoHh0VVW4Hy+qAA3lX3j7f2FJaZ/U01em3W/ XA== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com with ESMTP id 3b6ascgyt0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Sun, 19 Sep 2021 22:08:44 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 19 Sep 2021 22:08:42 -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.18 via Frontend Transport; Sun, 19 Sep 2021 22:08:40 -0700 From: Bharat Bhushan To: , , , , , CC: Bharat Bhushan Subject: [PATCH v4 4/4] perf/marvell: cn10k DDR perf event core ownership Date: Mon, 20 Sep 2021 10:38:23 +0530 Message-ID: <20210920050823.10853-5-bbhushan2@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210920050823.10853-1-bbhushan2@marvell.com> References: <20210920050823.10853-1-bbhushan2@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-GUID: XxBy1iX-jFzQTMzyOgl5lbnLflWkyjXB X-Proofpoint-ORIG-GUID: XxBy1iX-jFzQTMzyOgl5lbnLflWkyjXB 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-09-20_01,2021-09-17_02,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 --- v1->v2->v3->v4: - 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 832d8a74fa59..a4b521f12b58 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -227,6 +227,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