Commit 5f129721 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull virtio updates from Rusty Russell:
 "No real surprises"

* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  MAINTAINERS: add tools/virtio/ under virtio
  tools/virtio: move module license stub to module.h
  virtio: include asm/barrier explicitly
  virtio: VIRTIO_F_ANY_LAYOUT feature
  lguest: fix example launcher compilation for broken glibc headers.
  virtio-net: fix the race between channels setting and refill
  tools/lguest: real barriers.
  tools/lguest: fix missing rmb().
  virtio_balloon: leak_balloon(): only tell host if we got pages deflated
  virtio-pci: fix leaks of msix_affinity_masks
  Fix comment typo "CONFIG_PAE"
parents 15a49b9a c893c8d7

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8890,6 +8890,7 @@ M: "Michael S. Tsirkin" <mst@redhat.com> 
L:	virtualization@lists.linux-foundation.org

S:	Maintained

F:	drivers/virtio/

F:	tools/virtio/

F:	drivers/net/virtio_net.c

F:	drivers/block/virtio_blk.c

F:	include/linux/virtio_*.h

drivers/net/virtio_net.c

+1 −4
Original line number Diff line number Diff line
@@ -902,7 +902,6 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) 
	struct scatterlist sg;

	struct virtio_net_ctrl_mq s;

	struct net_device *dev = vi->dev;

	int i;



	if (!vi->has_cvq || !virtio_has_feature(vi->vdev, VIRTIO_NET_F_MQ))

		return 0;
@@ -916,10 +915,8 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) 
			 queue_pairs);

		return -EINVAL;

	} else {

		for (i = vi->curr_queue_pairs; i < queue_pairs; i++)

			if (!try_fill_recv(&vi->rq[i], GFP_KERNEL))

				schedule_delayed_work(&vi->refill, 0);

		vi->curr_queue_pairs = queue_pairs;

		schedule_delayed_work(&vi->refill, 0);

	}



	return 0;

drivers/virtio/virtio_balloon.c

+2 −1
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ static void leak_balloon(struct virtio_balloon *vb, size_t num) 
	 * virtio_has_feature(vdev, VIRTIO_BALLOON_F_MUST_TELL_HOST);

	 * is true, we *have* to do it in this order

	 */

	if (vb->num_pfns != 0)

		tell_host(vb, vb->deflate_vq);

	mutex_unlock(&vb->balloon_lock);

	release_pages_by_pfn(vb->pfns, vb->num_pfns);

drivers/virtio/virtio_pci.c

+3 −2
Original line number Diff line number Diff line
@@ -289,9 +289,9 @@ static void vp_free_vectors(struct virtio_device *vdev) 


		pci_disable_msix(vp_dev->pci_dev);

		vp_dev->msix_enabled = 0;

		vp_dev->msix_vectors = 0;

	}



	vp_dev->msix_vectors = 0;

	vp_dev->msix_used_vectors = 0;

	kfree(vp_dev->msix_names);

	vp_dev->msix_names = NULL;
@@ -309,6 +309,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors, 
	unsigned i, v;

	int err = -ENOMEM;



	vp_dev->msix_vectors = nvectors;



	vp_dev->msix_entries = kmalloc(nvectors * sizeof *vp_dev->msix_entries,

				       GFP_KERNEL);

	if (!vp_dev->msix_entries)
@@ -336,7 +338,6 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors, 
		err = -ENOSPC;

	if (err)

		goto error;

	vp_dev->msix_vectors = nvectors;

	vp_dev->msix_enabled = 1;



	/* Set the vector used for configuration */

include/linux/virtio_ring.h

+1 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_VIRTIO_RING_H

#define _LINUX_VIRTIO_RING_H



#include <asm/barrier.h>

#include <linux/irqreturn.h>

#include <uapi/linux/virtio_ring.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE