From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 D53B622D4DD for ; Fri, 11 Jul 2025 23:53:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752278037; cv=none; b=qveiftwSKCnfLKcypmk8nhRDk6P+KBQU5ZS/EHHHapNbu3igN09Eo2z/ax5BRd1HDL6R0dp7eEdaRBT3OiZ7gacMSzsK5l4oDIXl6sC/tG78Dgw63r0B2WBjE+wjUz1V6Bf7mAJxmpHKdCiIsDDulGYByiNwURCpn53iAQE4Cyk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752278037; c=relaxed/simple; bh=yJ31FHyo8MlHu1eR5B+4m26jJtmtB+HqdG/FsH6GpPI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D16QBSiLSwtjHyG2BLZpVCRn5WLBshjXf42DhxQJXfndb8/X2fDPAcXpMMD/LlZanUuCjKcHcpohrn3YzQD20lNbSkWwB0hXgAkwIhTgZ4SvLjzHBbW7DZSkmj7kd+sMBFQOIYmpCxRpP4GVy83Mf/LFG9QSBcBnPvPrUbVRCUI= 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=N6v2Qf1d; arc=none smtp.client-ip=198.175.65.20 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="N6v2Qf1d" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1752278035; x=1783814035; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yJ31FHyo8MlHu1eR5B+4m26jJtmtB+HqdG/FsH6GpPI=; b=N6v2Qf1djVH0GXEvJlCD9RpLIEZx3fDShS6U10PNMCjwlXOT9HY+hqSS Ehl0BgkQqSv2XoArwBi/kYrxUKUeoIV+DhV4O/vWXUiEDn9OnR3wfE+UZ jqayvNerBkqmvcJsLEA9kYvqKlunu37pAsFlWW5bJF2uOjwdZU7hIPVP9 SFXK9zI55tLnIYxSC+iWaPwPV1yHH2N+rxTjo52rr4iCyY0PXWeKa46f1 PRV9JbQ6qACv2FhwsnJfdP4G5L8q4RipSwQ4maYRNdhcLXQhlYtxUMPtn mvolimPYnPbgQWOP+KpmLn1ly+OtrWzXCiU4sip0JEpIahS8gYMeYg/Ql w==; X-CSE-ConnectionGUID: AcwxTHzBQr2E70Sb30BroA== X-CSE-MsgGUID: j1enLXKOSyuHyeTfMHXA9w== X-IronPort-AV: E=McAfee;i="6800,10657,11491"; a="54292627" X-IronPort-AV: E=Sophos;i="6.16,305,1744095600"; d="scan'208";a="54292627" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2025 16:53:54 -0700 X-CSE-ConnectionGUID: uGlT32WHRU6kCQ7cYAtE+Q== X-CSE-MsgGUID: 4deIDF6kT9a4YaAUuq5YsA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,305,1744095600"; d="scan'208";a="155902107" Received: from agluck-desk3.sc.intel.com ([172.25.103.51]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2025 16:53:54 -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 v7 07/31] x86,fs/resctrl: Refactor domain_remove_cpu_mon() ready for new domain types Date: Fri, 11 Jul 2025 16:53:14 -0700 Message-ID: <20250711235341.113933-8-tony.luck@intel.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250711235341.113933-1-tony.luck@intel.com> References: <20250711235341.113933-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Historically all monitoring events have been associated with the L3 resource. This will change when support for telemetry events is added. The RDT_RESOURCE_L3 resource carries a lot of state in the domain structures which needs to be dealt with when a domain is taken offline by removing the last CPU in the domain. Refactor domain_remove_cpu_mon() so all the L3 processing is separated from general actions of clearing the CPU bit in the mask and removing directories from mon_data. resctrl_offline_mon_domain() needs to remove domain specific directories and files from the "mon_data" directories, but can skip the L3 resource specific cleanup when called for other resource types. Signed-off-by: Tony Luck --- arch/x86/kernel/cpu/resctrl/core.c | 17 +++++++++++------ fs/resctrl/rdtgroup.c | 5 ++++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c index 20b6f2bbf858..49e17c246c60 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -648,17 +648,22 @@ static void domain_remove_cpu_mon(int cpu, struct rdt_resource *r) if (!domain_header_is_valid(hdr, RESCTRL_MON_DOMAIN, r->rid)) return; - d = container_of(hdr, struct rdt_mon_domain, hdr); - hw_dom = resctrl_to_arch_mon_dom(d); + cpumask_clear_cpu(cpu, &hdr->cpu_mask); + if (!cpumask_empty(&hdr->cpu_mask)) + return; - cpumask_clear_cpu(cpu, &d->hdr.cpu_mask); - if (cpumask_empty(&d->hdr.cpu_mask)) { + switch (r->rid) { + case RDT_RESOURCE_L3: + d = container_of(hdr, struct rdt_mon_domain, hdr); + hw_dom = resctrl_to_arch_mon_dom(d); resctrl_offline_mon_domain(r, d); list_del_rcu(&d->hdr.list); synchronize_rcu(); mon_domain_free(hw_dom); - - return; + break; + default: + pr_warn_once("Unknown resource rid=%d\n", r->rid); + break; } } diff --git a/fs/resctrl/rdtgroup.c b/fs/resctrl/rdtgroup.c index 77336d5e4915..05438e15e2ca 100644 --- a/fs/resctrl/rdtgroup.c +++ b/fs/resctrl/rdtgroup.c @@ -4047,6 +4047,9 @@ void resctrl_offline_mon_domain(struct rdt_resource *r, struct rdt_mon_domain *d if (resctrl_mounted && resctrl_arch_mon_capable()) rmdir_mondata_subdir_allrdtgrp(r, d); + if (r->rid != RDT_RESOURCE_L3) + goto out_unlock; + if (resctrl_is_mbm_enabled()) cancel_delayed_work(&d->mbm_over); if (resctrl_is_mon_event_enabled(QOS_L3_OCCUP_EVENT_ID) && has_busy_rmid(d)) { @@ -4063,7 +4066,7 @@ void resctrl_offline_mon_domain(struct rdt_resource *r, struct rdt_mon_domain *d } domain_destroy_mon_state(d); - +out_unlock: mutex_unlock(&rdtgroup_mutex); } -- 2.50.0