Commit 06bc8ce5 authored by Changpeng Liu's avatar Changpeng Liu Committed by Konrad Sztyber
Browse files

lib/vhost: use RB_TREE for vhost device management 



This is helpful when creating and starting many vhost
devices at the same time, there are lots of lookups
when starting a vhost device.

Change-Id: I3d395c569b6bab1c2c5c2f42d846dcf6f7d133f3
Signed-off-by: default avatarChangpeng Liu <changpeliu@tencent.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25402


Reviewed-by: default avatarGangCao <gang.cao@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
parent b264e22f

lib/vhost/vhost.c

+19 −15
Original line number Diff line number Diff line
@@ -15,11 +15,8 @@ 
#include "vhost_internal.h"

#include "spdk/queue.h"





static struct spdk_cpuset g_vhost_core_mask;



static TAILQ_HEAD(, spdk_vhost_dev) g_vhost_devices = TAILQ_HEAD_INITIALIZER(

			g_vhost_devices);

static pthread_mutex_t g_vhost_mutex = PTHREAD_MUTEX_INITIALIZER;



static TAILQ_HEAD(, spdk_virtio_blk_transport) g_virtio_blk_transports = TAILQ_HEAD_INITIALIZER(
@@ -27,28 +24,35 @@ static TAILQ_HEAD(, spdk_virtio_blk_transport) g_virtio_blk_transports = TAILQ_H 


static spdk_vhost_fini_cb g_fini_cb;



static RB_HEAD(vhost_dev_name_tree,

	       spdk_vhost_dev) g_vhost_devices = RB_INITIALIZER(g_vhost_devices);



static int

vhost_dev_name_cmp(struct spdk_vhost_dev *vdev1, struct spdk_vhost_dev *vdev2)

{

	return strcmp(vdev1->name, vdev2->name);

}



RB_GENERATE_STATIC(vhost_dev_name_tree, spdk_vhost_dev, node, vhost_dev_name_cmp);



struct spdk_vhost_dev *

spdk_vhost_dev_next(struct spdk_vhost_dev *vdev)

{

	if (vdev == NULL) {

		return TAILQ_FIRST(&g_vhost_devices);

		return RB_MIN(vhost_dev_name_tree, &g_vhost_devices);

	}



	return TAILQ_NEXT(vdev, tailq);

	return RB_NEXT(vhost_dev_name_tree, &g_vhost_devices, vdev);

}



struct spdk_vhost_dev *

spdk_vhost_dev_find(const char *ctrlr_name)

{

	struct spdk_vhost_dev *vdev;

	struct spdk_vhost_dev find = {};



	TAILQ_FOREACH(vdev, &g_vhost_devices, tailq) {

		if (strcmp(vdev->name, ctrlr_name) == 0) {

			return vdev;

		}

	}

	find.name = (char *)ctrlr_name;



	return NULL;

	return RB_FIND(vhost_dev_name_tree, &g_vhost_devices, &find);

}



static int
@@ -159,7 +163,7 @@ vhost_dev_register(struct spdk_vhost_dev *vdev, const char *name, const char *ma 
		return rc;

	}



	TAILQ_INSERT_TAIL(&g_vhost_devices, vdev, tailq);

	RB_INSERT(vhost_dev_name_tree, &g_vhost_devices, vdev);

	spdk_vhost_unlock();



	SPDK_INFOLOG(vhost, "Controller %s: new controller added\n", vdev->name);
@@ -186,8 +190,8 @@ vhost_dev_unregister(struct spdk_vhost_dev *vdev) 


	free(vdev->name);



	TAILQ_REMOVE(&g_vhost_devices, vdev, tailq);

	if (TAILQ_EMPTY(&g_vhost_devices) && g_fini_cb != NULL) {

	RB_REMOVE(vhost_dev_name_tree, &g_vhost_devices, vdev);

	if (RB_EMPTY(&g_vhost_devices) && g_fini_cb != NULL) {

		g_fini_cb();

	}

	spdk_vhost_unlock();

lib/vhost/vhost_internal.h

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "spdk/util.h"

#include "spdk/rpc.h"

#include "spdk/config.h"

#include "spdk/tree.h"



#define SPDK_VHOST_MAX_VQUEUES	256

#define SPDK_VHOST_MAX_VQ_SIZE	1024
@@ -211,7 +212,7 @@ struct spdk_vhost_dev { 
	/* Context passed from transport */

	void *ctxt;



	TAILQ_ENTRY(spdk_vhost_dev) tailq;

	RB_ENTRY(spdk_vhost_dev) node;

};



static inline struct spdk_vhost_user_dev *