Skip to content

x86/alternatives: Nest them

Borislav Petkov lkml 1 version Applied

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

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest14 patches 3 repliesApplied

v0 from the cover letter

---

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/14x86/alternative: Zap alternative_ternary()arch/x86/include/asm/alternative.h+0 -30 replies
2/14x86/alternatives: Add nested alternatives macrosarch/x86/include/asm/alternative.h arch/x86/kernel/alternative.c tools/objtool/arch/x86/special.c +1 more+167 -120 replies
3/14x86/alternative: Convert alternative()arch/x86/include/asm/alternative.h+1 -40 replies
4/14x86/alternative: Convert alternative_2()arch/x86/include/asm/alternative.h+0 -30 replies
5/14x86/alternative: Convert alternative_input()arch/x86/include/asm/alternative.h+1 -50 replies
6/14x86/alternative: Convert alternative_io()arch/x86/include/asm/alternative.h+1 -50 replies
7/14x86/alternative: Convert alternative_call()arch/x86/include/asm/alternative.h+1 -50 replies
8/14x86/alternative: Convert alternative_call_2()arch/x86/include/asm/alternative.h+6 -150 replies
9/14x86/alternative: Convert ALTERNATIVE_TERNARY()arch/x86/include/asm/alternative.h+0 -60 replies
10/14x86/alternative: Convert ALTERNATIVE_3()arch/x86/include/asm/alternative.h arch/x86/kernel/fpu/xstate.h+9 -290 replies
11/14x86/alternative: Convert the asm ALTERNATIVE() macroarch/x86/include/asm/alternative.h+1 -210 replies
12/14x86/alternative: Convert the asm ALTERNATIVE_2() macroarch/x86/include/asm/alternative.h+0 -220 replies
13/14x86/alternative: Convert the asm ALTERNATIVE_3() macroarch/x86/include/asm/alternative.h+0 -250 replies
14/14x86/alternative: Replace the old macrosarch/x86/include/asm/alternative.h+32 -1121 reply

Reviews trailers per patch

None of the 14 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchPeter Zijlstra (Intel)
SeriesA-b
1/14
2/14
3/14
4/14
5/14
6/14
7/14
8/14
9/14
10/14
11/14
12/14
13/14
14/14

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH v1 00/14] x86/alternatives: Nest them

From: "Borislav Petkov (AMD)" <[email protected]>

Hi,

here's the next revision

[ v1 - the last one was v0 even if not denoted as such:

    https://lore.kernel.org/r/[email protected] ]

of the alternatives nesting patchset.

All feedback has been incorporated and testing with it still looks good.

Thx.

Changelog:

v0:
---

this is basically peterz's idea to nest the alternative macros with a fix to an issue I encountered while testing.

For ease of bisection, the old macros are converted to the new, nested variants in a step-by-step manner so that in case an issue is encountered during testing, one can pinpoint the place where it fails easier. Because debugging alternatives is a serious pain.

Testing here on my farm looks good but who knows what happens out there, in the wild.

Thx.

Borislav Petkov (AMD) (13):
x86/alternative: Zap alternative_ternary() x86/alternative: Convert alternative() x86/alternative: Convert alternative_2() x86/alternative: Convert alternative_input() x86/alternative: Convert alternative_io() x86/alternative: Convert alternative_call() x86/alternative: Convert alternative_call_2() x86/alternative: Convert ALTERNATIVE_TERNARY() x86/alternative: Convert ALTERNATIVE_3() x86/alternative: Convert the asm ALTERNATIVE() macro x86/alternative: Convert the asm ALTERNATIVE_2() macro x86/alternative: Convert the asm ALTERNATIVE_3() macro x86/alternative: Replace the old macros

Peter Zijlstra (1):
x86/alternatives: Add nested alternatives macros

 arch/x86/include/asm/alternative.h | 225 +++++++++--------------------
 arch/x86/kernel/alternative.c      |  20 ++-
 arch/x86/kernel/fpu/xstate.h       |  14 +-
 tools/objtool/arch/x86/special.c   |  23 +++
 tools/objtool/special.c            |  16 +-
 5 files changed, 125 insertions(+), 173 deletions(-)
Signature · 1 line
2.43.0