ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost_scsi: use proper socket id for allocated tasks

Browse Source 
Change-Id: I25b65e057cef076be4849ee0242f7979e5e290f7
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/373274
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: Paweł Niedźwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Pawel Wodkowski 2017-08-08 20:03:47 +02:00 committed by Daniel Verkamp
parent 8bcb643266
commit 2dab00ee03
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/vhost/vhost_scsi.c
View File

@ -1050,7 +1050,7 @@ alloc_task_pool(struct spdk_vhost_scsi_dev *svdev)
{ {
struct spdk_vhost_scsi_task *task; struct spdk_vhost_scsi_task *task;
uint32_t task_cnt = 0; uint32_t task_cnt = 0;
uint32_t ring_size; uint32_t ring_size, socket_id;
uint16_t i; uint16_t i;
int rc; int rc;
@ -1067,15 +1067,16 @@ alloc_task_pool(struct spdk_vhost_scsi_dev *svdev)
} }
ring_size = spdk_align32pow2(task_cnt + 1); ring_size = spdk_align32pow2(task_cnt + 1);
svdev->task_pool = spdk_ring_create(SPDK_RING_TYPE_SP_SC, ring_size, socket_id = spdk_env_get_socket_id(svdev->vdev.lcore);
spdk_env_get_socket_id(svdev->vdev.lcore));
svdev->task_pool = spdk_ring_create(SPDK_RING_TYPE_SP_SC, ring_size, socket_id);
if (svdev->task_pool == NULL) { if (svdev->task_pool == NULL) {
SPDK_ERRLOG("Controller %s: Failed to init vhost scsi task pool\n", svdev->vdev.name); SPDK_ERRLOG("Controller %s: Failed to init vhost scsi task pool\n", svdev->vdev.name);
return -1; return -1;
} }
for (i = 0; i < task_cnt; ++i) { for (i = 0; i < task_cnt; ++i) {
task = spdk_dma_zmalloc(sizeof(*task), SPDK_CACHE_LINE_SIZE, NULL); task = spdk_dma_zmalloc_socket(sizeof(*task), SPDK_CACHE_LINE_SIZE, NULL, socket_id);
if (task == NULL) { if (task == NULL) {
SPDK_ERRLOG("Controller %s: Failed to allocate task\n", svdev->vdev.name); SPDK_ERRLOG("Controller %s: Failed to allocate task\n", svdev->vdev.name);
free_task_pool(svdev); free_task_pool(svdev);
@ -1084,7 +1085,7 @@ alloc_task_pool(struct spdk_vhost_scsi_dev *svdev)
rc = spdk_ring_enqueue(svdev->task_pool, (void **)&task, 1); rc = spdk_ring_enqueue(svdev->task_pool, (void **)&task, 1);
if (rc != 1) { if (rc != 1) {
SPDK_ERRLOG("Controller %s: Failed to alloc %"PRIu32" vhost scsi tasks\n", svdev->vdev.name, SPDK_ERRLOG("Controller %s: Failed to enuqueue %"PRIu32" vhost scsi tasks\n", svdev->vdev.name,
task_cnt); task_cnt);
free_task_pool(svdev); free_task_pool(svdev);
return -1; return -1;