Commit 8a6b9403 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull UML updates from Johannes Berg:

 - proper nofault accesses and read-only rodata

 - hostfs fix for host inode number reuse

 - fixes for host errno handling

 - various cleanups/small fixes

* tag 'uml-for-linux-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
  um: Rewrite the sigio workaround based on epoll and tgkill
  um: Prohibit the VM_CLONE flag in run_helper_thread()
  um: Switch to the pthread-based helper in sigio workaround
  um: ubd: Switch to the pthread-based helper
  um: Add pthread-based helper support
  um: x86: clean up elf specific definitions
  um: Store full CSGSFS and SS register from mcontext
  um: virt-pci: Refactor virtio_pcidev into its own module
  um: work around sched_yield not yielding in time-travel mode
  um/locking: Remove semicolon from "lock" prefix
  um: Update min_low_pfn to match changes in uml_reserved
  um: use str_yes_no() to remove hardcoded "yes" and "no"
  um: hostfs: avoid issues on inode number reuse by host
  um: Allocate vdso page pointer statically
  um: remove copy_from_kernel_nofault_allowed
  um: mark rodata read-only and implement _nofault accesses
  um: Pass the correct Rust target and options with gcc
parents 1c241cba 33c9da5d

arch/um/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config UML 
	select ARCH_HAS_KCOV

	select ARCH_HAS_STRNCPY_FROM_USER

	select ARCH_HAS_STRNLEN_USER

	select ARCH_HAS_STRICT_KERNEL_RWX

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_KASAN if X86_64

	select HAVE_ARCH_KASAN_VMALLOC if HAVE_ARCH_KASAN

arch/um/drivers/Kconfig

+8 −4
Original line number Diff line number Diff line
@@ -345,16 +345,20 @@ config UML_RTC 
	  by providing a fake RTC clock that causes a wakeup at the right

	  time.



config UML_PCI_OVER_VIRTIO

	bool "Enable PCI over VIRTIO device simulation"

	# in theory, just VIRTIO is enough, but that causes recursion

	depends on VIRTIO_UML

config UML_PCI

	bool

	select FORCE_PCI

	select UML_IOMEM_EMULATION

	select UML_DMA_EMULATION

	select PCI_MSI

	select PCI_LOCKLESS_CONFIG



config UML_PCI_OVER_VIRTIO

	bool "Enable PCI over VIRTIO device simulation"

	# in theory, just VIRTIO is enough, but that causes recursion

	depends on VIRTIO_UML

	select UML_PCI



config UML_PCI_OVER_VIRTIO_DEVICE_ID

	int "set the virtio device ID for PCI emulation"

	default -1

arch/um/drivers/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o 
obj-$(CONFIG_UML_RANDOM) += random.o

obj-$(CONFIG_VIRTIO_UML) += virtio_uml.o

obj-$(CONFIG_UML_RTC) += rtc.o

obj-$(CONFIG_UML_PCI_OVER_VIRTIO) += virt-pci.o

obj-$(CONFIG_UML_PCI) += virt-pci.o

obj-$(CONFIG_UML_PCI_OVER_VIRTIO) += virtio_pcidev.o



# pcap_user.o must be added explicitly.

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

arch/um/drivers/random.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int __init rng_init (void) 
	if (err < 0)

		goto err_out_cleanup_hw;



	sigio_broken(random_fd);

	sigio_broken();

	hwrng.name = RNG_MODULE_NAME;

	hwrng.read = rng_dev_read;

arch/um/drivers/rtc_user.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ int uml_rtc_start(bool timetravel) 
		}



		/* apparently timerfd won't send SIGIO, use workaround */

		sigio_broken(uml_rtc_irq_fds[0]);

		sigio_broken();

		err = add_sigio_fd(uml_rtc_irq_fds[0]);

		if (err < 0) {

			close(uml_rtc_irq_fds[0]);