From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (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 EC0F631DDBB for ; Thu, 25 Sep 2025 20:04:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758830648; cv=none; b=NS47xzj/JKakkKJ7ZRmKtjiRwynaRoZ4TH3Qj/T5FddGvfH9MQ0jtI1G2L5Q1MYX8rkRrhxXSjKXO7rMLQU/804YDKMqablJiNeal/ACiqsOsipLsIxsNFpxUnB2l2Mh2nfoROOAdSvqC0HUDNjzpX3uG7V5WSaBsUABPLIvemg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758830648; c=relaxed/simple; bh=3UhXG2+nFOE22Y9OsPyaWXsBmdTkUv4k885gDZlF2eQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cnZBdG3/V3dOI44UZKsQApe/pTdFqMrBT4OzI9eF6sWqhI1oKw6luYhe04hjRUYx5I7Xe7novtyX2nv8y7HAv9eigMvMSnIBdl/rVo35gooPAR+qDQgjHv3oz74ooxp7+JVrCPlHrGVFiCKs24RirxtSYO2TKmFckfpowFw/Qk8= 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=PnE1mB32; arc=none smtp.client-ip=198.175.65.21 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="PnE1mB32" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1758830647; x=1790366647; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3UhXG2+nFOE22Y9OsPyaWXsBmdTkUv4k885gDZlF2eQ=; b=PnE1mB32DhVlDfFp31NGxfe4n8II4PIOWZeWFxjVFLxXgt4+zaZvUl58 zRrqIOdt7NQju+0BFGcE4LexMLsHtFx2Co6f5yBD/NuZXnAbNxuAFzHyp 1EqSumpxQiC4w3lNmPRW5fgDlPx3gKXzMLnQ2Yd0ayNaUyaL7QOT8ydeb pbLcRQ9UU+oeiWKHGAnYKyW73AxEMj2mKbZ29lnIU5IBNGnRLGmyzglFZ X+4IuCZCJknKt6Uw7PPbOIeBGn7+DAlWgkhWK+jsJ/kIvbFOcciwfzEo1 Wg+ckwVr/9/GkD6vFWdIIcVnjwWPnG0b2UFrWgFsRRhyGgo3u4xmnR/yR A==; X-CSE-ConnectionGUID: zC2d76CoTd63gVKFCIbPcQ== X-CSE-MsgGUID: QO6qYjaSTBWmcFopng9yrw== X-IronPort-AV: E=McAfee;i="6800,10657,11531"; a="61074162" X-IronPort-AV: E=Sophos;i="6.17,312,1747724400"; d="scan'208";a="61074162" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2025 13:04:05 -0700 X-CSE-ConnectionGUID: pfk54LA2Q2KzhljmU4LYfg== X-CSE-MsgGUID: eq9C6MZ9QH+SfbIoyaqfSg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,293,1751266800"; d="scan'208";a="177003609" Received: from inaky-mobl1.amr.corp.intel.com (HELO agluck-desk3.intel.com) ([10.124.220.206]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2025 13:04:05 -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 v11 04/31] x86/resctrl: Clean up domain_remove_cpu_ctrl() Date: Thu, 25 Sep 2025 13:02:58 -0700 Message-ID: <20250925200328.64155-5-tony.luck@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250925200328.64155-1-tony.luck@intel.com> References: <20250925200328.64155-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 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/resctrl/core.c index b471918bced6..28c8e28bb1dd 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 rdt_resource *r) return; } + 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; d = container_of(hdr, struct rdt_ctrl_domain, hdr); hw_dom = resctrl_to_arch_ctrl_dom(d); - 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 = NULL; - ctrl_domain_free(hw_dom); + resctrl_offline_ctrl_domain(r, d); + list_del_rcu(&hdr->list); + synchronize_rcu(); - 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 = NULL; + ctrl_domain_free(hw_dom); } static void domain_remove_cpu_mon(int cpu, struct rdt_resource *r) -- 2.51.0