From patchwork Tue Feb 13 18:44:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 200552 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp738311dyb; Tue, 13 Feb 2024 10:45:50 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWJPMq0ukvsd6ivKsPC6rQJwlxIprV7xu3hs4shbEBeIDtwh6d08YeO++tK9wxZ2j/cqNZHl9kW/nfbdwCHXjrWRhJA0A== X-Google-Smtp-Source: AGHT+IEUKHYtWFUsFglTljDuEyJ81k5biy2nD2X/7mjg0nCaJmE64Xn2dmIDDsvdfug+AMZpUOjF X-Received: by 2002:a05:6402:134f:b0:561:fd3f:d75a with SMTP id y15-20020a056402134f00b00561fd3fd75amr374807edw.28.1707849950388; Tue, 13 Feb 2024 10:45:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707849950; cv=pass; d=google.com; s=arc-20160816; b=FK3UzCkKpLU+s9n4lsRBf7YomgXW7KZoJV5t1Mu1+On+UEhyomh3MKrC+j5VF6gejb nBMirps4icTyG7hwGilFXPlrhKzRL5/1MyVrv7ZJz9cXNcUemYXRcHlTmH8z5I0TTATB oK0dTghwC+3jv1emSRYqQ15bZztofd7ufwgtDyMvn938WDlRCp37/u6h+fSbur6P9q8/ LcNw0W/GIAqtqq/yH334Pj6z06t9yJnLLQe6H/KtsW/Q6//BqXloA4MLXYT0fgdCAruN 5F/g/8yH7WEkOT+8gXHWftxmOyi60PgA3Qmyox8La/a1Ek/hyr7sD6eik5Pa+r/E7c47 Q7wQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=Ubd+KdrHeNuK4PbZyo8WR0IZ9Sea2C/GizjNaf/Dq1Y=; fh=NCE4Kspnr11lETLj+y+ZrRYg+Ch2b440ymcFSKRzp2s=; b=n7R34WQw5Fcatm/zDHzMDsQBWoQxP4XB/1b+Bngq6v0Li0i0oPRKbvr7/DGjGN2rqS KzXZf/w0I8rs3er0n02nQjZG32WkW+F32pn/SqSPQq+CioVGzSGEG3b3PIe4WdQtCkfF /aVCiH4AivDR+afgl0U5mFKhgBPgvaJTcsc1KSNJ6dmwNzbdBTGs4TOqbiwAB33TvWjy eA63zfvssI25wS4C6L2zNH1ITGx3zlxlnvqsmpbEWIQYP7oWSxxJ5PscesY11oeC+F7f P+6I229mNQu2fgUlLTSGf1RAb48rxDNm5x4aKAThFb68oKWm+BftZxdqGqr1GNsY1XlE nFiA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-64093-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64093-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com X-Forwarded-Encrypted: i=2; AJvYcCVJll34QSB8kcrPHIZuaYjo8VHXWTFoXG1MF+Nc9uUS3E1EtmJ/6yDzF1ohfgKYht7Ugvr6zFaePp2Eo7on9yLOIaZIFg== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id i1-20020a056402054100b0055ff1384e15si3988904edx.225.2024.02.13.10.45.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 10:45:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64093-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-64093-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64093-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 06FFA1F24D3B for ; Tue, 13 Feb 2024 18:45:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3B8366087C; Tue, 13 Feb 2024 18:45:12 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 095355812E for ; Tue, 13 Feb 2024 18:45:08 +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=1707849910; cv=none; b=rs9R3C9D1RHwGouYsOY88kK9KtE1EvM2ug6CXE8MG/Aje2jXssesgNiwtBryyfT4FTAqh64/IyiDdUfcSQKPfaNrhPXwXQn95ukqhz5NXjdyAQODajg5Y3wMLXwct4Ce0boZ6TQeODL6olLI6pguqpYtZ7SWpkyqIrKvk/C8UUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707849910; c=relaxed/simple; bh=cnu/fw90MUyfw/nm4T5u6mCM9ebJAuqXfvQQKR65YCQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=E/Jv+atH02zO82X6ucNsWuV+ERpv37M8Pb3CxqRPTPRyNBfIX5e0uiy+Uik1T4orz5sLossukihLe36rd3mTVId14k5ul+35M9qYCr4ZylrjNhD1vCa2n7FDknkZjN9rwmtTFCdywp0BFTG/uYRGstW2WY6TWd8kHnQmEvRBYcs= 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 B8358FEC; Tue, 13 Feb 2024 10:45:49 -0800 (PST) Received: from merodach.members.linode.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 532FC3F766; Tue, 13 Feb 2024 10:45:05 -0800 (PST) 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 , Babu Moger Subject: [PATCH v9 02/24] x86/resctrl: kfree() rmid_ptrs from resctrl_exit() Date: Tue, 13 Feb 2024 18:44:16 +0000 Message-Id: <20240213184438.16675-3-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240213184438.16675-1-james.morse@arm.com> References: <20240213184438.16675-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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790810469652452446 X-GMAIL-MSGID: 1790810469652452446 rmid_ptrs[] is allocated from dom_data_init() but never free()d. While the exit text ends up in the linker script's DISCARD section, the direction of travel is for resctrl to be/have loadable modules. Add resctrl_put_mon_l3_config() to cleanup any memory allocated by rdt_get_mon_l3_config(). There is no reason to backport this to a stable kernel. Signed-off-by: James Morse Tested-by: Babu Moger Tested-by: Carl Worth # arm64 Reviewed-by: Babu Moger Reviewed-by: Reinette Chatre --- Changes since v5: * This patch is new Changes since v6: * Removed struct rdt_resource argument, added __exit markers to match the only caller. * Adedd a whole stack of functions to maintain symmetry. Changes since v7: * Moved the eventual kfree() call to be after rdtgroup_exit() Changes since v8: * Removed an unused parameter from some unused code. --- arch/x86/kernel/cpu/resctrl/core.c | 6 ++++++ arch/x86/kernel/cpu/resctrl/internal.h | 1 + arch/x86/kernel/cpu/resctrl/monitor.c | 15 +++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c index aa9810a64258..9641c42d0f85 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -990,8 +990,14 @@ late_initcall(resctrl_late_init); static void __exit resctrl_exit(void) { + struct rdt_resource *r = &rdt_resources_all[RDT_RESOURCE_L3].r_resctrl; + cpuhp_remove_state(rdt_online); + rdtgroup_exit(); + + if (r->mon_capable) + rdt_put_mon_l3_config(); } __exitcall(resctrl_exit); diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h index 52e7e7deee10..61c763604fc9 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -544,6 +544,7 @@ void closid_free(int closid); int alloc_rmid(void); void free_rmid(u32 rmid); int rdt_get_mon_l3_config(struct rdt_resource *r); +void __exit rdt_put_mon_l3_config(void); bool __init rdt_cpu_has(int flag); void mon_event_count(void *info); int rdtgroup_mondata_show(struct seq_file *m, void *arg); diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c index 3a6c069614eb..3a73db0579d8 100644 --- a/arch/x86/kernel/cpu/resctrl/monitor.c +++ b/arch/x86/kernel/cpu/resctrl/monitor.c @@ -719,6 +719,16 @@ static int dom_data_init(struct rdt_resource *r) return 0; } +static void __exit dom_data_exit(void) +{ + mutex_lock(&rdtgroup_mutex); + + kfree(rmid_ptrs); + rmid_ptrs = NULL; + + mutex_unlock(&rdtgroup_mutex); +} + static struct mon_evt llc_occupancy_event = { .name = "llc_occupancy", .evtid = QOS_L3_OCCUP_EVENT_ID, @@ -814,6 +824,11 @@ int __init rdt_get_mon_l3_config(struct rdt_resource *r) return 0; } +void __exit rdt_put_mon_l3_config(void) +{ + dom_data_exit(); +} + void __init intel_rdt_mbm_apply_quirk(void) { int cf_index;