Skip to content

Commit d4fb6b8

Browse files
James Morsebp3tk0v
authored andcommitted
x86/resctrl: Add end-marker to the resctrl_event_id enum
The resctrl_event_id enum gives names to the counter event numbers on x86. These are used directly by resctrl. To allow the MPAM driver to keep an array of these the size of the enum needs to be known. Add a 'num_events' enum entry which can be used to size an array. This is added to the enum to reduce conflicts with another series, which in turn requires get_arch_mbm_state() to have a default case. Signed-off-by: James Morse <james.morse@arm.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Reinette Chatre <reinette.chatre@intel.com> Reviewed-by: Fenghua Yu <fenghuay@nvidia.com> Tested-by: Fenghua Yu <fenghuay@nvidia.com> Tested-by: Babu Moger <babu.moger@amd.com> Tested-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com> Tested-by: Tony Luck <tony.luck@intel.com> Link: https://lore.kernel.org/20250515165855.31452-12-james.morse@arm.com
1 parent 6c72fb8 commit d4fb6b8

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

arch/x86/kernel/cpu/resctrl/monitor.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,11 @@ static struct arch_mbm_state *get_arch_mbm_state(struct rdt_hw_mon_domain *hw_do
260260
return &hw_dom->arch_mbm_total[rmid];
261261
case QOS_L3_MBM_LOCAL_EVENT_ID:
262262
return &hw_dom->arch_mbm_local[rmid];
263+
default:
264+
/* Never expect to get here */
265+
WARN_ON_ONCE(1);
266+
return NULL;
263267
}
264-
265-
/* Never expect to get here */
266-
WARN_ON_ONCE(1);
267-
268-
return NULL;
269268
}
270269

271270
void resctrl_arch_reset_rmid(struct rdt_resource *r, struct rdt_mon_domain *d,

include/linux/resctrl_types.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ enum resctrl_event_id {
4949
QOS_L3_OCCUP_EVENT_ID = 0x01,
5050
QOS_L3_MBM_TOTAL_EVENT_ID = 0x02,
5151
QOS_L3_MBM_LOCAL_EVENT_ID = 0x03,
52+
53+
/* Must be the last */
54+
QOS_NUM_EVENTS,
5255
};
5356

5457
#endif /* __LINUX_RESCTRL_TYPES_H */

0 commit comments

Comments
 (0)