Merge branch 'x86/cache' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 11 insertions, 6 deletions

diff --git a/arch/x86/kernel/cpu/intel_rdt.c b/arch/x86/kernel/cpu/intel_rdt.c
index abb71ac70443..44272b7107ad 100644
--- a/arch/x86/kernel/cpu/intel_rdt.c
+++ b/arch/x86/kernel/cpu/intel_rdt.c
@@ -485,9 +485,7 @@ static int domain_setup_mon_state(struct rdt_resource *r, struct rdt_domain *d)
         size_t tsize;
 
         if (is_llc_occupancy_enabled()) {
-                d->rmid_busy_llc = kcalloc(BITS_TO_LONGS(r->num_rmid),
-                                           sizeof(unsigned long),
-                                           GFP_KERNEL);
+                d->rmid_busy_llc = bitmap_zalloc(r->num_rmid, GFP_KERNEL);
                 if (!d->rmid_busy_llc)
                         return -ENOMEM;
                 INIT_DELAYED_WORK(&d->cqm_limbo, cqm_handle_limbo);
@@ -496,7 +494,7 @@ static int domain_setup_mon_state(struct rdt_resource *r, struct rdt_domain *d)
                 tsize = sizeof(*d->mbm_total);
                 d->mbm_total = kcalloc(r->num_rmid, tsize, GFP_KERNEL);
                 if (!d->mbm_total) {
-                        kfree(d->rmid_busy_llc);
+                        bitmap_free(d->rmid_busy_llc);
                         return -ENOMEM;
                 }
         }
@@ -504,7 +502,7 @@ static int domain_setup_mon_state(struct rdt_resource *r, struct rdt_domain *d)
                 tsize = sizeof(*d->mbm_local);
                 d->mbm_local = kcalloc(r->num_rmid, tsize, GFP_KERNEL);
                 if (!d->mbm_local) {
-                        kfree(d->rmid_busy_llc);
+                        bitmap_free(d->rmid_busy_llc);
                         kfree(d->mbm_total);
                         return -ENOMEM;
                 }
@@ -610,9 +608,16 @@ static void domain_remove_cpu(int cpu, struct rdt_resource *r)
                         cancel_delayed_work(&d->cqm_limbo);
                 }
 
+                /*
+                 * rdt_domain "d" is going to be freed below, so clear
+                 * its pointer from pseudo_lock_region struct.
+                 */
+                if (d->plr)
+                        d->plr->d = NULL;
+
                 kfree(d->ctrl_val);
                 kfree(d->mbps_val);
-                kfree(d->rmid_busy_llc);
+                bitmap_free(d->rmid_busy_llc);
                 kfree(d->mbm_total);
                 kfree(d->mbm_local);
                 kfree(d);