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

Commit 585457fc 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/vhost fixes from Michael Tsirkin:
 "Random fixes and cleanups that accumulated over the time"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio/s390: virtio: constify virtio_config_ops structures
  virtio/s390: add missing \n to end of dev_err message
  virtio/s390: support READ_STATUS command for virtio-ccw
  tools/virtio/ringtest: tweaks for s390
  tools/virtio/ringtest: fix run-on-all.sh for offline cpus
  virtio_console: fix a crash in config_work_handler
  vhost/scsi: silence uninitialized variable warning
  vhost: scsi: constify target_core_fabric_ops structures
parents bb6c01c2 0db1dba5

drivers/char/virtio_console.c

+1 −1
Original line number Diff line number Diff line
@@ -1862,7 +1862,7 @@ static void config_work_handler(struct work_struct *work) 
{

	struct ports_device *portdev;



	portdev = container_of(work, struct ports_device, control_work);

	portdev = container_of(work, struct ports_device, config_work);

	if (!use_multiport(portdev)) {

		struct virtio_device *vdev;

		struct port *port;

drivers/s390/virtio/virtio_ccw.c

+27 −2
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ static struct airq_info *airq_areas[MAX_AIRQ_AREAS]; 
#define CCW_CMD_WRITE_CONF 0x21

#define CCW_CMD_WRITE_STATUS 0x31

#define CCW_CMD_READ_VQ_CONF 0x32

#define CCW_CMD_READ_STATUS 0x72

#define CCW_CMD_SET_IND_ADAPTER 0x73

#define CCW_CMD_SET_VIRTIO_REV 0x83
@@ -160,6 +161,7 @@ static struct airq_info *airq_areas[MAX_AIRQ_AREAS]; 
#define VIRTIO_CCW_DOING_SET_CONF_IND 0x04000000

#define VIRTIO_CCW_DOING_SET_IND_ADAPTER 0x08000000

#define VIRTIO_CCW_DOING_SET_VIRTIO_REV 0x10000000

#define VIRTIO_CCW_DOING_READ_STATUS 0x20000000

#define VIRTIO_CCW_INTPARM_MASK 0xffff0000



static struct virtio_ccw_device *to_vc_device(struct virtio_device *vdev)
@@ -452,7 +454,7 @@ static void virtio_ccw_del_vq(struct virtqueue *vq, struct ccw1 *ccw) 
	 * This may happen on device detach.

	 */

	if (ret && (ret != -ENODEV))

		dev_warn(&vq->vdev->dev, "Error %d while deleting queue %d",

		dev_warn(&vq->vdev->dev, "Error %d while deleting queue %d\n",

			 ret, index);



	vring_del_virtqueue(vq);
@@ -892,6 +894,28 @@ static void virtio_ccw_set_config(struct virtio_device *vdev, 
static u8 virtio_ccw_get_status(struct virtio_device *vdev)

{

	struct virtio_ccw_device *vcdev = to_vc_device(vdev);

	u8 old_status = *vcdev->status;

	struct ccw1 *ccw;



	if (vcdev->revision < 1)

		return *vcdev->status;



	ccw = kzalloc(sizeof(*ccw), GFP_DMA | GFP_KERNEL);

	if (!ccw)

		return old_status;



	ccw->cmd_code = CCW_CMD_READ_STATUS;

	ccw->flags = 0;

	ccw->count = sizeof(*vcdev->status);

	ccw->cda = (__u32)(unsigned long)vcdev->status;

	ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_READ_STATUS);

/*

 * If the channel program failed (should only happen if the device

 * was hotunplugged, and then we clean up via the machine check

 * handler anyway), vcdev->status was not overwritten and we just

 * return the old status, which is fine.

*/

	kfree(ccw);



	return *vcdev->status;

}
@@ -920,7 +944,7 @@ static void virtio_ccw_set_status(struct virtio_device *vdev, u8 status) 
	kfree(ccw);

}



static struct virtio_config_ops virtio_ccw_config_ops = {

static const struct virtio_config_ops virtio_ccw_config_ops = {

	.get_features = virtio_ccw_get_features,

	.finalize_features = virtio_ccw_finalize_features,

	.get = virtio_ccw_get_config,
@@ -987,6 +1011,7 @@ static void virtio_ccw_check_activity(struct virtio_ccw_device *vcdev, 
		case VIRTIO_CCW_DOING_READ_CONFIG:

		case VIRTIO_CCW_DOING_WRITE_CONFIG:

		case VIRTIO_CCW_DOING_WRITE_STATUS:

		case VIRTIO_CCW_DOING_READ_STATUS:

		case VIRTIO_CCW_DOING_SET_VQ:

		case VIRTIO_CCW_DOING_SET_IND:

		case VIRTIO_CCW_DOING_SET_CONF_IND:

drivers/vhost/scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -843,7 +843,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) 
	struct iov_iter out_iter, in_iter, prot_iter, data_iter;

	u64 tag;

	u32 exp_data_len, data_direction;

	unsigned out, in;

	unsigned int out = 0, in = 0;

	int head, ret, prot_bytes;

	size_t req_size, rsp_size = sizeof(struct virtio_scsi_cmd_resp);

	size_t out_size, in_size;
@@ -2087,7 +2087,7 @@ static struct configfs_attribute *vhost_scsi_wwn_attrs[] = { 
	NULL,

};



static struct target_core_fabric_ops vhost_scsi_ops = {

static const struct target_core_fabric_ops vhost_scsi_ops = {

	.module				= THIS_MODULE,

	.name				= "vhost",

	.get_fabric_name		= vhost_scsi_get_fabric_name,

tools/virtio/ringtest/main.h

+12 −0
Original line number Diff line number Diff line
@@ -26,6 +26,16 @@ static inline void wait_cycles(unsigned long long cycles) 
#define VMEXIT_CYCLES 500

#define VMENTRY_CYCLES 500



#elif defined(__s390x__)

static inline void wait_cycles(unsigned long long cycles)

{

	asm volatile("0: brctg %0,0b" : : "d" (cycles));

}



/* tweak me */

#define VMEXIT_CYCLES 200

#define VMENTRY_CYCLES 200



#else

static inline void wait_cycles(unsigned long long cycles)

{
@@ -81,6 +91,8 @@ extern unsigned ring_size; 
/* Is there a portable way to do this? */

#if defined(__x86_64__) || defined(__i386__)

#define cpu_relax() asm ("rep; nop" ::: "memory")

#elif defined(__s390x__)

#define cpu_relax() barrier()

#else

#define cpu_relax() assert(0)

#endif

tools/virtio/ringtest/run-on-all.sh

+3 −2
Original line number Diff line number Diff line 
#!/bin/sh



CPUS_ONLINE=$(lscpu --online -p=cpu|grep -v -e '#')

#use last CPU for host. Why not the first?

#many devices tend to use cpu0 by default so

#it tends to be busier

HOST_AFFINITY=$(lscpu -p=cpu | tail -1)

HOST_AFFINITY=$(echo "${CPUS_ONLINE}"|tail -n 1)



#run command on all cpus

for cpu in $(seq 0 $HOST_AFFINITY)

for cpu in $CPUS_ONLINE

do

	#Don't run guest and host on same CPU

	#It actually works ok if using signalling