Commit 64e85168 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull UML updates from Richard Weinberger:

 - Add support for rust (yay!)

 - Add support for LTO

 - Add platform bus support to virtio-pci

 - Various virtio fixes

 - Coding style, spelling cleanups

* tag 'uml-for-linus-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux: (27 commits)
  Documentation: rust: Fix arch support table
  uml: vector: Remove unused definitions VECTOR_{WRITE,HEADERS}
  um: virt-pci: properly remove PCI device from bus
  um: virtio_uml: move device breaking into workqueue
  um: virtio_uml: mark device as unregistered when breaking it
  um: virtio_uml: free command if adding to virtqueue failed
  UML: define RUNTIME_DISCARD_EXIT
  virt-pci: add platform bus support
  um-virt-pci: Make max delay configurable
  um: virt-pci: implement pcibios_get_phb_of_node()
  um: Support LTO
  um: put power options in a menu
  um: Use CFLAGS_vmlinux
  um: Prevent building modules incompatible with MODVERSIONS
  um: Avoid pcap multiple definition errors
  um: Make the definition of cpu_data more compatible
  x86: um: vdso: Add '%rcx' and '%r11' to the syscall clobber list
  rust: arch/um: Add support for CONFIG_RUST under x86_64 UML
  rust: arch/um: Disable FP/SIMD instruction to match x86
  rust: arch/um: Use 'pie' relocation mode under UML
  ...
parents e31b283a 04df97e1

Documentation/rust/arch-support.rst

+2 −0
Original line number Diff line number Diff line
@@ -16,4 +16,6 @@ support corresponds to ``S`` values in the ``MAINTAINERS`` file. 
Architecture  Level of support  Constraints

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

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

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

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

arch/um/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -25,9 +25,12 @@ config UML 
	select GENERIC_IRQ_SHOW

	select GENERIC_CPU_DEVICES

	select HAVE_GCC_PLUGINS

	select ARCH_SUPPORTS_LTO_CLANG

	select ARCH_SUPPORTS_LTO_CLANG_THIN

	select TRACE_IRQFLAGS_SUPPORT

	select TTY # Needed for line.c

	select HAVE_ARCH_VMAP_STACK

	select HAVE_RUST			if X86_64



config MMU

	bool
@@ -242,4 +245,8 @@ source "arch/um/drivers/Kconfig" 
config ARCH_SUSPEND_POSSIBLE

	def_bool y



menu "Power management options"



source "kernel/power/Kconfig"



endmenu

arch/um/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ \ 
	-Din6addr_loopback=kernel_in6addr_loopback \

	-Din6addr_any=kernel_in6addr_any -Dstrrchr=kernel_strrchr



KBUILD_RUSTFLAGS += -Crelocation-model=pie



KBUILD_AFLAGS += $(ARCH_INCLUDE)



USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \
@@ -139,11 +141,10 @@ ifeq ($(CONFIG_LD_IS_BFD),y) 
LDFLAGS_EXECSTACK += $(call ld-option,--no-warn-rwx-segments)

endif



LD_FLAGS_CMDLINE = $(foreach opt,$(KBUILD_LDFLAGS),-Wl,$(opt))

LD_FLAGS_CMDLINE = $(foreach opt,$(KBUILD_LDFLAGS) $(LDFLAGS_EXECSTACK),-Wl,$(opt))



# Used by link-vmlinux.sh which has special support for um link

export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE)

export LDFLAGS_vmlinux := $(LDFLAGS_EXECSTACK)

export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE) $(CC_FLAGS_LTO)



# When cleaning we don't include .config, so we don't include

# TT or skas makefiles and don't clean skas_ptregs.h.

arch/um/drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ config UML_NET_VECTOR 
config UML_NET_VDE

	bool "VDE transport (obsolete)"

	depends on UML_NET

	depends on !MODVERSIONS

	select MAY_HAVE_RUNTIME_DEPS

	help

	  This User-Mode Linux network transport allows one or more running
@@ -309,6 +310,7 @@ config UML_NET_MCAST 
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

arch/um/drivers/pcap_kern.c

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct pcap_init { 
	char *filter;

};



void pcap_init(struct net_device *dev, void *data)

void pcap_init_kern(struct net_device *dev, void *data)

{

	struct uml_net_private *pri;

	struct pcap_data *ppri;
@@ -44,7 +44,7 @@ static int pcap_write(int fd, struct sk_buff *skb, struct uml_net_private *lp) 
}



static const struct net_kern_info pcap_kern_info = {

	.init			= pcap_init,

	.init			= pcap_init_kern,

	.protocol		= eth_protocol,

	.read			= pcap_read,

	.write			= pcap_write,