Commit bbcf9cd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-20200805' of git://github.com/jcmvbkbc/linux-xtensa 

Pull Xtensa updates from Max Filippov:

 - add syscall audit support

 - add seccomp filter support

 - clean up make rules under arch/xtensa/boot

 - fix state management for exclusive access opcodes

 - fix build with PMU enabled

* tag 'xtensa-20200805' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: add missing exclusive access state management
  xtensa: fix xtensa_pmu_setup prototype
  xtensa: add boot subdirectories build artifacts to 'targets'
  xtensa: add uImage and xipImage to targets
  xtensa: move vmlinux.bin[.gz] to boot subdirectory
  xtensa: initialize_mmu.h: fix a duplicated word
  selftests/seccomp: add xtensa support
  xtensa: add seccomp support
  xtensa: expose syscall through user_pt_regs
  xtensa: add audit support
parents 9ab9bc51 a0fc1436

Documentation/features/seccomp/seccomp-filter/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -29,5 +29,5 @@ 
    |       sparc: | TODO |

    |          um: |  ok  |

    |         x86: |  ok  |

    |      xtensa: | TODO |

    |      xtensa: |  ok  |

    -----------------------

arch/xtensa/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ config XTENSA 
	select GENERIC_PCI_IOMAP

	select GENERIC_SCHED_CLOCK

	select GENERIC_STRNCPY_FROM_USER if KASAN

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL

	select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_CONTIGUOUS
@@ -215,6 +217,20 @@ config HOTPLUG_CPU 


	  Say N if you want to disable CPU hotplug.



config SECCOMP

	bool

	prompt "Enable seccomp to safely compute untrusted bytecode"

	help

	  This kernel feature is useful for number crunching applications

	  that may need to compute untrusted bytecode during their

	  execution. By using pipes or other transports made available to

	  the process as file descriptors supporting the read/write

	  syscalls, it's possible to isolate those applications in

	  their own address space using seccomp. Once seccomp is

	  enabled via prctl(PR_SET_SECCOMP), it cannot be disabled

	  and the task is only allowed to execute a few safe syscalls

	  defined by each seccomp mode.



config FAST_SYSCALL_XTENSA

	bool "Enable fast atomic syscalls"

	default n

arch/xtensa/boot/Makefile

+7 −5
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ BIG_ENDIAN := $(shell echo __XTENSA_EB__ | $(CC) -E - | grep -v "\#") 
export BIG_ENDIAN



subdir-y	:= lib

targets		+= vmlinux.bin vmlinux.bin.gz

targets		+= uImage xipImage



# Subdirs for the boot loader(s)
@@ -35,19 +37,19 @@ boot-elf boot-redboot: $(addprefix $(obj)/,$(subdir-y)) 


OBJCOPYFLAGS = --strip-all -R .comment -R .notes -O binary



vmlinux.bin: vmlinux FORCE

$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



vmlinux.bin.gz: vmlinux.bin FORCE

$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



boot-elf: vmlinux.bin

boot-redboot: vmlinux.bin.gz

boot-elf: $(obj)/vmlinux.bin

boot-redboot: $(obj)/vmlinux.bin.gz



UIMAGE_LOADADDR = $(CONFIG_KERNEL_LOAD_ADDRESS)

UIMAGE_COMPRESSION = gzip



$(obj)/uImage: vmlinux.bin.gz FORCE

$(obj)/uImage: $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,uimage)

	$(Q)$(kecho) '  Kernel: $@ is ready'

arch/xtensa/boot/boot-elf/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -15,12 +15,13 @@ export CPPFLAGS_boot.lds += -P -C 
export KBUILD_AFLAGS += -mtext-section-literals



boot-y		:= bootstrap.o

targets		+= $(boot-y) boot.lds



OBJS		:= $(addprefix $(obj)/,$(boot-y))



$(obj)/Image.o: vmlinux.bin $(OBJS)

$(obj)/Image.o: $(obj)/../vmlinux.bin $(OBJS)

	$(Q)$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \

		--add-section image=vmlinux.bin \

		--add-section image=$< \

		--set-section-flags image=contents,alloc,load,load,data \

		$(OBJS) $@

arch/xtensa/boot/boot-redboot/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -13,15 +13,16 @@ endif 
LD_ARGS	= -T $(srctree)/$(obj)/boot.ld



boot-y	:= bootstrap.o

targets	+= $(boot-y)



OBJS	:= $(addprefix $(obj)/,$(boot-y))

LIBS	:= arch/xtensa/boot/lib/lib.a arch/xtensa/lib/lib.a



LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



$(obj)/zImage.o: vmlinux.bin.gz $(OBJS)

$(obj)/zImage.o: $(obj)/../vmlinux.bin.gz $(OBJS)

	$(Q)$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \

		--add-section image=vmlinux.bin.gz \

		--add-section image=$< \

		--set-section-flags image=contents,alloc,load,load,data \

		$(OBJS) $@

CRA Git | Maintained and supported by SUSTech CRA and CCSE