Skip to content

x86/bpf: Fixes for the BPF JIT with retbleed=stuff

Uros Bizjak bpf lkml netdev 4 versions – Applied

Status from this message: This series was applied to bpf/bpf.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest posting 2/22 patches 4 repliesApplied 2/2
  2. v2 posting 1/22 patches 0 repliesSuperseded
  3. v1 posting 2/22 patches 5 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v1 posting 1/22 patches0 repliesSuperseded

Changes in v2 from the cover letter

Simplify calculation of "ip".
Add more details to the commit message.

Patches in v2 posting 2/2 All 2 applied

#Subject and filesSizeRepliesApplied
1/2x86/bpf: Fix IP after emitting call depth accountingarch/x86/net/bpf_jit_comp.c+1 -10 repliesApplied
2/2x86/bpf: Fix IP for relocating call depth accountingarch/x86/include/asm/alternative.h arch/x86/kernel/callthunks.c arch/x86/net/bpf_jit_comp.c+12 -150 repliesApplied

Reviews trailers per patch

1 of 2 patches has a Reviewed-by or Acked-by.

PatchUros BizjakIngo Molnar
1/2
2/2R-b A-b

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

Read the v2 thread

Cover letter [PATCH RESEND bpf v2 0/2] x86/bpf: Fixes for the BPF JIT with retbleed=stuff

From: Joan Bruguera Micó <[email protected]>

Fixes two issues that cause kernels panic when using the BPF JIT with the call depth tracking / stuffing mitigation for Skylake processors (retbleed=stuff). Both issues can be triggered by running simple BPF programs (e.g. running the test suite should trigger both).

The first (resubmit) fixes a trivial issue related to calculating the destination IP for call instructions with call depth tracking.

The second is related to using the correct IP for relocations, related to the recently introduced %rip-relative addressing for PER_CPU_VAR.

Cc Alexei Starovoitov <[email protected]>
Cc Daniel Borkmann <[email protected]>

---
v2:
Simplify calculation of "ip".
Add more details to the commit message.

Joan Bruguera Micó (1):
x86/bpf: Fix IP for relocating call depth accounting

Uros Bizjak (1):
x86/bpf: Fix IP after emitting call depth accounting

 arch/x86/include/asm/alternative.h |  4 ++--
 arch/x86/kernel/callthunks.c       |  4 ++--
 arch/x86/net/bpf_jit_comp.c        | 19 ++++++++-----------
 3 files changed, 12 insertions(+), 15 deletions(-)
Signature · 1 line
2.42.0