Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d54fef31 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bpf-unlocking-fix' 

Daniel Borkmann says:

====================
BPF fix with regards to unlocking

This set fixes the issue Eric was reporting recently [1].
First patch is a prerequisite discussed with Laura that is
needed for the later fix in the second one. I've tested this
extensively and it does not reproduce anymore on my side
after the fix. Thanks & sorry about that!

  [1] https://www.spinics.net/lists/netdev/msg421877.html


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 559c59b2 9d876e79

arch/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -222,6 +222,10 @@ config GENERIC_SMP_IDLE_THREAD 
config GENERIC_IDLE_POLL_SETUP

       bool



# Select if arch has all set_memory_ro/rw/x/nx() functions in asm/cacheflush.h

config ARCH_HAS_SET_MEMORY

	bool



# Select if arch init_task initializer is different to init/init_task.c

config ARCH_INIT_TASK

       bool

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config ARM 
	select ARCH_CLOCKSOURCE_DATA

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_HAS_GCOV_PROFILE_ALL

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config ARM64 
	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_GIGANTIC_PAGE

	select ARCH_HAS_KCOV

	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_SG_CHAIN

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_USE_CMPXCHG_LOCKREF

arch/arm64/net/bpf_jit_comp.c

+1 −1
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 


	bpf_flush_icache(header, ctx.image + ctx.idx);



	set_memory_ro((unsigned long)header, header->pages);

	bpf_jit_binary_lock_ro(header);

	prog->bpf_func = (void *)ctx.image;

	prog->jited = 1;

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ config S390 
	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_GIGANTIC_PAGE

	select ARCH_HAS_KCOV

	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_SG_CHAIN

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_HAVE_NMI_SAFE_CMPXCHG