Commit 211604b7 authored by Dariusz Stojaczyk's avatar Dariusz Stojaczyk Committed by Jim Harris
Browse files

vhost: don't allow deleting vdev that has still open socket 



Make use of new rte_vhost API.
vdev->vid is now set via new/destroy_connection(),
new/destroy_device sets vdev->lcore.
lcore != -1 implies vid != -1, hence some lcore checks have been
replaced with vid checks.

Change-Id: I08f4932ee7e6aeb3eba4874f2e94ad407764d9c2
Signed-off-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/372075


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 3d738d45

lib/vhost/vhost.c

+63 −14
Original line number Diff line number Diff line
@@ -49,12 +49,16 @@ static char dev_dirname[PATH_MAX] = ""; 


#define MAX_VHOST_DEVICES	64



static int new_connection(int vid);

static int new_device(int vid);

static void destroy_device(int vid);

static void destroy_connection(int vid);



const struct vhost_device_ops g_spdk_vhost_ops = {

	.new_device =  new_device,

	.destroy_device = destroy_device,

	.new_connection = new_connection,

	.destroy_connection = destroy_connection,

};



static struct spdk_vhost_dev *g_spdk_vhost_devices[MAX_VHOST_DEVICES];
@@ -412,8 +416,8 @@ spdk_vhost_dev_remove(struct spdk_vhost_dev *vdev) 
	unsigned ctrlr_num;

	char path[PATH_MAX];



	if (vdev->lcore != -1) {

		SPDK_ERRLOG("Controller %s is in use and hotplug is not supported\n", vdev->name);

	if (vdev->vid != -1) {

		SPDK_ERRLOG("Controller %s has still valid connection.\n", vdev->name);

		return -ENODEV;

	}
@@ -533,6 +537,12 @@ destroy_device(int vid) 
		return;

	}



	if (vdev->lcore == -1) {

		SPDK_ERRLOG("Controller %s is not loaded.\n", vdev->name);

		pthread_mutex_unlock(&g_spdk_vhost_mutex);

		return;

	}



	if (vdev->backend->destroy_device(vdev) != 0) {

		SPDK_ERRLOG("Couldn't stop device with vid %d.\n", vid);

		pthread_mutex_unlock(&g_spdk_vhost_mutex);
@@ -547,7 +557,6 @@ destroy_device(int vid) 
	free(vdev->mem);

	spdk_vhost_free_reactor(vdev->lcore);

	vdev->lcore = -1;

	vdev->vid = -1;

	pthread_mutex_unlock(&g_spdk_vhost_mutex);

}
@@ -555,7 +564,6 @@ static int 
new_device(int vid)

{

	struct spdk_vhost_dev *vdev;

	char ifname[PATH_MAX];

	int rc = -1;

	uint16_t num_queues;

	uint16_t i;
@@ -563,19 +571,14 @@ new_device(int vid) 
	pthread_mutex_lock(&g_spdk_vhost_mutex);

	num_queues = rte_vhost_get_vring_num(vid);



	if (rte_vhost_get_ifname(vid, ifname, PATH_MAX) < 0) {

		SPDK_ERRLOG("Couldn't get a valid ifname for device %d\n", vid);

		goto out;

	}



	vdev = spdk_vhost_dev_find(ifname);

	vdev = spdk_vhost_dev_find_by_vid(vid);

	if (vdev == NULL) {

		SPDK_ERRLOG("Controller %s not found.\n", ifname);

		SPDK_ERRLOG("Controller with vid %d doesn't exist.\n", vid);

		goto out;

	}



	if (vdev->lcore != -1) {

		SPDK_ERRLOG("Controller %s already connected.\n", ifname);

		SPDK_ERRLOG("Controller %s already loaded.\n", vdev->name);

		goto out;

	}
@@ -599,7 +602,6 @@ new_device(int vid) 


	}



	vdev->vid = vid;

	vdev->num_queues = num_queues;



	if (rte_vhost_get_negotiated_features(vid, &vdev->negotiated_features) != 0) {
@@ -618,7 +620,6 @@ new_device(int vid) 
		free(vdev->mem);

		spdk_vhost_free_reactor(vdev->lcore);

		vdev->lcore = -1;

		vdev->vid = -1;

	}



