Commit a08f4523 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 vhost fixes from Michael Tsirkin:
 "Fixes all over the place, most notably vhost scsi IO error fixes"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost scsi: Add support for LUN resets.
  vhost scsi: add lun parser helper
  vhost scsi: fix cmd completion race
  vhost scsi: alloc cmds per vq instead of session
  vhost: add helper to check if a vq has been setup
  vdpasim: fix "mac_pton" undefined error
  swiotlb: using SIZE_MAX needs limits.h included
parents 09162bc3 efd838fe

drivers/vdpa/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config VDPA_SIM 
	depends on RUNTIME_TESTING_MENU && HAS_DMA

	select DMA_OPS

	select VHOST_RING

	select GENERIC_NET_UTILS

	default n

	help

	  vDPA networking device simulator which loop TX traffic back

drivers/vhost/scsi.c

+280 −117

File changed.

Preview size limit exceeded, changes collapsed.

drivers/vhost/vhost.c

+6 −0
Original line number Diff line number Diff line
@@ -304,6 +304,12 @@ static void vhost_vring_call_reset(struct vhost_vring_call *call_ctx) 
	memset(&call_ctx->producer, 0x0, sizeof(struct irq_bypass_producer));

}



bool vhost_vq_is_setup(struct vhost_virtqueue *vq)

{

	return vq->avail && vq->desc && vq->used && vhost_vq_access_ok(vq);

}

EXPORT_SYMBOL_GPL(vhost_vq_is_setup);



static void vhost_vq_reset(struct vhost_dev *dev,

			   struct vhost_virtqueue *vq)

{

drivers/vhost/vhost.h

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ int vhost_get_vq_desc(struct vhost_virtqueue *, 
		      struct vhost_log *log, unsigned int *log_num);

void vhost_discard_vq_desc(struct vhost_virtqueue *, int n);



bool vhost_vq_is_setup(struct vhost_virtqueue *vq);

int vhost_vq_init_access(struct vhost_virtqueue *);

int vhost_add_used(struct vhost_virtqueue *, unsigned int head, int len);

int vhost_add_used_n(struct vhost_virtqueue *, struct vring_used_elem *heads,

include/linux/swiotlb.h

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/dma-direction.h>

#include <linux/init.h>

#include <linux/types.h>

#include <linux/limits.h>



struct device;

struct page;

CRA Git | Maintained and supported by SUSTech CRA and CCSE