Commit 1dd950f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'parisc-for-6.11-rc2' of... 

Merge tag 'parisc-for-6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc architecture fixes from Helge Deller:

 - fix unaligned memory accesses when calling BPF functions

 - adjust memory size constants to fix possible DMA corruptions

* tag 'parisc-for-6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: fix a possible DMA corruption
  parisc: fix unaligned accesses in BPF
parents b6547e54 7ae04ba3

arch/parisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ config PARISC 
	select ARCH_SUPPORTS_HUGETLBFS if PA20

	select ARCH_SUPPORTS_MEMORY_FAILURE

	select ARCH_STACKWALK

	select ARCH_HAS_CACHE_LINE_SIZE

	select ARCH_HAS_DEBUG_VM_PGTABLE

	select HAVE_RELIABLE_STACKTRACE

	select DMA_OPS

arch/parisc/include/asm/cache.h

+10 −1
Original line number Diff line number Diff line
@@ -20,7 +20,16 @@ 


#define SMP_CACHE_BYTES L1_CACHE_BYTES



#define ARCH_DMA_MINALIGN	L1_CACHE_BYTES

#ifdef CONFIG_PA20

#define ARCH_DMA_MINALIGN	128

#else

#define ARCH_DMA_MINALIGN	32

#endif

#define ARCH_KMALLOC_MINALIGN	16	/* ldcw requires 16-byte alignment */



#define arch_slab_minalign()	((unsigned)dcache_stride)

#define cache_line_size()	dcache_stride

#define dma_get_cache_alignment cache_line_size



#define __read_mostly __section(".data..read_mostly")

arch/parisc/net/bpf_jit_core.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
			jit_data->header =

				bpf_jit_binary_alloc(prog_size + extable_size,

						     &jit_data->image,

						     sizeof(u32),

						     sizeof(long),

						     bpf_fill_ill_insns);

			if (!jit_data->header) {

				prog = orig_prog;