Commit 375479c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml 

Pull UML updates from Richard Weinberger:

 - a new and faster epoll based IRQ controller and NIC driver

 - misc fixes and janitorial updates

* git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  Fix vector raw inintialization logic
  Migrate vector timers to new timer API
  um: Compile with modern headers
  um: vector: Fix an error handling path in 'vector_parse()'
  um: vector: Fix a memory allocation check
  um: vector: fix missing unlock on error in vector_net_open()
  um: Add missing EXPORT for free_irq_by_fd()
  High Performance UML Vector Network Driver
  Epoll based IRQ controller
  um: Use POSIX ucontext_t instead of struct ucontext
  um: time: Use timespec64 for persistent clock
  um: Restore symbol versions for __memcpy and memcpy
parents 45df60cd e40238de

arch/um/Kconfig.net

+11 −0
Original line number Diff line number Diff line
@@ -109,6 +109,17 @@ config UML_NET_DAEMON 
        more than one without conflict.  If you don't need UML networking,

        say N.



config UML_NET_VECTOR

	bool "Vector I/O high performance network devices"

	depends on UML_NET

	help

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

	and receive functions. The host running the UML guest must have

	a linux kernel version above 3.0 and a libc version > 2.13.

	This driver provides tap, raw, gre and l2tpv3 network transports

	with up to 4 times higher network throughput than the UML network

	drivers.



config UML_NET_VDE

	bool "VDE transport"

	depends on UML_NET

arch/um/drivers/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
slip-objs := slip_kern.o slip_user.o

slirp-objs := slirp_kern.o slirp_user.o

daemon-objs := daemon_kern.o daemon_user.o

vector-objs := vector_kern.o vector_user.o vector_transports.o

umcast-objs := umcast_kern.o umcast_user.o

net-objs := net_kern.o net_user.o

mconsole-objs := mconsole_kern.o mconsole_user.o
@@ -43,6 +44,7 @@ obj-$(CONFIG_STDERR_CONSOLE) += stderr_console.o 
obj-$(CONFIG_UML_NET_SLIP) += slip.o slip_common.o

obj-$(CONFIG_UML_NET_SLIRP) += slirp.o slip_common.o

obj-$(CONFIG_UML_NET_DAEMON) += daemon.o 

obj-$(CONFIG_UML_NET_VECTOR) += vector.o

obj-$(CONFIG_UML_NET_VDE) += vde.o

obj-$(CONFIG_UML_NET_MCAST) += umcast.o

obj-$(CONFIG_UML_NET_PCAP) += pcap.o
@@ -61,7 +63,7 @@ obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o 
obj-$(CONFIG_UML_RANDOM) += random.o



# pcap_user.o must be added explicitly.

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

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

CFLAGS_null.o = -DDEV_NULL=$(DEV_NULL_PATH)



include arch/um/scripts/Makefile.rules

arch/um/drivers/chan_kern.c

+8 −45
Original line number Diff line number Diff line
@@ -171,56 +171,19 @@ int enable_chan(struct line *line) 
	return err;

}



/* Items are added in IRQ context, when free_irq can't be called, and

 * removed in process context, when it can.

 * This handles interrupt sources which disappear, and which need to

 * be permanently disabled.  This is discovered in IRQ context, but

 * the freeing of the IRQ must be done later.

 */

static DEFINE_SPINLOCK(irqs_to_free_lock);

static LIST_HEAD(irqs_to_free);



void free_irqs(void)

{

	struct chan *chan;

	LIST_HEAD(list);

	struct list_head *ele;

	unsigned long flags;



	spin_lock_irqsave(&irqs_to_free_lock, flags);

	list_splice_init(&irqs_to_free, &list);

	spin_unlock_irqrestore(&irqs_to_free_lock, flags);



	list_for_each(ele, &list) {

		chan = list_entry(ele, struct chan, free_list);



		if (chan->input && chan->enabled)

			um_free_irq(chan->line->driver->read_irq, chan);

		if (chan->output && chan->enabled)

			um_free_irq(chan->line->driver->write_irq, chan);

		chan->enabled = 0;

	}

}



static void close_one_chan(struct chan *chan, int delay_free_irq)

{

	unsigned long flags;



	if (!chan->opened)

		return;



	if (delay_free_irq) {

		spin_lock_irqsave(&irqs_to_free_lock, flags);

		list_add(&chan->free_list, &irqs_to_free);

		spin_unlock_irqrestore(&irqs_to_free_lock, flags);

	}

	else {

    /* we can safely call free now - it will be marked

     *  as free and freed once the IRQ stopped processing

     */

	if (chan->input && chan->enabled)

		um_free_irq(chan->line->driver->read_irq, chan);

	if (chan->output && chan->enabled)

		um_free_irq(chan->line->driver->write_irq, chan);

	chan->enabled = 0;

	}

	if (chan->ops->close != NULL)

		(*chan->ops->close)(chan->fd, chan->data);

arch/um/drivers/line.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ int line_setup_irq(int fd, int input, int output, struct line *line, void *data) 
	if (err)

		return err;

	if (output)

		err = um_request_irq(driver->write_irq, fd, IRQ_WRITE,

		err = um_request_irq(driver->write_irq, fd, IRQ_NONE,

				     line_write_interrupt, IRQF_SHARED,

				     driver->write_irq_name, data);

	return err;

arch/um/drivers/net_kern.c

+2 −2
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static void uml_net_user_timer_expire(struct timer_list *t) 
#endif

}



static void setup_etheraddr(struct net_device *dev, char *str)

void uml_net_setup_etheraddr(struct net_device *dev, char *str)

{

	unsigned char *addr = dev->dev_addr;

	char *end;
@@ -412,7 +412,7 @@ static void eth_configure(int n, void *init, char *mac, 
	 */

	snprintf(dev->name, sizeof(dev->name), "eth%d", n);



	setup_etheraddr(dev, mac);

	uml_net_setup_etheraddr(dev, mac);



	printk(KERN_INFO "Netdevice %d (%pM) : ", n, dev->dev_addr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE