From nobody Fri Dec 19 19:01:17 2025 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (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 5478930275F for ; Mon, 13 Oct 2025 22:34:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760394844; cv=none; b=P2CrfwXPLu+BVoK8k4mAbPosk7d7ARmrV0j2xGU2vers4EOfwYvXwi/tKZl+osXflsY/kIfPB+SFEtANbIRy9f2KzIOB7e/4JGIhecqqKPlCLDluhIn3/LU2ByZoavF6yxT9Y3XarjqjFxEPKK43dyvAxnowMflzo6eAgEHwdoY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760394844; c=relaxed/simple; bh=/hGO1ZbmzYgehJkTwqb+3EV+zea9ICizU5V8kIZ5Fpc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gXIIWN9kLTdijb08I0AdIVWh5LPq+mRzCNv01qPrrVSVBoHsiiXJmJtMp2lUjgO9FI6EP58qT+3HZvh+R8Yyv27bBUlmDXvODapIPel2u79CqyO73CFrHb048KfD8ctYikYQ7EQ9qMrgEHhQa/crCaFdPVKXtzTCyrIxdif4QQ4= 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=SuyILyDG; arc=none smtp.client-ip=198.175.65.9 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="SuyILyDG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760394843; x=1791930843; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/hGO1ZbmzYgehJkTwqb+3EV+zea9ICizU5V8kIZ5Fpc=; b=SuyILyDGjukeOwIAYVqUoPrePADvu2t0I+reRyiWoUUE71oTU5rwXuX+ CH3tVrqXalauAtyHG/s3/k+Zs8MBbhmAH8AQWMBp6w9F8kb5OgSASDGgO +Ko9Vd/yTRsRRR5xX2UBPWr5OP3zjVyIE3kainsF3gec5yNKwTAPcsCnc V7fAQtuRRMPI1CKLnfAvrysMRcCeRXFx4EfjZ4tPLbDnc4p1O0nF9mAG1 jFbKwpLbgTD+NwjmK8c24SH3jOIZ4qKpGVk/ytLkGpzrO0jFHGnN+Bgj5 A+b2pOq0PrdgfsG67WMboJSN5j9AX9E+/xK0kpbbi8+d+7DJfwYlPmrje Q==; X-CSE-ConnectionGUID: MD+ygfpTTAOVb07TbPZTZQ== X-CSE-MsgGUID: UHqmHdZ5R6q0gDIVgJMkrA== X-IronPort-AV: E=McAfee;i="6800,10657,11581"; a="85168753" X-IronPort-AV: E=Sophos;i="6.19,226,1754982000"; d="scan'208";a="85168753" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2025 15:34:00 -0700 X-CSE-ConnectionGUID: YtA4lovYRGyHMLdiQlBzRg== X-CSE-MsgGUID: X+fMTOT9RiSzvYJKiFXDlg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,226,1754982000"; d="scan'208";a="182145254" Received: from sramkris-mobl1.amr.corp.intel.com (HELO agluck-desk3.intel.com) ([10.124.222.79]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2025 15:33:59 -0700 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Maciej Wieczor-Retman , Peter Newman , James Morse , Babu Moger , Drew Fustini , Dave Martin , Chen Yu Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v12 04/31] x86/resctrl: Clean up domain_remove_cpu_ctrl() Date: Mon, 13 Oct 2025 15:33:18 -0700 Message-ID: <20251013223348.103390-5-tony.luck@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013223348.103390-1-tony.luck@intel.com> References: <20251013223348.103390-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" For symmetry with domain_remove_cpu_mon() refactor domain_remove_cpu_ctrl() to take an early return when removing a CPU does not empty the domain. Signed-off-by: Tony Luck Reviewed-by: Reinette Chatre --- arch/x86/kernel/cpu/resctrl/core.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resct= rl/core.c index c7bfaa391e9f..b28663757dcf 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -599,28 +599,27 @@ static void domain_remove_cpu_ctrl(int cpu, struct rd= t_resource *r) return; } =20 + cpumask_clear_cpu(cpu, &hdr->cpu_mask); + if (!cpumask_empty(&hdr->cpu_mask)) + return; + if (!domain_header_is_valid(hdr, RESCTRL_CTRL_DOMAIN, r->rid)) return; =20 d =3D container_of(hdr, struct rdt_ctrl_domain, hdr); hw_dom =3D resctrl_to_arch_ctrl_dom(d); =20 - cpumask_clear_cpu(cpu, &d->hdr.cpu_mask); - if (cpumask_empty(&d->hdr.cpu_mask)) { - resctrl_offline_ctrl_domain(r, d); - list_del_rcu(&d->hdr.list); - synchronize_rcu(); - - /* - * rdt_ctrl_domain "d" is going to be freed below, so clear - * its pointer from pseudo_lock_region struct. - */ - if (d->plr) - d->plr->d =3D NULL; - ctrl_domain_free(hw_dom); + resctrl_offline_ctrl_domain(r, d); + list_del_rcu(&hdr->list); + synchronize_rcu(); =20 - return; - } + /* + * rdt_ctrl_domain "d" is going to be freed below, so clear + * its pointer from pseudo_lock_region struct. + */ + if (d->plr) + d->plr->d =3D NULL; + ctrl_domain_free(hw_dom); } =20 static void domain_remove_cpu_mon(int cpu, struct rdt_resource *r) --=20 2.51.0