out:
@@ -764,4 +765,52 @@ spdk_vhost_dump_config_json(struct spdk_vhost_dev *vdev, struct spdk_json_write_ 
	vdev->backend->dump_config_json(vdev, w);

}



static int

new_connection(int vid)

{

	struct spdk_vhost_dev *vdev;

	char ifname[PATH_MAX];



	pthread_mutex_lock(&g_spdk_vhost_mutex);

	if (rte_vhost_get_ifname(vid, ifname, PATH_MAX) < 0) {

		SPDK_ERRLOG("Couldn't get a valid ifname for device with vid %d\n", vid);

		pthread_mutex_unlock(&g_spdk_vhost_mutex);

		return -1;

	}



	vdev = spdk_vhost_dev_find(ifname);

	if (vdev == NULL) {

		SPDK_ERRLOG("Couldn't find device with vid %d to create connection for.\n", vid);

		pthread_mutex_unlock(&g_spdk_vhost_mutex);

		return -1;

	}



	if (vdev->vid != -1) {

		SPDK_ERRLOG("Device with vid %d is already connected.\n", vid);

		pthread_mutex_unlock(&g_spdk_vhost_mutex);

		return -1;

	}



	vdev->vid = vid;

	pthread_mutex_unlock(&g_spdk_vhost_mutex);

	return 0;

}



static void

destroy_connection(int vid)

{

	struct spdk_vhost_dev *vdev;



	pthread_mutex_lock(&g_spdk_vhost_mutex);

	vdev = spdk_vhost_dev_find_by_vid(vid);

	if (vdev == NULL) {

		SPDK_ERRLOG("Couldn't find device with vid %d to destroy connection for.\n", vid);

		pthread_mutex_unlock(&g_spdk_vhost_mutex);

		return;

	}



	vdev->vid = -1;

	pthread_mutex_unlock(&g_spdk_vhost_mutex);

}



SPDK_LOG_REGISTER_TRACE_FLAG("vhost_ring", SPDK_TRACE_VHOST_RING)

lib/vhost/vhost_blk.c

+6 −6
Original line number Diff line number Diff line
@@ -717,20 +717,20 @@ int 
spdk_vhost_blk_destroy(struct spdk_vhost_dev *vdev)

{

	struct spdk_vhost_blk_dev *bvdev = to_blk_dev(vdev);

	int rc;



	if (!bvdev) {

		return -EINVAL;

	}



	rc = spdk_vhost_dev_remove(&bvdev->vdev);

	if (rc != 0) {

		return rc;

	}



	spdk_bdev_close(bvdev->bdev_desc);

	bvdev->bdev = NULL;



	SPDK_NOTICELOG("Controller %s: removed device\n", vdev->name);



	if (spdk_vhost_dev_remove(&bvdev->vdev)) {

		return -EIO;

	}



	spdk_dma_free(bvdev);

	return 0;

}

lib/vhost/vhost_scsi.c

+4 −3
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ int 
spdk_vhost_scsi_dev_remove(struct spdk_vhost_dev *vdev)

{

	struct spdk_vhost_scsi_dev *svdev = to_scsi_dev(vdev);

	int i;

	int rc, i;



	if (svdev == NULL) {

		return -EINVAL;
@@ -783,8 +783,9 @@ spdk_vhost_scsi_dev_remove(struct spdk_vhost_dev *vdev) 
		}

	}



	if (spdk_vhost_dev_remove(vdev) != 0) {

		return -EIO;

	rc = spdk_vhost_dev_remove(vdev);

	if (rc != 0) {

		return rc;

	}



	spdk_ring_free(svdev->vhost_events);