Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

x86/resctrl: Clean up domain_remove_cpu_ctrl()

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 <tony.luck@intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Link: https://lore.kernel.org/20251217172121.12030-1-tony.luck@intel.com

authored by

Tony Luck and committed by
Borislav Petkov (AMD)
c1b63057 6396fc53

+14 -15
+14 -15
arch/x86/kernel/cpu/resctrl/core.c
··· 604 604 return; 605 605 } 606 606 607 + cpumask_clear_cpu(cpu, &hdr->cpu_mask); 608 + if (!cpumask_empty(&hdr->cpu_mask)) 609 + return; 610 + 607 611 if (!domain_header_is_valid(hdr, RESCTRL_CTRL_DOMAIN, r->rid)) 608 612 return; 609 613 610 614 d = container_of(hdr, struct rdt_ctrl_domain, hdr); 611 615 hw_dom = resctrl_to_arch_ctrl_dom(d); 612 616 613 - cpumask_clear_cpu(cpu, &d->hdr.cpu_mask); 614 - if (cpumask_empty(&d->hdr.cpu_mask)) { 615 - resctrl_offline_ctrl_domain(r, d); 616 - list_del_rcu(&d->hdr.list); 617 - synchronize_rcu(); 617 + resctrl_offline_ctrl_domain(r, d); 618 + list_del_rcu(&hdr->list); 619 + synchronize_rcu(); 618 620 619 - /* 620 - * rdt_ctrl_domain "d" is going to be freed below, so clear 621 - * its pointer from pseudo_lock_region struct. 622 - */ 623 - if (d->plr) 624 - d->plr->d = NULL; 625 - ctrl_domain_free(hw_dom); 626 - 627 - return; 628 - } 621 + /* 622 + * rdt_ctrl_domain "d" is going to be freed below, so clear 623 + * its pointer from pseudo_lock_region struct. 624 + */ 625 + if (d->plr) 626 + d->plr->d = NULL; 627 + ctrl_domain_free(hw_dom); 629 628 } 630 629 631 630 static void domain_remove_cpu_mon(int cpu, struct rdt_resource *r)