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

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

Pull UML updates from Johannes Berg:
 "The only really new thing is the long-standing seccomp work
  (originally from 2021!). Wven if it still isn't enabled by default due
  to security concerns it can still be used e.g. for tests.

   - remove obsolete network transports

   - remove PCI IO port support

   - start adding seccomp-based process handling instead of ptrace"

* tag 'uml-for-linux-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux: (29 commits)
  um: remove "extern" from implementation of sigchld_handler
  um: fix unused variable warning
  um: fix SECCOMP 32bit xstate register restore
  um: pass FD for memory operations when needed
  um: Add SECCOMP support detection and initialization
  um: Implement kernel side of SECCOMP based process handling
  um: Track userspace children dying in SECCOMP mode
  um: Add helper functions to get/set state for SECCOMP
  um: Add stub side of SECCOMP/futex based process handling
  um: Move faultinfo extraction into userspace routine
  um: vector: Use mac_pton() for MAC address parsing
  um: vector: Clean up and modernize log messages
  um: chan_kern: use raw spinlock for irqs_to_free_lock
  MAINTAINERS: remove obsolete file entry in TUN/TAP DRIVER
  um: Fix tgkill compile error on old host OSes
  um: stop using PCI port I/O
  um: Remove legacy network transport infrastructure
  um: vector: Eliminate the dependency on uml_net
  um: Remove obsolete legacy network transports
  um/asm: Replace "REP; NOP" with PAUSE mnemonic
  ...
parents e9e668cd e56a50ff

Documentation/virt/uml/user_mode_linux_howto_v2.rst

+7 −40
Original line number Diff line number Diff line
@@ -147,18 +147,12 @@ The image hostname will be set to the same as the host on which you 
are creating its image. It is a good idea to change that to avoid

"Oh, bummer, I rebooted the wrong machine".



UML supports two classes of network devices - the older uml_net ones

which are scheduled for obsoletion. These are called ethX. It also

supports the newer vector IO devices which are significantly faster

and have support for some standard virtual network encapsulations like

Ethernet over GRE and Ethernet over L2TPv3. These are called vec0.

UML supports vector I/O high performance network devices which have

support for some standard virtual network encapsulations like

Ethernet over GRE and Ethernet over L2TPv3. These are called vecX.



Depending on which one is in use, ``/etc/network/interfaces`` will

need entries like::



   # legacy UML network devices

   auto eth0

   iface eth0 inet dhcp

When vector network devices are in use, ``/etc/network/interfaces``

will need entries like::



   # vector UML network devices

   auto vec0
@@ -219,16 +213,6 @@ remote UML and other VM instances. 
+-----------+--------+------------------------------------+------------+

| vde       | vector | dep. on VDE VPN: Virt.Net Locator  | varies     |

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

| tuntap    | legacy | none                               | ~ 500Mbit  |

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

| daemon    | legacy | none                               | ~ 450Mbit  |

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

| socket    | legacy | none                               | ~ 450Mbit  |

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

| ethertap  | legacy | obsolete                           | ~ 500Mbit  |

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

| vde       | legacy | obsolete                           | ~ 500Mbit  |

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



* All transports which have tso and checksum offloads can deliver speeds

  approaching 10G on TCP streams.
@@ -236,27 +220,16 @@ remote UML and other VM instances. 
* All transports which have multi-packet rx and/or tx can deliver pps

  rates of up to 1Mps or more.



* All legacy transports are generally limited to ~600-700MBit and 0.05Mps.



* GRE and L2TPv3 allow connections to all of: local machine, remote

  machines, remote network devices and remote UML instances.



* Socket allows connections only between UML instances.



* Daemon and bess require running a local switch. This switch may be

  connected to the host as well.





Network configuration privileges

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



The majority of the supported networking modes need ``root`` privileges.

For example, in the legacy tuntap networking mode, users were required

to be part of the group associated with the tunnel device.



For newer network drivers like the vector transports, ``root`` privilege

is required to fire an ioctl to setup the tun interface and/or use

raw sockets where needed.

For example, for vector transports, ``root`` privilege is required to fire

an ioctl to setup the tun interface and/or use raw sockets where needed.



This can be achieved by granting the user a particular capability instead

of running UML as root.  In case of vector transport, a user can add the
@@ -610,12 +583,6 @@ connect to a local area cloud (all the UML nodes using the same 
multicast address running on hosts in the same multicast domain (LAN)

will be automagically connected together to a virtual LAN.



Configuring Legacy transports

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



Legacy transports are now considered obsolete. Please use the vector

versions.



***********

Running UML

***********

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -25156,13 +25156,12 @@ L: linux-parisc@vger.kernel.org 
S:	Orphan

F:	drivers/net/ethernet/dec/tulip/









TUN/TAP driver









TUN/TAP DRIVER









M:	Willem de Bruijn <willemdebruijn.kernel@gmail.com>









M:	Jason Wang <jasowang@redhat.com>









S:	Maintained









W:	http://vtun.sourceforge.net/tun









F:	Documentation/networking/tuntap.rst









F:	arch/um/os-Linux/drivers/









F:	drivers/net/tap.c









F:	drivers/net/tun*

































arch/um/Kconfig



+0
−6






























Original line number
Diff line number
Diff line







@@ -52,13 +52,7 @@ 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 !UML_IOMEM_EMULATION



















config ISA









	bool
































arch/um/configs/i386_defconfig



+0
−7






























Original line number
Diff line number
Diff line







@@ -52,13 +52,6 @@ CONFIG_PACKET=y







CONFIG_UNIX=y









CONFIG_INET=y









# CONFIG_IPV6 is not set









CONFIG_UML_NET=y









CONFIG_UML_NET_ETHERTAP=y









CONFIG_UML_NET_TUNTAP=y









CONFIG_UML_NET_SLIP=y









CONFIG_UML_NET_DAEMON=y









CONFIG_UML_NET_MCAST=y









CONFIG_UML_NET_SLIRP=y









CONFIG_EXT4_FS=y









CONFIG_QUOTA=y









CONFIG_AUTOFS_FS=m
































arch/um/configs/x86_64_defconfig



+0
−7






























Original line number
Diff line number
Diff line







@@ -51,13 +51,6 @@ CONFIG_PACKET=y







CONFIG_UNIX=y









CONFIG_INET=y









# CONFIG_IPV6 is not set









CONFIG_UML_NET=y









CONFIG_UML_NET_ETHERTAP=y









CONFIG_UML_NET_TUNTAP=y









CONFIG_UML_NET_SLIP=y









CONFIG_UML_NET_DAEMON=y









CONFIG_UML_NET_MCAST=y









CONFIG_UML_NET_SLIRP=y









CONFIG_EXT4_FS=y









CONFIG_QUOTA=y









CONFIG_AUTOFS_FS=m