Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04659feb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull virtio updates from Michael Tsirkin:
 "Tests, fixes and cleanups.

  Just minor tweaks, there's nothing major in this cycle"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_ring: mark vring_dma_dev inline
  virtio/vhost: add Jason to list of maintainers
  virtio_blk: Delete an unnecessary initialisation in init_vq()
  virtio_blk: Use kmalloc_array() in init_vq()
  virtio: remove config.c
  virtio: console: Unlock vqs while freeing buffers
  ringtest: poll for new buffers once before updating event index
  ringtest: commonize implementation of poll_avail/poll_used
  ringtest: use link-time optimization
  virtio: update balloon size in balloon "probe"
  virtio_ring: Make interrupt suppression spec compliant
  virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices
parents a75e0032 75bfa81b

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -12783,6 +12783,7 @@ F: include/uapi/linux/virtio_console.h 


VIRTIO CORE, NET AND BLOCK DRIVERS

M:	"Michael S. Tsirkin" <mst@redhat.com>

M:	Jason Wang <jasowang@redhat.com>

L:	virtualization@lists.linux-foundation.org

S:	Maintained

F:	Documentation/devicetree/bindings/virtio/
@@ -12813,6 +12814,7 @@ F: include/uapi/linux/virtio_gpu.h 


VIRTIO HOST (VHOST)

M:	"Michael S. Tsirkin" <mst@redhat.com>

M:	Jason Wang <jasowang@redhat.com>

L:	kvm@vger.kernel.org

L:	virtualization@lists.linux-foundation.org

L:	netdev@vger.kernel.org

drivers/block/virtio_blk.c

+5 −5
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static void virtblk_config_changed(struct virtio_device *vdev) 


static int init_vq(struct virtio_blk *vblk)

{

	int err = 0;

	int err;

	int i;

	vq_callback_t **callbacks;

	const char **names;
@@ -390,13 +390,13 @@ static int init_vq(struct virtio_blk *vblk) 
	if (err)

		num_vqs = 1;



	vblk->vqs = kmalloc(sizeof(*vblk->vqs) * num_vqs, GFP_KERNEL);

	vblk->vqs = kmalloc_array(num_vqs, sizeof(*vblk->vqs), GFP_KERNEL);

	if (!vblk->vqs)

		return -ENOMEM;



	names = kmalloc(sizeof(*names) * num_vqs, GFP_KERNEL);

	callbacks = kmalloc(sizeof(*callbacks) * num_vqs, GFP_KERNEL);

	vqs = kmalloc(sizeof(*vqs) * num_vqs, GFP_KERNEL);

	names = kmalloc_array(num_vqs, sizeof(*names), GFP_KERNEL);

	callbacks = kmalloc_array(num_vqs, sizeof(*callbacks), GFP_KERNEL);

	vqs = kmalloc_array(num_vqs, sizeof(*vqs), GFP_KERNEL);

	if (!names || !callbacks || !vqs) {

		err = -ENOMEM;

		goto out;

drivers/char/virtio_console.c

+16 −6
Original line number Diff line number Diff line
@@ -1539,19 +1539,29 @@ static void remove_port_data(struct port *port) 
	spin_lock_irq(&port->inbuf_lock);

	/* Remove unused data this port might have received. */

	discard_port_data(port);

	spin_unlock_irq(&port->inbuf_lock);



	/* Remove buffers we queued up for the Host to send us data in. */

	while ((buf = virtqueue_detach_unused_buf(port->in_vq)))

		free_buf(buf, true);

	do {

		spin_lock_irq(&port->inbuf_lock);

		buf = virtqueue_detach_unused_buf(port->in_vq);

		spin_unlock_irq(&port->inbuf_lock);

		if (buf)

			free_buf(buf, true);

	} while (buf);



	spin_lock_irq(&port->outvq_lock);

	reclaim_consumed_buffers(port);

	spin_unlock_irq(&port->outvq_lock);



	/* Free pending buffers from the out-queue. */

	while ((buf = virtqueue_detach_unused_buf(port->out_vq)))

		free_buf(buf, true);

	do {

		spin_lock_irq(&port->outvq_lock);

		buf = virtqueue_detach_unused_buf(port->out_vq);

		spin_unlock_irq(&port->outvq_lock);

		if (buf)

			free_buf(buf, true);

	} while (buf);

}



/*

drivers/virtio/config.c

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
/* Configuration space parsing helpers for virtio.

 *

 * The configuration is [type][len][... len bytes ...] fields.

 *

 * Copyright 2007 Rusty Russell, IBM Corporation.

 * GPL v2 or later.

 */

#include <linux/err.h>

#include <linux/virtio.h>

#include <linux/virtio_config.h>

#include <linux/bug.h>

drivers/virtio/virtio_balloon.c

+2 −0
Original line number Diff line number Diff line
@@ -577,6 +577,8 @@ static int virtballoon_probe(struct virtio_device *vdev) 


	virtio_device_ready(vdev);



	if (towards_target(vb))

		virtballoon_changed(vdev);

	return 0;



out_del_vqs: