This is a backport of the remaining patches from the below series: https://lore.kernel.org/all/cover.1633464148.git.naveen.n.rao@xxxxxxxxxxxxxxxxxx/ Kindly apply to the longterm tree for v5.10 Thanks, Naveen Naveen N. Rao (4): powerpc/lib: Add helper to check if offset is within conditional branch range powerpc/bpf: Validate branch ranges powerpc/security: Add a helper to query stf_barrier type powerpc/bpf: Emit stf barrier instruction sequences for BPF_NOSPEC arch/powerpc/include/asm/code-patching.h | 1 + arch/powerpc/include/asm/security_features.h | 5 ++ arch/powerpc/kernel/security.c | 5 ++ arch/powerpc/lib/code-patching.c | 7 ++- arch/powerpc/net/bpf_jit.h | 33 ++++++---- arch/powerpc/net/bpf_jit64.h | 8 +-- arch/powerpc/net/bpf_jit_comp64.c | 64 ++++++++++++++++++-- 7 files changed, 100 insertions(+), 23 deletions(-) base-commit: 5040520482a594e92d4f69141229a6dd26173511 -- 2.33.1