From nobody Sun Oct 5 01:47:25 2025 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DD392E541A for ; Mon, 11 Aug 2025 18:17:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754936269; cv=none; b=DkcUfQMeINXj5GsPl4tZxVpShMyBmVP3ROkREMbZ5eLTQ7jd29svRvbkAtd27wocPHyGMDQsdt0SBrrWw+KZOYUbnxof88apt/JwGyh88nl8smrx4vAUavoXWqeCYTHHwEMrumJmopyi5zo4vFhgkQdu7lfqqa8T1qpB4xtNpLs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754936269; c=relaxed/simple; bh=b6IVqR9pDUjerzkW1aPFwxLkZVvGGdytWKlMSyP1xH8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i2r+6+UdyWzZpobjcJ7B8Y5iHNg84n4uJ9VWDzm0+A2XFI+iZeL0wwnYPg7dDMJhVLgatq8LrHWIiMsPqtj6g7L1OFx1aJ+vxWmkq/k7Tlqt5k54cFdHsrY9t1az3W5FEkNNkSBFVCmspvbNsLIw+tWnY4j2/I5ED789cG2ljuI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Qg90mH7i; arc=none smtp.client-ip=198.175.65.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Qg90mH7i" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1754936268; x=1786472268; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=b6IVqR9pDUjerzkW1aPFwxLkZVvGGdytWKlMSyP1xH8=; b=Qg90mH7irnr/HhgLp1sMLbp5dATrsoViVpZiFdCMHiTAaGnyKwPWvKws SPKJlobATLZxOaP4rJqHhzTpuwiU1aGF4E7JIhCG6P83ZIDH6nDEnETqF 3tLH9sUZVgr69REi8wGWjJkokN647ashRXCppMLpnFpcsH7IV/Q9I1kH+ nyzbnreA3jD2JPRxSI+mfqlkxBL27bVPvptrz7cF6cNouKhqlYQ6kJVO4 U5XkCVbgJOZ/FjFUk5L7jqeeR1DmUb/pfcD+jsd1pL6/NixF+vXr950/8 G5PaZJvSwxivtVIxsdB3CMiLLusyLFVDaZNUAajCgd5u+KLtUSTk23l1i g==; X-CSE-ConnectionGUID: k97X4CgNRZqdDN0qb+q8rw== X-CSE-MsgGUID: 5XNQq5rWR6qZjrtvdpvcGg== X-IronPort-AV: E=McAfee;i="6800,10657,11518"; a="68277499" X-IronPort-AV: E=Sophos;i="6.17,278,1747724400"; d="scan'208";a="68277499" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2025 11:17:27 -0700 X-CSE-ConnectionGUID: zuPWe7FZTe+htSNyvV3dVw== X-CSE-MsgGUID: cu2geDdiTKu24k7Sm9UdyQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.17,278,1747724400"; d="scan'208";a="196825702" Received: from puneetse-mobl.amr.corp.intel.com (HELO agluck-desk3.home.arpa) ([10.124.221.229]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2025 11:17:26 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Maciej Wieczor-Retman , Peter Newman , James Morse , Babu Moger , Drew Fustini , Dave Martin , Anil Keshavamurthy , Chen Yu Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v8 26/32] fs/resctrl: Move allocation/free of closid_num_dirty_rmid Date: Mon, 11 Aug 2025 11:17:00 -0700 Message-ID: <20250811181709.6241-27-tony.luck@intel.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250811181709.6241-1-tony.luck@intel.com> References: <20250811181709.6241-1-tony.luck@intel.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" closid_num_dirty_rmid[] is allocated in dom_data_init() and freed by dom_data_exit() giving it the same life cycle as rmid_ptrs[]. Move the alloc/free out to resctrl_mon_l3_resource_init() and resctrl_mon_l3_resource_exit() in preparation for rmid_ptrs[] to be allocated on resctrl mount in support of the new telemetry events. Signed-off-by: Tony Luck --- fs/resctrl/monitor.c | 56 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/fs/resctrl/monitor.c b/fs/resctrl/monitor.c index 40c66caf299d..0d9c8d4e0e9c 100644 --- a/fs/resctrl/monitor.c +++ b/fs/resctrl/monitor.c @@ -805,36 +805,14 @@ void mbm_setup_overflow_handler(struct rdt_l3_mon_dom= ain *dom, unsigned long del static int dom_data_init(struct rdt_resource *r) { u32 idx_limit =3D resctrl_arch_system_num_rmid_idx(); - u32 num_closid =3D resctrl_arch_get_num_closid(r); struct rmid_entry *entry =3D NULL; int err =3D 0, i; u32 idx; =20 mutex_lock(&rdtgroup_mutex); - if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) { - u32 *tmp; - - /* - * If the architecture hasn't provided a sanitised value here, - * this may result in larger arrays than necessary. Resctrl will - * use a smaller system wide value based on the resources in - * use. - */ - tmp =3D kcalloc(num_closid, sizeof(*tmp), GFP_KERNEL); - if (!tmp) { - err =3D -ENOMEM; - goto out_unlock; - } - - closid_num_dirty_rmid =3D tmp; - } =20 rmid_ptrs =3D kcalloc(idx_limit, sizeof(struct rmid_entry), GFP_KERNEL); if (!rmid_ptrs) { - if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) { - kfree(closid_num_dirty_rmid); - closid_num_dirty_rmid =3D NULL; - } err =3D -ENOMEM; goto out_unlock; } @@ -870,11 +848,6 @@ static void dom_data_exit(struct rdt_resource *r) if (!r->mon_capable) goto out_unlock; =20 - if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) { - kfree(closid_num_dirty_rmid); - closid_num_dirty_rmid =3D NULL; - } - kfree(rmid_ptrs); rmid_ptrs =3D NULL; =20 @@ -957,9 +930,31 @@ int resctrl_mon_l3_resource_init(void) if (!r->mon_capable) return 0; =20 + if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) { + u32 num_closid =3D resctrl_arch_get_num_closid(r); + u32 *tmp; + + /* + * If the architecture hasn't provided a sanitised value here, + * this may result in larger arrays than necessary. Resctrl will + * use a smaller system wide value based on the resources in + * use. + */ + tmp =3D kcalloc(num_closid, sizeof(*tmp), GFP_KERNEL); + if (!tmp) + return -ENOMEM; + + closid_num_dirty_rmid =3D tmp; + } + ret =3D dom_data_init(r); - if (ret) + if (ret) { + if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) { + kfree(closid_num_dirty_rmid); + closid_num_dirty_rmid =3D NULL; + } return ret; + } =20 if (resctrl_arch_is_evt_configurable(QOS_L3_MBM_TOTAL_EVENT_ID)) { mon_event_all[QOS_L3_MBM_TOTAL_EVENT_ID].configurable =3D true; @@ -984,5 +979,10 @@ void resctrl_mon_l3_resource_exit(void) { struct rdt_resource *r =3D resctrl_arch_get_resource(RDT_RESOURCE_L3); =20 + if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) { + kfree(closid_num_dirty_rmid); + closid_num_dirty_rmid =3D NULL; + } + dom_data_exit(r); } --=20 2.50.1