x86/resctrl: Allow arch to allocate memory needed in resctrl_arch_rmid_read()

[sfrench/cifs-2.6.git] / arch / x86 / kernel / cpu / resctrl / monitor.c

diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
index e8aeff6673ea34e7f9a553c5cf97f84329f28802..9b503e6ac490f6e55bb6c34a15f6e393c1e83df2 100644 (file)
--- a/arch/x86/kernel/cpu/resctrl/monitor.c
+++ b/arch/x86/kernel/cpu/resctrl/monitor.c
@@ -269,7 +269,7 @@ static u64 mbm_overflow_count(u64 prev_msr, u64 cur_msr, unsigned int width)
 
 int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain *d,
                           u32 unused, u32 rmid, enum resctrl_event_id eventid,
-                          u64 *val)
+                          u64 *val, void *ignored)
 {
        struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
        struct rdt_hw_domain *hw_dom = resctrl_to_arch_dom(d);
@@ -324,9 +324,17 @@ void __check_limbo(struct rdt_domain *d, bool force_free)
        u32 idx_limit = resctrl_arch_system_num_rmid_idx();
        struct rmid_entry *entry;
        u32 idx, cur_idx = 1;
+       void *arch_mon_ctx;
        bool rmid_dirty;
        u64 val = 0;
 
+       arch_mon_ctx = resctrl_arch_mon_ctx_alloc(r, QOS_L3_OCCUP_EVENT_ID);
+       if (IS_ERR(arch_mon_ctx)) {
+               pr_warn_ratelimited("Failed to allocate monitor context: %ld",
+                                   PTR_ERR(arch_mon_ctx));
+               return;
+       }
+
        /*
         * Skip RMID 0 and start from RMID 1 and check all the RMIDs that
         * are marked as busy for occupancy < threshold. If the occupancy
@@ -340,7 +348,8 @@ void __check_limbo(struct rdt_domain *d, bool force_free)
 
                entry = __rmid_entry(idx);
                if (resctrl_arch_rmid_read(r, d, entry->closid, entry->rmid,
-                                          QOS_L3_OCCUP_EVENT_ID, &val)) {
+                                          QOS_L3_OCCUP_EVENT_ID, &val,
+                                          arch_mon_ctx)) {
                        rmid_dirty = true;
                } else {
                        rmid_dirty = (val >= resctrl_rmid_realloc_threshold);
@@ -353,6 +362,8 @@ void __check_limbo(struct rdt_domain *d, bool force_free)
                }
                cur_idx = idx + 1;
        }
+
+       resctrl_arch_mon_ctx_free(r, QOS_L3_OCCUP_EVENT_ID, arch_mon_ctx);
 }
 
 bool has_busy_rmid(struct rdt_domain *d)
@@ -533,7 +544,7 @@ static int __mon_event_count(u32 closid, u32 rmid, struct rmid_read *rr)
        }
 
        rr->err = resctrl_arch_rmid_read(rr->r, rr->d, closid, rmid, rr->evtid,
-                                        &tval);
+                                        &tval, rr->arch_mon_ctx);
        if (rr->err)
                return rr->err;
 
@@ -722,11 +733,27 @@ static void mbm_update(struct rdt_resource *r, struct rdt_domain *d,
        if (is_mbm_total_enabled()) {
                rr.evtid = QOS_L3_MBM_TOTAL_EVENT_ID;
                rr.val = 0;
+               rr.arch_mon_ctx = resctrl_arch_mon_ctx_alloc(rr.r, rr.evtid);
+               if (IS_ERR(rr.arch_mon_ctx)) {
+                       pr_warn_ratelimited("Failed to allocate monitor context: %ld",
+                                           PTR_ERR(rr.arch_mon_ctx));
+                       return;
+               }
+
                __mon_event_count(closid, rmid, &rr);
+
+               resctrl_arch_mon_ctx_free(rr.r, rr.evtid, rr.arch_mon_ctx);
        }
        if (is_mbm_local_enabled()) {
                rr.evtid = QOS_L3_MBM_LOCAL_EVENT_ID;
                rr.val = 0;
+               rr.arch_mon_ctx = resctrl_arch_mon_ctx_alloc(rr.r, rr.evtid);
+               if (IS_ERR(rr.arch_mon_ctx)) {
+                       pr_warn_ratelimited("Failed to allocate monitor context: %ld",
+                                           PTR_ERR(rr.arch_mon_ctx));
+                       return;
+               }
+
                __mon_event_count(closid, rmid, &rr);
 
                /*
@@ -736,6 +763,8 @@ static void mbm_update(struct rdt_resource *r, struct rdt_domain *d,
                 */
                if (is_mba_sc(NULL))
                        mbm_bw_count(closid, rmid, &rr);
+
+               resctrl_arch_mon_ctx_free(rr.r, rr.evtid, rr.arch_mon_ctx);
        }
 }