Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes:
- a resctrl fix for uninitialized objects found by debugobjects
- a resctrl memory leak fix
- fix the unintended re-enabling of the of SME and SEV CPU flags if
memory encryption was disabled at bootup via the MSR space"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/CPU/AMD: Ensure clearing of SME/SEV features is maintained
x86/resctrl: Fix potential memory leak
x86/resctrl: Fix an imbalance in domain_remove_cpu()
+6
-6
+2
-2
arch/x86/kernel/cpu/amd.c
+2
-2
arch/x86/kernel/cpu/amd.c
+1
-1
arch/x86/kernel/cpu/resctrl/core.c
+1
-1
arch/x86/kernel/cpu/resctrl/core.c
···
618
618
if (static_branch_unlikely(&rdt_mon_enable_key))
619
619
rmdir_mondata_subdir_allrdtgrp(r, d->id);
620
620
list_del(&d->list);
621
-
if (is_mbm_enabled())
621
+
if (r->mon_capable && is_mbm_enabled())
622
622
cancel_delayed_work(&d->mbm_over);
623
623
if (is_llc_occupancy_enabled() && has_busy_rmid(r, d)) {
624
624
/*
+3
-3
arch/x86/kernel/cpu/resctrl/rdtgroup.c
+3
-3
arch/x86/kernel/cpu/resctrl/rdtgroup.c
···
1741
1741
struct rdt_domain *d;
1742
1742
int cpu;
1743
1743
1744
-
if (!zalloc_cpumask_var(&cpu_mask, GFP_KERNEL))
1745
-
return -ENOMEM;
1746
-
1747
1744
if (level == RDT_RESOURCE_L3)
1748
1745
update = l3_qos_cfg_update;
1749
1746
else if (level == RDT_RESOURCE_L2)
1750
1747
update = l2_qos_cfg_update;
1751
1748
else
1752
1749
return -EINVAL;
1750
+
1751
+
if (!zalloc_cpumask_var(&cpu_mask, GFP_KERNEL))
1752
+
return -ENOMEM;
1753
1753
1754
1754
r_l = &rdt_resources_all[level];
1755
1755
list_for_each_entry(d, &r_l->domains, list) {