Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux (736a2dd2) · Commits · 戴 / test

Pull virtio & lguest updates from Rusty Russell: "Lots of virtio work which wasn't quite ready for last merge window. Plus I dived into lguest again, reworking the pagetable code so we can move the switcher page: our fixmaps sometimes take more than 2MB now..." Ugh. Annoying conflicts with the tcm_vhost -> vhost_scsi rename. Hopefully correctly resolved. * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (57 commits) caif_virtio: Remove bouncing email addresses lguest: improve code readability in lg_cpu_start. virtio-net: fill only rx queues which are being used lguest: map Switcher below fixmap. lguest: cache last cpu we ran on. lguest: map Switcher text whenever we allocate a new pagetable. lguest: don't share Switcher PTE pages between guests. lguest: expost switcher_pages array (as lg_switcher_pages). lguest: extract shadow PTE walking / allocating. lguest: make check_gpte et. al return bool. lguest: assume Switcher text is a single page. lguest: rename switcher_page to switcher_pages. lguest: remove RESERVE_MEM constant. lguest: check vaddr not pgd for Switcher protection. lguest: prepare to make SWITCHER_ADDR a variable. virtio: console: replace EMFILE with EBUSY for already-open port virtio-scsi: reset virtqueue affinity when doing cpu hotplug virtio-scsi: introduce multiqueue support virtio-scsi: push vq lock/unlock into virtscsi_vq_done virtio-scsi: pass struct virtio_scsi to virtqueue completion function ...

Documentation/virtual/00-INDEX

+0 −3

Original line number	Diff line number	Diff line
		@@ -6,6 +6,3 @@ kvm/
		- Kernel Virtual Machine. See also http://linux-kvm.org
		uml/
		- User Mode Linux, builds/runs Linux kernel as a userspace program.
		virtio.txt
		- Text version of draft virtio spec.
		See http://ozlabs.org/~rusty/virtio-spec

Documentation/virtual/virtio-spec.txt

deleted100644 → 0

+0 −3210

File deleted.

Preview size limit exceeded, changes collapsed.

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -8743,6 +8743,7 @@ F: drivers/virtio/
		F: drivers/net/virtio_net.c
		F: drivers/block/virtio_blk.c
		F: include/linux/virtio_*.h
		F: include/uapi/linux/virtio_*.h

		VIRTIO HOST (VHOST)
		M: "Michael S. Tsirkin" <mst@redhat.com>

arch/x86/include/asm/lguest.h

+5 −12

Original line number	Diff line number	Diff line
		@@ -11,18 +11,11 @@

		#define GUEST_PL 1

		/* Every guest maps the core switcher code. */
		#define SHARED_SWITCHER_PAGES \
		DIV_ROUND_UP(end_switcher_text - start_switcher_text, PAGE_SIZE)
		/* Pages for switcher itself, then two pages per cpu */
		#define TOTAL_SWITCHER_PAGES (SHARED_SWITCHER_PAGES + 2 * nr_cpu_ids)

		/* We map at -4M (-2M for PAE) for ease of mapping (one PTE page). */
		#ifdef CONFIG_X86_PAE
		#define SWITCHER_ADDR 0xFFE00000
		#else
		#define SWITCHER_ADDR 0xFFC00000
		#endif
		/* Page for Switcher text itself, then two pages per cpu */
		#define TOTAL_SWITCHER_PAGES (1 + 2 * nr_cpu_ids)

		/* Where we map the Switcher, in both Host and Guest. */
		extern unsigned long switcher_addr;

		/* Found in switcher.S */
		extern unsigned long default_idt_entries[];

block/blk-integrity.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ new_segment:
		if (!sg)
		sg = sglist;
		else {
		sg->page_link &= ~0x02;
		sg_unmark_end(sg);
		sg = sg_next(sg);
		}

Admin message