Skip to content

x86/mce: Correct the noinstr annotation

Borislav Petkov lkml 1 version Applied

Status from this message: The following commit has been merged into the ras/core branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest12 patches 4 repliesApplied

Changelog from the cover letter

==========

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/12x86/mce: Do not use memset to clear the banks bitmapsarch/x86/kernel/cpu/mce/core.c+2 -30 replies
2/12x86/mce: Remove function-local cpus variablesarch/x86/kernel/cpu/mce/core.c+2 -60 replies
3/12x86/mce: Use mce_rdmsrl() in severity checking codearch/x86/kernel/cpu/mce/core.c arch/x86/kernel/cpu/mce/internal.h arch/x86/kernel/cpu/mce/severity.c+6 -60 replies
4/12x86/mce: Remove noinstr annotation from mce_setup()arch/x86/kernel/cpu/mce/core.c+8 -22 replies
5/12x86/mce: Allow instrumentation during task work queueingarch/x86/kernel/cpu/mce/core.c+11 -01 reply
6/12x86/mce: Prevent severity computation from being instrumentedarch/x86/kernel/cpu/mce/severity.c+21 -90 replies
7/12x86/mce: Mark mce_panic() noinstrarch/x86/kernel/cpu/mce/core.c+12 -30 replies
8/12x86/mce: Mark mce_end() noinstrarch/x86/kernel/cpu/mce/core.c+11 -30 replies
9/12x86/mce: Mark mce_read_aux() noinstrarch/x86/kernel/cpu/mce/core.c+1 -10 replies
10/12x86/mce: Move the tainting outside of the noinstr regionarch/x86/kernel/cpu/mce/core.c+26 -150 replies
11/12x86/mce: Mark mce_timed_out() noinstrarch/x86/kernel/cpu/mce/core.c+13 -30 replies
12/12x86/mce: Mark mce_start() noinstrarch/x86/kernel/cpu/mce/core.c+14 -60 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH v1 00/12] x86/mce: Correct the noinstr annotation

From: Borislav Petkov <[email protected]>

Hi folks,

here's v1 with the instrumentation "sandwiching" documented, as requested by peterz.

Tony, I'd appreciate making sure nothing in them breaks your injection workflows before I queue them. And it shouldn't but... :-)

Thx.

Changelog:
==========

here's a first preliminary (it is based on some random 5.16-rc0 commit and is tested only in qemu) of the series which correct all the noinstr annotation of the #MC handler.

Since it calls a bunch of external facilities, the strategy is to mark mce-specific functions called by the #MC handler as noinstr and when they "call out" so to speak, to do a begin/end sandwich around that call.

Please have a look and let me know if it looks ok-ish.

Further testing will happen after -rc1 releases, thus the "v0" version here.

Thx.

Borislav Petkov (12):
x86/mce: Do not use memset to clear the banks bitmaps x86/mce: Remove function-local cpus variables x86/mce: Use mce_rdmsrl() in severity checking code x86/mce: Remove noinstr annotation from mce_setup() x86/mce: Allow instrumentation during task work queueing x86/mce: Prevent severity computation from being instrumented x86/mce: Mark mce_panic() noinstr
x86/mce: Mark mce_end() noinstr
x86/mce: Mark mce_read_aux() noinstr
x86/mce: Move the tainting outside of the noinstr region x86/mce: Mark mce_timed_out() noinstr
x86/mce: Mark mce_start() noinstr

 arch/x86/kernel/cpu/mce/core.c     | 128 +++++++++++++++++++++--------
 arch/x86/kernel/cpu/mce/internal.h |   2 +
 arch/x86/kernel/cpu/mce/severity.c |  38 +++++----
 3 files changed, 119 insertions(+), 49 deletions(-)
Signature · 1 line
2.29.2