Skip to content

Commit 12cc524

Browse files
committed
Merge tag 'uml-for-linus-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux
Pull UML updates from Richard Weinberger: - Removal of dead code (TT mode leftovers, etc) - Fixes for the network vector driver - Fixes for time-travel mode * tag 'uml-for-linus-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux: um: fix time-travel syscall scheduling hack um: Remove outdated asm/sysrq.h header um: Remove the declaration of user_thread function um: Remove the call to SUBARCH_EXECVE1 macro um: Remove unused mm_fd field from mm_id um: Remove unused fields from thread_struct um: Remove the redundant newpage check in update_pte_range um: Remove unused kpte_clear_flush macro um: Remove obsoleted declaration for execute_syscall_skas user_mode_linux_howto_v2: add VDE vector support in doc vector_user: add VDE support um: remove ARCH_NO_PREEMPT_DYNAMIC um: vector: Fix NAPI budget handling um: vector: Replace locks guarding queue depth with atomics um: remove variable stack array in os_rcv_fd_msg()
2 parents 0c33037 + 381d2f9 commit 12cc524

File tree

24 files changed

+286
-189
lines changed

24 files changed

+286
-189
lines changed

Documentation/virt/uml/user_mode_linux_howto_v2.rst

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,8 @@ remote UML and other VM instances.
217217
+-----------+--------+------------------------------------+------------+
218218
| fd | vector | dependent on fd type | varies |
219219
+-----------+--------+------------------------------------+------------+
220+
| vde | vector | dep. on VDE VPN: Virt.Net Locator | varies |
221+
+-----------+--------+------------------------------------+------------+
220222
| tuntap | legacy | none | ~ 500Mbit |
221223
+-----------+--------+------------------------------------+------------+
222224
| daemon | legacy | none | ~ 450Mbit |
@@ -573,6 +575,41 @@ https://github.com/NetSys/bess/wiki/Built-In-Modules-and-Ports
573575

574576
BESS transport does not require any special privileges.
575577

578+
VDE vector transport
579+
--------------------
580+
581+
Virtual Distributed Ethernet (VDE) is a project whose main goal is to provide a
582+
highly flexible support for virtual networking.
583+
584+
http://wiki.virtualsquare.org/#/tutorials/vdebasics
585+
586+
Common usages of VDE include fast prototyping and teaching.
587+
588+
Examples:
589+
590+
``vecX:transport=vde,vnl=tap://tap0``
591+
592+
use tap0
593+
594+
``vecX:transport=vde,vnl=slirp://``
595+
596+
use slirp
597+
598+
``vec0:transport=vde,vnl=vde:///tmp/switch``
599+
600+
connect to a vde switch
601+
602+
``vecX:transport=\"vde,vnl=cmd://ssh remote.host //tmp/sshlirp\"``
603+
604+
connect to a remote slirp (instant VPN: convert ssh to VPN, it uses sshlirp)
605+
https://github.com/virtualsquare/sshlirp
606+
607+
``vec0:transport=vde,vnl=vxvde://234.0.0.1``
608+
609+
connect to a local area cloud (all the UML nodes using the same
610+
multicast address running on hosts in the same multicast domain (LAN)
611+
will be automagically connected together to a virtual LAN.
612+
576613
Configuring Legacy transports
577614
=============================
578615

arch/um/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ config UML
1111
select ARCH_HAS_KCOV
1212
select ARCH_HAS_STRNCPY_FROM_USER
1313
select ARCH_HAS_STRNLEN_USER
14-
select ARCH_NO_PREEMPT_DYNAMIC
1514
select HAVE_ARCH_AUDITSYSCALL
1615
select HAVE_ARCH_KASAN if X86_64
1716
select HAVE_ARCH_KASAN_VMALLOC if HAVE_ARCH_KASAN

0 commit comments

Comments
 (0)