Skip to content

Commit 39c6eed

Browse files
maciejwieczorretmanbp3tk0v
authored andcommitted
x86/resctrl: Rename arch_has_sparse_bitmaps
Rename arch_has_sparse_bitmaps to arch_has_sparse_bitmasks to ensure consistent terminology throughout resctrl. Suggested-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Reviewed-by: Peter Newman <peternewman@google.com> Reviewed-by: Reinette Chatre <reinette.chatre@intel.com> Reviewed-by: Babu Moger <babu.moger@amd.com> Tested-by: Peter Newman <peternewman@google.com> Link: https://lore.kernel.org/r/e330fcdae873ef1a831e707025a4b70fa346666e.1696934091.git.maciej.wieczor-retman@intel.com
1 parent f05fd4c commit 39c6eed

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ static __init void rdt_init_res_defs_intel(void)
872872

873873
if (r->rid == RDT_RESOURCE_L3 ||
874874
r->rid == RDT_RESOURCE_L2) {
875-
r->cache.arch_has_sparse_bitmaps = false;
875+
r->cache.arch_has_sparse_bitmasks = false;
876876
r->cache.arch_has_per_cpu_cfg = false;
877877
r->cache.min_cbm_bits = 1;
878878
} else if (r->rid == RDT_RESOURCE_MBA) {
@@ -892,7 +892,7 @@ static __init void rdt_init_res_defs_amd(void)
892892

893893
if (r->rid == RDT_RESOURCE_L3 ||
894894
r->rid == RDT_RESOURCE_L2) {
895-
r->cache.arch_has_sparse_bitmaps = true;
895+
r->cache.arch_has_sparse_bitmasks = true;
896896
r->cache.arch_has_per_cpu_cfg = true;
897897
r->cache.min_cbm_bits = 0;
898898
} else if (r->rid == RDT_RESOURCE_MBA) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r)
113113
first_bit = find_first_bit(&val, cbm_len);
114114
zero_bit = find_next_zero_bit(&val, cbm_len, first_bit);
115115

116-
/* Are non-contiguous bitmaps allowed? */
117-
if (!r->cache.arch_has_sparse_bitmaps &&
116+
/* Are non-contiguous bitmasks allowed? */
117+
if (!r->cache.arch_has_sparse_bitmasks &&
118118
(find_next_bit(&val, cbm_len, zero_bit) < cbm_len)) {
119119
rdt_last_cmd_printf("The mask %lx has non-consecutive 1-bits\n", val);
120120
return false;

include/linux/resctrl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,15 @@ struct rdt_domain {
9494
* zero CBM.
9595
* @shareable_bits: Bitmask of shareable resource with other
9696
* executing entities
97-
* @arch_has_sparse_bitmaps: True if a bitmap like f00f is valid.
97+
* @arch_has_sparse_bitmasks: True if a bitmask like f00f is valid.
9898
* @arch_has_per_cpu_cfg: True if QOS_CFG register for this cache
9999
* level has CPU scope.
100100
*/
101101
struct resctrl_cache {
102102
unsigned int cbm_len;
103103
unsigned int min_cbm_bits;
104104
unsigned int shareable_bits;
105-
bool arch_has_sparse_bitmaps;
105+
bool arch_has_sparse_bitmasks;
106106
bool arch_has_per_cpu_cfg;
107107
};
108108

0 commit comments

Comments
 (0)