Skip to content

Retbleed fixes

Pawan Gupta lkml 4 versions – Applied

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

Get series with b4
b4 am [email protected] change-id 20250520-eibrs-fix-6c452b697dbf

Versions newest first

  1. v4 Latest7 patches 3 repliesApplied
  2. v37 patches 5 repliesSuperseded
  3. v27 patches 11 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v12 patches2 repliesApplied

Changes in v4 from the cover letter

- Replace the warning message in set_return_thunk() with an info. (Borislav)
- Collected tags.
- Rebased to v6.16-rc1.

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/7x86/retbleed: Avoid AUTO after the select steparch/x86/kernel/cpu/bugs.c+10 -90 replies
2/7x86/retbleed: Simplify the =stuff checksarch/x86/kernel/cpu/bugs.c+8 -160 replies
3/7x86/bugs: Avoid warning when overriding return thunkarch/x86/kernel/cpu/bugs.c+2 -30 replies
4/7x86/its: Use switch/case to apply mitigationarch/x86/kernel/cpu/bugs.c+13 -70 replies
5/7x86/retbleed: Introduce cdt_possible()arch/x86/kernel/cpu/bugs.c+14 -10 replies
6/7x86/its: Remove =stuff dependency on retbleedarch/x86/kernel/cpu/bugs.c+6 -80 replies
7/7x86/its: Allow stuffing in eIBRS+retpoline mode alsoarch/x86/kernel/cpu/bugs.c+4 -20 replies

Reviews trailers per patch

3 of 7 patches have a Reviewed-by or Acked-by.

PatchBorislav Petkov (AMD)Nikolay Borisov
1/7A-b
2/7A-b R-b
3/7
4/7R-b
5/7
6/7
7/7

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

Read the v4 thread

Cover letter [PATCH v4 0/7] Retbleed fixes

v4:
- Replace the warning message in set_return_thunk() with an info. (Borislav)
- Collected tags.
- Rebased to v6.16-rc1.

v3: https://lore.kernel.org/r/[email protected]
- Get rid of AUTO check in retbleed mitigation. (Borislav)
- Update commit message to mention the preparatory patch. (Nikolay)
- Collected tags.

v2: https://lore.kernel.org/r/[email protected]
- Split the ITS stuffing patch into smaller patches. (Borislav)
- Zap spectre_v2_in_retpoline_mode() helper. (Borislav)

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

This series untangles retbleed and ITS mitigation.

---
Pawan Gupta (7):
x86/retbleed: Avoid AUTO after the select step x86/retbleed: Simplify the =stuff checks x86/bugs: Avoid warning when overriding return thunk x86/its: Use switch/case to apply mitigation x86/retbleed: Introduce cdt_possible() x86/its: Remove =stuff dependency on retbleed x86/its: Allow stuffing in eIBRS+retpoline mode also

 arch/x86/kernel/cpu/bugs.c | 93 ++++++++++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 41 deletions(-)

---
base-commit: 19272b37aa4f83ca52bdf9c16d5d81bdd1354494
change-id: 20250520-eibrs-fix-6c452b697dbf

Best regards,

Signature · 2 lines
Thanks,
Pawan