Skip to content

Commit 5d515ee

Browse files
Kan LiangPeter Zijlstra
authored andcommitted
perf/x86/uncore: Don't WARN_ON_ONCE() for a broken discovery table
The kernel warning message is triggered, when SPR MCC is used. [ 17.945331] ------------[ cut here ]------------ [ 17.946305] WARNING: CPU: 65 PID: 1 at arch/x86/events/intel/uncore_discovery.c:184 intel_uncore_has_discovery_tables+0x4c0/0x65c [ 17.946305] Modules linked in: [ 17.946305] CPU: 65 PID: 1 Comm: swapper/0 Not tainted 5.4.17-2136.313.1-X10-2c+ #4 It's caused by the broken discovery table of UPI. The discovery tables are from hardware. Except for dropping the broken information, there is nothing Linux can do. Using WARN_ON_ONCE() is overkilled. Use the pr_info() to replace WARN_ON_ONCE(), and specify what uncore unit is dropped and the reason. Signed-off-by: Kan Liang <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Tested-by: Michael Petlan <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 65248a9 commit 5d515ee

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

arch/x86/events/intel/uncore_discovery.c

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,21 @@ uncore_insert_box_info(struct uncore_unit_discovery *unit,
128128
unsigned int *box_offset, *ids;
129129
int i;
130130

131-
if (WARN_ON_ONCE(!unit->ctl || !unit->ctl_offset || !unit->ctr_offset))
131+
if (!unit->ctl || !unit->ctl_offset || !unit->ctr_offset) {
132+
pr_info("Invalid address is detected for uncore type %d box %d, "
133+
"Disable the uncore unit.\n",
134+
unit->box_type, unit->box_id);
132135
return;
136+
}
133137

134138
if (parsed) {
135139
type = search_uncore_discovery_type(unit->box_type);
136-
if (WARN_ON_ONCE(!type))
140+
if (!type) {
141+
pr_info("A spurious uncore type %d is detected, "
142+
"Disable the uncore type.\n",
143+
unit->box_type);
137144
return;
145+
}
138146
/* Store the first box of each die */
139147
if (!type->box_ctrl_die[die])
140148
type->box_ctrl_die[die] = unit->ctl;
@@ -169,8 +177,12 @@ uncore_insert_box_info(struct uncore_unit_discovery *unit,
169177
ids[i] = type->ids[i];
170178
box_offset[i] = type->box_offset[i];
171179

172-
if (WARN_ON_ONCE(unit->box_id == ids[i]))
180+
if (unit->box_id == ids[i]) {
181+
pr_info("Duplicate uncore type %d box ID %d is detected, "
182+
"Drop the duplicate uncore unit.\n",
183+
unit->box_type, unit->box_id);
173184
goto free_ids;
185+
}
174186
}
175187
ids[i] = unit->box_id;
176188
box_offset[i] = unit->ctl - type->box_ctrl;

0 commit comments

Comments
 (0)