From nobody Fri Dec 19 01:26:25 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C6A64171E71 for ; Fri, 14 Jun 2024 15:02:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718377378; cv=none; b=J4BZE6r+/7fIuDgDHmBMfkqClmo0tiFXhyx32fmKGLcFhPi5XhytaQ8a5X3mRdpygQDhtvLLQltyvGukMVPJzQf4gyAxFoCwmeLCVIoP9/5RSVlA6PnyTEmQxH9zfFcNTmb03q6ZaA05HqXfMFtyrDSVLzm79SiTnZarAUDet1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718377378; c=relaxed/simple; bh=3REkFrGSTonuE6zO9pUyO361CSmouNb/Hei9QNXpvHw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=N8X5TIq/t0djwrWIyrwVutW5ce0GF2kK1pHIRu2Y94rpetVE2cxInXg6Y23ueIB5izp5VN/GPPc8lXAO3lCBE4JPZihtfQvROB9j6DrjdnXUR66zlGaxOdtSvQXJYpMiFHGkVpMx7pHga8hzFunbKMGmDGw85Zut+E4XxXB94dc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 A82B11BF3; Fri, 14 Jun 2024 08:03:20 -0700 (PDT) Received: from merodach.members.linode.com (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F3D963F5A1; Fri, 14 Jun 2024 08:02:52 -0700 (PDT) From: James Morse To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , H Peter Anvin , Babu Moger , James Morse , shameerali.kolothum.thodi@huawei.com, D Scott Phillips OS , carl@os.amperecomputing.com, lcherian@marvell.com, bobo.shaobowang@huawei.com, tan.shaopeng@fujitsu.com, baolin.wang@linux.alibaba.com, Jamie Iles , Xin Hao , peternewman@google.com, dfustini@baylibre.com, amitsinght@marvell.com, David Hildenbrand , Rex Nie , Dave Martin , Shaopeng Tan Subject: [PATCH v3 32/38] x86/resctrl: Drop __init/__exit on assorted symbols Date: Fri, 14 Jun 2024 15:00:27 +0000 Message-Id: <20240614150033.10454-33-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240614150033.10454-1-james.morse@arm.com> References: <20240614150033.10454-1-james.morse@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Because ARM's MPAM controls are probed using MMIO, resctrl can't be initialised until enough CPUs are online to have determined the system-wide supported num_closid. Arm64 also supports 'late onlined secondaries', where only a subset of CPUs are online during boot. These two combine to mean the MPAM driver may not be able to initialise resctrl until user-space has brought 'enough' CPUs online. To allow MPAM to initialise resctrl after __init text has been free'd, remove all the __init markings from resctrl. The existing __exit markings cause these functions to be removed by the linker as it has never been possible to build resctrl as a module. MPAM has an error interrupt which causes the driver to reset and disable itself. Remove the __exit markings to allow the MPAM driver to tear down resctrl when an error occurs. Signed-off-by: James Morse Tested-by: Peter Newman Tested-by: Shaopeng Tan --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 8 ++++---- include/linux/resctrl.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r= esctrl/rdtgroup.c index ddf3d0a26517..0936a4cddc9e 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -2055,7 +2055,7 @@ static struct rftype *rdtgroup_get_rftype_by_name(con= st char *name) return NULL; } =20 -static void __init thread_throttle_mode_init(void) +static void thread_throttle_mode_init(void) { struct rdt_resource *r =3D resctrl_arch_get_resource(RDT_RESOURCE_MBA); struct rftype *rft; @@ -4003,7 +4003,7 @@ static void rdtgroup_destroy_root(void) rdtgroup_default.kn =3D NULL; } =20 -static void __init rdtgroup_setup_default(void) +static void rdtgroup_setup_default(void) { mutex_lock(&rdtgroup_mutex); =20 @@ -4196,7 +4196,7 @@ void resctrl_offline_cpu(unsigned int cpu) * * Return: 0 on success or -errno */ -int __init resctrl_init(void) +int resctrl_init(void) { int ret =3D 0; =20 @@ -4253,7 +4253,7 @@ int __init resctrl_init(void) return ret; } =20 -void __exit resctrl_exit(void) +void resctrl_exit(void) { rdtgroup_destroy_root(); debugfs_remove_recursive(debugfs_resctrl); diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h index 3fc5f760e041..31ae6d9a224e 100644 --- a/include/linux/resctrl.h +++ b/include/linux/resctrl.h @@ -452,7 +452,7 @@ void resctrl_arch_reset_rmid_all(struct rdt_resource *r= , struct rdt_domain *d); extern unsigned int resctrl_rmid_realloc_threshold; extern unsigned int resctrl_rmid_realloc_limit; =20 -int __init resctrl_init(void); -void __exit resctrl_exit(void); +int resctrl_init(void); +void resctrl_exit(void); =20 #endif /* _RESCTRL_H */ --=20 2.39.2