Merge branch 'x86-bpf-fixes-for-the-bpf-jit-with-retbleed-stuff'
authorAlexei Starovoitov <ast@kernel.org>
Tue, 2 Apr 2024 03:37:56 +0000 (20:37 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Tue, 2 Apr 2024 03:37:57 +0000 (20:37 -0700)
commit8c3fe029d79ada599fa558fdf3da0322fc38de36
tree69ebdb5ddaa504511a9b2f1e327246b1591ba08e
parent6dae957c8eef6eae5b386462767de97303235d5c
parent6a537453000a916392fcac1acb96c1d9d1e05b74
Merge branch 'x86-bpf-fixes-for-the-bpf-jit-with-retbleed-stuff'

Joan Bruguera Micó says:

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

From: Joan Bruguera Micó <joanbrugueram@gmail.com>

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 <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
---
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
====================

Link: https://lore.kernel.org/r/20240401185821.224068-1-ubizjak@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>