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

Merge tag 'loongarch-6.9' of... 

Merge tag 'loongarch-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

Pull LoongArch updates from Huacai Chen:

 - Add objtool support for LoongArch

 - Add ORC stack unwinder support for LoongArch

 - Add kernel livepatching support for LoongArch

 - Select ARCH_HAS_CURRENT_STACK_POINTER in Kconfig

 - Select HAVE_ARCH_USERFAULTFD_MINOR in Kconfig

 - Some bug fixes and other small changes

* tag 'loongarch-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch/crypto: Clean up useless assignment operations
  LoongArch: Define the __io_aw() hook as mmiowb()
  LoongArch: Remove superfluous flush_dcache_page() definition
  LoongArch: Move {dmw,tlb}_virt_to_page() definition to page.h
  LoongArch: Change __my_cpu_offset definition to avoid mis-optimization
  LoongArch: Select HAVE_ARCH_USERFAULTFD_MINOR in Kconfig
  LoongArch: Select ARCH_HAS_CURRENT_STACK_POINTER in Kconfig
  LoongArch: Add kernel livepatching support
  LoongArch: Add ORC stack unwinder support
  objtool: Check local label in read_unwind_hints()
  objtool: Check local label in add_dead_ends()
  objtool/LoongArch: Enable orc to be built
  objtool/x86: Separate arch-specific and generic parts
  objtool/LoongArch: Implement instruction decoder
  objtool/LoongArch: Enable objtool to be built
parents 4f55aa85 fea1c949

arch/loongarch/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config LOONGARCH 
	select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE

	select ARCH_HAS_ACPI_TABLE_UPGRADE	if ACPI

	select ARCH_HAS_CPU_FINALIZE_INIT

	select ARCH_HAS_CURRENT_STACK_POINTER

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_KCOV

	select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS
@@ -104,6 +105,7 @@ config LOONGARCH 
	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE

	select HAVE_ARCH_USERFAULTFD_MINOR if USERFAULTFD

	select HAVE_ASM_MODVERSIONS

	select HAVE_CONTEXT_TRACKING_USER

	select HAVE_C_RECORDMCOUNT
@@ -133,20 +135,24 @@ config LOONGARCH 
	select HAVE_KPROBES

	select HAVE_KPROBES_ON_FTRACE

	select HAVE_KRETPROBES

	select HAVE_LIVEPATCH

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NMI

	select HAVE_OBJTOOL if AS_HAS_EXPLICIT_RELOCS

	select HAVE_PCI

	select HAVE_PERF_EVENTS

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_PREEMPT_DYNAMIC_KEY

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RELIABLE_STACKTRACE if UNWINDER_ORC

	select HAVE_RETHOOK

	select HAVE_RSEQ

	select HAVE_RUST

	select HAVE_SAMPLE_FTRACE_DIRECT

	select HAVE_SAMPLE_FTRACE_DIRECT_MULTI

	select HAVE_SETUP_PER_CPU_AREA if NUMA

	select HAVE_STACK_VALIDATION if HAVE_OBJTOOL

	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_TIF_NOHZ
@@ -624,6 +630,8 @@ config RANDOMIZE_BASE_MAX_OFFSET 


	  This is limited by the size of the lower address memory, 256MB.



source "kernel/livepatch/Kconfig"



endmenu



config ARCH_SELECT_MEMORY_MODEL

arch/loongarch/Kconfig.debug

+11 −0
Original line number Diff line number Diff line
@@ -26,4 +26,15 @@ config UNWINDER_PROLOGUE 
	  Some of the addresses it reports may be incorrect (but better than the

	  Guess unwinder).



config UNWINDER_ORC

	bool "ORC unwinder"

	select OBJTOOL

	help

	  This option enables the ORC (Oops Rewind Capability) unwinder for

	  unwinding kernel stack traces.  It uses a custom data format which is

	  a simplified version of the DWARF Call Frame Information standard.



	  Enabling this option will increase the kernel's runtime memory usage

	  by roughly 2-4MB, depending on your kernel config.



endchoice

arch/loongarch/Makefile

+21 −2
Original line number Diff line number Diff line
@@ -26,6 +26,18 @@ endif 
32bit-emul		= elf32loongarch

64bit-emul		= elf64loongarch



ifdef CONFIG_UNWINDER_ORC

orc_hash_h := arch/$(SRCARCH)/include/generated/asm/orc_hash.h

orc_hash_sh := $(srctree)/scripts/orc_hash.sh

targets += $(orc_hash_h)

quiet_cmd_orc_hash = GEN     $@

      cmd_orc_hash = mkdir -p $(dir $@); \

		     $(CONFIG_SHELL) $(orc_hash_sh) < $< > $@

$(orc_hash_h): $(srctree)/arch/loongarch/include/asm/orc_types.h $(orc_hash_sh) FORCE

	$(call if_changed,orc_hash)

archprepare: $(orc_hash_h)

endif



ifdef CONFIG_DYNAMIC_FTRACE

KBUILD_CPPFLAGS += -DCC_USING_PATCHABLE_FUNCTION_ENTRY

CC_FLAGS_FTRACE := -fpatchable-function-entry=2
@@ -72,8 +84,6 @@ KBUILD_CFLAGS_KERNEL += $(call cc-option,-mdirect-extern-access) 
KBUILD_CFLAGS_KERNEL		+= $(call cc-option,-fdirect-access-external-data)

KBUILD_AFLAGS_MODULE		+= $(call cc-option,-fno-direct-access-external-data)

KBUILD_CFLAGS_MODULE		+= $(call cc-option,-fno-direct-access-external-data)

KBUILD_AFLAGS_MODULE		+= $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)

KBUILD_CFLAGS_MODULE		+= $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)

else

cflags-y			+= $(call cc-option,-mno-explicit-relocs)

KBUILD_AFLAGS_KERNEL		+= -Wa,-mla-global-with-pcrel
@@ -82,6 +92,15 @@ KBUILD_AFLAGS_MODULE += -Wa,-mla-global-with-abs 
KBUILD_CFLAGS_MODULE		+= -fplt -Wa,-mla-global-with-abs,-mla-local-with-abs

endif



KBUILD_AFLAGS			+= $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)

KBUILD_CFLAGS			+= $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)

KBUILD_AFLAGS			+= $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma)-mthin-add-sub)

KBUILD_CFLAGS			+= $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma)-mthin-add-sub)



ifdef CONFIG_OBJTOOL

KBUILD_CFLAGS			+= -fno-jump-tables

endif



KBUILD_RUSTFLAGS			+= --target=$(objtree)/scripts/target.json

KBUILD_RUSTFLAGS_MODULE		+= -Crelocation-model=pic

arch/loongarch/crypto/crc32-loongarch.c

+0 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ static u32 crc32_loongarch_hw(u32 crc_, const u8 *p, unsigned int len) 


		CRC32(crc, value, w);

		p += sizeof(u32);

		len -= sizeof(u32);

	}



	if (len & sizeof(u16)) {
@@ -80,7 +79,6 @@ static u32 crc32c_loongarch_hw(u32 crc_, const u8 *p, unsigned int len) 


		CRC32C(crc, value, w);

		p += sizeof(u32);

		len -= sizeof(u32);

	}



	if (len & sizeof(u16)) {

arch/loongarch/include/asm/Kbuild

+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generated-y += orc_hash.h



generic-y += dma-contiguous.h

generic-y += mcs_spinlock.h

generic-y += parport.h

generic-y += early_ioremap.h

generic-y += qrwlock.h

generic-y += qspinlock.h

generic-y += rwsem.h

generic-y += segment.h

generic-y += user.h