Commit 9453b2d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull UML updates from Richard Weinberger:

 - Improve support for non-glibc systems

 - Vector: Add support for scripting and dynamic tap devices

 - Various fixes for the vector networking driver

 - Various fixes for time travel mode

* tag 'for-linus-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: vector: Add dynamic tap interfaces and scripting
  um: Clean up stacktrace dump
  um: Fix incorrect assumptions about max pid length
  um: Remove dead usage of TIF_IA32
  um: Remove redundant NULL check
  um: change sigio_spinlock to a mutex
  um: time-travel: Return the sequence number in ACK messages
  um: time-travel: Fix IRQ handling in time_travel_handle_message()
  um: Allow static linking for non-glibc implementations
  um: Some fixes to build UML with musl
  um: vector: Use GFP_ATOMIC under spin lock
  um: Fix null pointer dereference in vector_user_bpf
parents 42973127 f06885b3

arch/um/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ config NR_CPUS 


source "arch/$(HEADER_ARCH)/um/Kconfig"



config FORBID_STATIC_LINK

config MAY_HAVE_RUNTIME_DEPS

        bool



config STATIC_LINK

	bool "Force a static link"

	depends on !FORBID_STATIC_LINK

	depends on CC_CAN_LINK_STATIC_NO_RUNTIME_DEPS || !MAY_HAVE_RUNTIME_DEPS

	help

	  This option gives you the ability to force a static link of UML.

	  Normally, UML is linked as a shared binary.  This is inconvenient for

arch/um/drivers/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ config UML_NET_DAEMON 
config UML_NET_VECTOR

	bool "Vector I/O high performance network devices"

	depends on UML_NET

	select FORBID_STATIC_LINK

	select MAY_HAVE_RUNTIME_DEPS

	help

	This User-Mode Linux network driver uses multi-message send

	and receive functions. The host running the UML guest must have
@@ -246,7 +246,7 @@ config UML_NET_VECTOR 
config UML_NET_VDE

	bool "VDE transport (obsolete)"

	depends on UML_NET

	select FORBID_STATIC_LINK

	select MAY_HAVE_RUNTIME_DEPS

	help

	This User-Mode Linux network transport allows one or more running

	UMLs on a single host to communicate with each other and also
@@ -294,7 +294,7 @@ config UML_NET_MCAST 
config UML_NET_PCAP

	bool "pcap transport (obsolete)"

	depends on UML_NET

	select FORBID_STATIC_LINK

	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

arch/um/drivers/daemon_user.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include <stdint.h>

#include <string.h>

#include <unistd.h>

#include <errno.h>

#include <sys/types.h>

arch/um/drivers/pcap_user.c

+6 −6
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static int pcap_user_init(void *data, void *dev) 
	return 0;

}



static int pcap_open(void *data)

static int pcap_user_open(void *data)

{

	struct pcap_data *pri = data;

	__u32 netmask;
@@ -44,14 +44,14 @@ static int pcap_open(void *data) 
	if (pri->filter != NULL) {

		err = dev_netmask(pri->dev, &netmask);

		if (err < 0) {

			printk(UM_KERN_ERR "pcap_open : dev_netmask failed\n");

			printk(UM_KERN_ERR "pcap_user_open : dev_netmask failed\n");

			return -EIO;

		}



		pri->compiled = uml_kmalloc(sizeof(struct bpf_program),

					UM_GFP_KERNEL);

		if (pri->compiled == NULL) {

			printk(UM_KERN_ERR "pcap_open : kmalloc failed\n");

			printk(UM_KERN_ERR "pcap_user_open : kmalloc failed\n");

			return -ENOMEM;

		}
@@ -59,14 +59,14 @@ static int pcap_open(void *data) 
				   (struct bpf_program *) pri->compiled,

				   pri->filter, pri->optimize, netmask);

		if (err < 0) {

			printk(UM_KERN_ERR "pcap_open : pcap_compile failed - "

			printk(UM_KERN_ERR "pcap_user_open : pcap_compile failed - "

			       "'%s'\n", pcap_geterr(pri->pcap));

			goto out;

		}



		err = pcap_setfilter(pri->pcap, pri->compiled);

		if (err < 0) {

			printk(UM_KERN_ERR "pcap_open : pcap_setfilter "

			printk(UM_KERN_ERR "pcap_user_open : pcap_setfilter "

			       "failed - '%s'\n", pcap_geterr(pri->pcap));

			goto out;

		}
@@ -127,7 +127,7 @@ int pcap_user_read(int fd, void *buffer, int len, struct pcap_data *pri) 


const struct net_user_info pcap_user_info = {

	.init		= pcap_user_init,

	.open		= pcap_open,

	.open		= pcap_user_open,

	.close	 	= NULL,

	.remove	 	= pcap_remove,

	.add_address	= NULL,

arch/um/drivers/slip_user.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <errno.h>

#include <fcntl.h>

#include <string.h>

#include <sys/termios.h>

#include <termios.h>

#include <sys/wait.h>

#include <net_user.h>

#include <os.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE