]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'loongarch-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Apr 2026 16:54:45 +0000 (09:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Apr 2026 16:54:45 +0000 (09:54 -0700)
Pull LoongArch updates from Huacai Chen:

 - Adjust build infrastructure for 32BIT/64BIT

 - Add HIGHMEM (PKMAP and FIX_KMAP) support

 - Show and handle CPU vulnerabilites correctly

 - Batch the icache maintenance for jump_label

 - Add more atomic instructions support for BPF JIT

 - Add more features (e.g. fsession) support for BPF trampoline

 - Some bug fixes and other small changes

* tag 'loongarch-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson: (21 commits)
  selftests/bpf: Enable CAN_USE_LOAD_ACQ_STORE_REL for LoongArch
  LoongArch: BPF: Add fsession support for trampolines
  LoongArch: BPF: Introduce emit_store_stack_imm64() helper
  LoongArch: BPF: Support up to 12 function arguments for trampoline
  LoongArch: BPF: Support small struct arguments for trampoline
  LoongArch: BPF: Open code and remove invoke_bpf_mod_ret()
  LoongArch: BPF: Support load-acquire and store-release instructions
  LoongArch: BPF: Support 8 and 16 bit read-modify-write instructions
  LoongArch: BPF: Add the default case in emit_atomic() and rename it
  LoongArch: Define instruction formats for AM{SWAP/ADD}.{B/H} and DBAR
  LoongArch: Batch the icache maintenance for jump_label
  LoongArch: Add flush_icache_all()/local_flush_icache_all()
  LoongArch: Add spectre boundry for syscall dispatch table
  LoongArch: Show CPU vulnerabilites correctly
  LoongArch: Make arch_irq_work_has_interrupt() true only if IPI HW exist
  LoongArch: Use get_random_canary() for stack canary init
  LoongArch: Improve the logging of disabling KASLR
  LoongArch: Align FPU register state to 32 bytes
  LoongArch: Handle CONFIG_32BIT in syscall_get_arch()
  LoongArch: Add HIGHMEM (PKMAP and FIX_KMAP) support
  ...

12 files changed:
1  2 
arch/loongarch/Kconfig
arch/loongarch/include/asm/page.h
arch/loongarch/include/asm/pgtable.h
arch/loongarch/kernel/process.c
arch/loongarch/kernel/syscall.c
arch/loongarch/lib/Makefile
arch/loongarch/mm/init.c
arch/loongarch/net/bpf_jit.c
drivers/firmware/efi/libstub/Makefile
drivers/pci/controller/Kconfig
lib/crc/Kconfig
tools/testing/selftests/bpf/progs/bpf_misc.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 00f3822b6e47c66e2946cf55074ce31b457146fe,bf51f4a1b086e327b5d0bbde9d874360f86bae4d..3f9ab54114c514279631f84fb64c792b9f3feceb
  #include <asm/pgalloc.h>
  #include <asm/tlb.h>
  
- void copy_user_highpage(struct page *to, struct page *from,
-       unsigned long vaddr, struct vm_area_struct *vma)
- {
-       void *vfrom, *vto;
-       vfrom = kmap_local_page(from);
-       vto = kmap_local_page(to);
-       copy_page(vto, vfrom);
-       kunmap_local(vfrom);
-       kunmap_local(vto);
-       /* Make sure this page is cleared on other CPU's too before using it */
-       smp_wmb();
- }
 -unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss;
 -EXPORT_SYMBOL(empty_zero_page);
--
  int __ref page_is_ram(unsigned long pfn)
  {
        unsigned long addr = PFN_PHYS(pfn);
Simple merge
Simple merge
Simple merge
diff --cc lib/crc/Kconfig
Simple merge