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

Merge tag 'uml-for-linus-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux 

Pull UML updates from Richard Weinberger:

 - Support for preemption

 - i386 Rust support

 - Huge cleanup by Benjamin Berg

 - UBSAN support

 - Removal of dead code

* tag 'uml-for-linus-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux: (41 commits)
  um: vector: always reset vp->opened
  um: vector: remove vp->lock
  um: register power-off handler
  um: line: always fill *error_out in setup_one_line()
  um: remove pcap driver from documentation
  um: Enable preemption in UML
  um: refactor TLB update handling
  um: simplify and consolidate TLB updates
  um: remove force_flush_all from fork_handler
  um: Do not flush MM in flush_thread
  um: Delay flushing syscalls until the thread is restarted
  um: remove copy_context_skas0
  um: remove LDT support
  um: compress memory related stub syscalls while adding them
  um: Rework syscall handling
  um: Add generic stub_syscall6 function
  um: Create signal stack memory assignment in stub_data
  um: Remove stub-data.h include from common-offsets.h
  um: time-travel: fix signal blocking race/hang
  um: time-travel: remove time_exit()
  ...
parents c2a96b7f 98ff534e

Documentation/rust/arch-support.rst

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Architecture Level of support Constraints 
``arm64``      Maintained        Little Endian only.

``loongarch``  Maintained        \-

``riscv``      Maintained        ``riscv64`` only.

``um``         Maintained        ``x86_64`` only.

``um``         Maintained        \-

``x86``        Maintained        ``x86_64`` only.

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

Documentation/virt/uml/user_mode_linux_howto_v2.rst

+0 −2
Original line number Diff line number Diff line
@@ -223,8 +223,6 @@ remote UML and other VM instances. 
+-----------+--------+------------------------------------+------------+

| socket    | legacy | none                               | ~ 450Mbit  |

+-----------+--------+------------------------------------+------------+

| pcap      | legacy | rx only                            | ~ 450Mbit  |

+-----------+--------+------------------------------------+------------+

| ethertap  | legacy | obsolete                           | ~ 500Mbit  |

+-----------+--------+------------------------------------+------------+

| vde       | legacy | obsolete                           | ~ 500Mbit  |

arch/um/Kconfig

+5 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ config UML 
	select ARCH_HAS_KCOV

	select ARCH_HAS_STRNCPY_FROM_USER

	select ARCH_HAS_STRNLEN_USER

	select ARCH_NO_PREEMPT

	select ARCH_NO_PREEMPT_DYNAMIC

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_KASAN if X86_64

	select HAVE_ARCH_KASAN_VMALLOC if HAVE_ARCH_KASAN
@@ -31,7 +31,8 @@ config UML 
	select TRACE_IRQFLAGS_SUPPORT

	select TTY # Needed for line.c

	select HAVE_ARCH_VMAP_STACK

	select HAVE_RUST			if X86_64

	select HAVE_RUST

	select ARCH_HAS_UBSAN



config MMU

	bool
@@ -48,12 +49,13 @@ config NO_IOMEM 
config UML_IOMEM_EMULATION

	bool

	select INDIRECT_IOMEM

	select HAS_IOPORT

	select GENERIC_PCI_IOMAP

	select GENERIC_IOMAP

	select NO_GENERIC_PCI_IOPORT_MAP



config NO_IOPORT_MAP

	def_bool y

	def_bool !UML_IOMEM_EMULATION



config ISA

	bool

arch/um/drivers/Kconfig

+0 −20
Original line number Diff line number Diff line
@@ -297,26 +297,6 @@ config UML_NET_MCAST 


	  If unsure, say N.



config UML_NET_PCAP

	bool "pcap transport (obsolete)"

	depends on UML_NET

	depends on !MODVERSIONS

	select MAY_HAVE_RUNTIME_DEPS

	help

	  The pcap transport makes a pcap packet stream on the host look

	  like an ethernet device inside UML.  This is useful for making

	  UML act as a network monitor for the host.  You must have libcap

	  installed in order to build the pcap transport into UML.



	  For more information, see

	  <http://user-mode-linux.sourceforge.net/old/networking.html>  That site

	  has examples of the UML command line to use to enable this option.



	  NOTE: THIS TRANSPORT IS DEPRECATED AND WILL BE REMOVED SOON!!! Please

	  migrate to UML_NET_VECTOR.



	  If unsure, say N.



config UML_NET_SLIRP

	bool "SLiRP transport (obsolete)"

	depends on UML_NET

arch/um/drivers/Makefile

+2 −8
Original line number Diff line number Diff line
@@ -20,14 +20,9 @@ harddog-objs := harddog_kern.o 
harddog-builtin-$(CONFIG_UML_WATCHDOG) := harddog_user.o harddog_user_exp.o

rtc-objs := rtc_kern.o rtc_user.o



LDFLAGS_pcap.o = $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libpcap.a)



LDFLAGS_vde.o = $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a)



targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o



$(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o

	$(LD) -r -dp -o $@ $^ $(ld_flags)

targets := vde_kern.o vde_user.o



$(obj)/vde.o: $(obj)/vde_kern.o $(obj)/vde_user.o

	$(LD) -r -dp -o $@ $^ $(ld_flags)
@@ -49,7 +44,6 @@ obj-$(CONFIG_UML_NET_DAEMON) += daemon.o 
obj-$(CONFIG_UML_NET_VECTOR) += vector.o

obj-$(CONFIG_UML_NET_VDE) += vde.o

obj-$(CONFIG_UML_NET_MCAST) += umcast.o

obj-$(CONFIG_UML_NET_PCAP) += pcap.o

obj-$(CONFIG_UML_NET) += net.o 

obj-$(CONFIG_MCONSOLE) += mconsole.o

obj-$(CONFIG_MMAPPER) += mmapper_kern.o
@@ -69,7 +63,7 @@ obj-$(CONFIG_UML_RTC) += rtc.o 
obj-$(CONFIG_UML_PCI_OVER_VIRTIO) += virt-pci.o



# pcap_user.o must be added explicitly.

USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o vector_user.o

USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o vde_user.o vector_user.o

CFLAGS_null.o = -DDEV_NULL=$(DEV_NULL_PATH)



CFLAGS_xterm.o += '-DCONFIG_XTERM_CHAN_DEFAULT_EMULATOR="$(CONFIG_XTERM_CHAN_DEFAULT_EMULATOR)"'