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

vhost: reduce log level of informational messages

Browse Source 
SPDK_NOTICELOG should only be used for significant but non-warning/error
messages, such as notifications of deprecated config file sections.

Change-Id: I885dfe839c9cbc9eceabee234e4d0eb74c6910df
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/405923
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
This commit is contained in:
Daniel Verkamp 2018-03-30 14:00:56 -07:00 committed by Ben Walker
parent 4c7733618a
commit c27c2c0674
5 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/vhost/vhost.c
View File

@ -505,8 +505,8 @@ spdk_vhost_dev_mem_register(struct spdk_vhost_dev *vdev)
start = FLOOR_2MB(region->mmap_addr); start = FLOOR_2MB(region->mmap_addr);
end = CEIL_2MB(region->mmap_addr + region->mmap_size); end = CEIL_2MB(region->mmap_addr + region->mmap_size);
len = end - start; len = end - start;
SPDK_NOTICELOG("Registering VM memory for vtophys translation - 0x%jx len:0x%jx\n", SPDK_INFOLOG(SPDK_LOG_VHOST, "Registering VM memory for vtophys translation - 0x%jx len:0x%jx\n",
start, len); start, len);
if (spdk_mem_register((void *)start, len) != 0) { if (spdk_mem_register((void *)start, len) != 0) {
SPDK_WARNLOG("Failed to register memory region %"PRIu32". Future vtophys translation might fail.\n", SPDK_WARNLOG("Failed to register memory region %"PRIu32". Future vtophys translation might fail.\n",
@ -710,7 +710,7 @@ spdk_vhost_dev_register(struct spdk_vhost_dev *vdev, const char *name, const cha
return -EIO; return -EIO;
} }
SPDK_NOTICELOG("Controller %s: new controller added\n", vdev->name); SPDK_INFOLOG(SPDK_LOG_VHOST, "Controller %s: new controller added\n", vdev->name);
return 0; return 0;
out: out:
@ -733,7 +733,7 @@ spdk_vhost_dev_unregister(struct spdk_vhost_dev *vdev)
return -EIO; return -EIO;
} }
SPDK_NOTICELOG("Controller %s: removed\n", vdev->name); SPDK_INFOLOG(SPDK_LOG_VHOST, "Controller %s: removed\n", vdev->name);
free(vdev->name); free(vdev->name);
free(vdev->path); free(vdev->path);
@ -1131,7 +1131,7 @@ session_shutdown(void *arg)
vdev->registered = false; vdev->registered = false;
} }
SPDK_NOTICELOG("Exiting\n"); SPDK_INFOLOG(SPDK_LOG_VHOST, "Exiting\n");
spdk_event_call((struct spdk_event *)arg); spdk_event_call((struct spdk_event *)arg);
return NULL; return NULL;
} }
@ -1347,4 +1347,5 @@ spdk_vhost_fini(spdk_vhost_fini_cb fini_cb)
pthread_detach(tid); pthread_detach(tid);
} }
SPDK_LOG_REGISTER_COMPONENT("vhost", SPDK_LOG_VHOST)
SPDK_LOG_REGISTER_COMPONENT("vhost_ring", SPDK_LOG_VHOST_RING) SPDK_LOG_REGISTER_COMPONENT("vhost_ring", SPDK_LOG_VHOST_RING)

7
lib/vhost/vhost_blk.c
View File

@ -520,7 +520,8 @@ spdk_vhost_blk_start(struct spdk_vhost_dev *vdev, void *event_ctx)
bvdev->requestq_poller = spdk_poller_register(bvdev->bdev ? vdev_worker : no_bdev_vdev_worker, bvdev->requestq_poller = spdk_poller_register(bvdev->bdev ? vdev_worker : no_bdev_vdev_worker,
bvdev, 0); bvdev, 0);
SPDK_NOTICELOG("Started poller for vhost controller %s on lcore %d\n", vdev->name, vdev->lcore); SPDK_INFOLOG(SPDK_LOG_VHOST, "Started poller for vhost controller %s on lcore %d\n",
vdev->name, vdev->lcore);
out: out:
spdk_vhost_dev_backend_event_done(event_ctx, rc); spdk_vhost_dev_backend_event_done(event_ctx, rc);
return rc; return rc;
@ -548,7 +549,7 @@ destroy_device_poller_cb(void *arg)
spdk_vhost_vq_used_signal(&bvdev->vdev, &bvdev->vdev.virtqueue[i]); spdk_vhost_vq_used_signal(&bvdev->vdev, &bvdev->vdev.virtqueue[i]);
} }
SPDK_NOTICELOG("Stopping poller for vhost controller %s\n", bvdev->vdev.name); SPDK_INFOLOG(SPDK_LOG_VHOST, "Stopping poller for vhost controller %s\n", bvdev->vdev.name);
if (bvdev->bdev_io_channel) { if (bvdev->bdev_io_channel) {
spdk_put_io_channel(bvdev->bdev_io_channel); spdk_put_io_channel(bvdev->bdev_io_channel);
@ -772,7 +773,7 @@ spdk_vhost_blk_construct(const char *name, const char *cpumask, const char *dev_
goto out; goto out;
} }
SPDK_NOTICELOG("Controller %s: using bdev '%s'\n", name, dev_name); SPDK_INFOLOG(SPDK_LOG_VHOST, "Controller %s: using bdev '%s'\n", name, dev_name);
out: out:
if (ret != 0 && bvdev) { if (ret != 0 && bvdev) {
spdk_dma_free(bvdev); spdk_dma_free(bvdev);

17
lib/vhost/vhost_scsi.c
View File

@ -154,7 +154,8 @@ process_removed_devs(struct spdk_vhost_scsi_dev *svdev)
state->remove_cb(&svdev->vdev, state->remove_ctx); state->remove_cb(&svdev->vdev, state->remove_ctx);
state->remove_cb = NULL; state->remove_cb = NULL;
} }
SPDK_NOTICELOG("%s: hot-detached device 'Dev %u'.\n", svdev->vdev.name, i); SPDK_INFOLOG(SPDK_LOG_VHOST, "%s: hot-detached device 'Dev %u'.\n",
svdev->vdev.name, i);
} }
} }
} }
@ -847,8 +848,8 @@ spdk_vhost_scsi_dev_add_tgt(struct spdk_vhost_dev *vdev, unsigned scsi_tgt_num,
eventq_enqueue(svdev, scsi_tgt_num, VIRTIO_SCSI_T_TRANSPORT_RESET, VIRTIO_SCSI_EVT_RESET_RESCAN); eventq_enqueue(svdev, scsi_tgt_num, VIRTIO_SCSI_T_TRANSPORT_RESET, VIRTIO_SCSI_EVT_RESET_RESCAN);
} }
SPDK_NOTICELOG("Controller %s: defined target '%s' using bdev '%s'\n", SPDK_INFOLOG(SPDK_LOG_VHOST, "Controller %s: defined target '%s' using bdev '%s'\n",
vdev->name, target_name, bdev_name); vdev->name, target_name, bdev_name);
return 0; return 0;
} }
@ -884,7 +885,8 @@ spdk_vhost_scsi_dev_remove_tgt(struct spdk_vhost_dev *vdev, unsigned scsi_tgt_nu
if (cb_fn) { if (cb_fn) {
rc = cb_fn(vdev, cb_arg); rc = cb_fn(vdev, cb_arg);
} }
SPDK_NOTICELOG("%s: removed target 'Target %u'\n", vdev->name, scsi_tgt_num); SPDK_INFOLOG(SPDK_LOG_VHOST, "%s: removed target 'Target %u'\n",
vdev->name, scsi_tgt_num);
return rc; return rc;
} }
@ -906,7 +908,7 @@ spdk_vhost_scsi_dev_remove_tgt(struct spdk_vhost_dev *vdev, unsigned scsi_tgt_nu
scsi_dev_state->removed = true; scsi_dev_state->removed = true;
eventq_enqueue(svdev, scsi_tgt_num, VIRTIO_SCSI_T_TRANSPORT_RESET, VIRTIO_SCSI_EVT_RESET_REMOVED); eventq_enqueue(svdev, scsi_tgt_num, VIRTIO_SCSI_T_TRANSPORT_RESET, VIRTIO_SCSI_EVT_RESET_REMOVED);
SPDK_NOTICELOG("%s: queued 'Target %u' for hot-detach.\n", vdev->name, scsi_tgt_num); SPDK_INFOLOG(SPDK_LOG_VHOST, "%s: queued 'Target %u' for hot-detach.\n", vdev->name, scsi_tgt_num);
return 0; return 0;
} }
@ -1080,7 +1082,8 @@ spdk_vhost_scsi_start(struct spdk_vhost_dev *vdev, void *event_ctx)
} }
spdk_scsi_dev_allocate_io_channels(svdev->scsi_dev[i]); spdk_scsi_dev_allocate_io_channels(svdev->scsi_dev[i]);
} }
SPDK_NOTICELOG("Started poller for vhost controller %s on lcore %d\n", vdev->name, vdev->lcore); SPDK_INFOLOG(SPDK_LOG_VHOST, "Started poller for vhost controller %s on lcore %d\n",
vdev->name, vdev->lcore);
spdk_vhost_dev_mem_register(vdev); spdk_vhost_dev_mem_register(vdev);
@ -1121,7 +1124,7 @@ destroy_device_poller_cb(void *arg)
spdk_scsi_dev_free_io_channels(svdev->scsi_dev[i]); spdk_scsi_dev_free_io_channels(svdev->scsi_dev[i]);
} }
SPDK_NOTICELOG("Stopping poller for vhost controller %s\n", svdev->vdev.name); SPDK_INFOLOG(SPDK_LOG_VHOST, "Stopping poller for vhost controller %s\n", svdev->vdev.name);
spdk_vhost_dev_mem_unregister(&svdev->vdev); spdk_vhost_dev_mem_unregister(&svdev->vdev);
free_task_pool(svdev); free_task_pool(svdev);

2
test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c
View File

@ -61,6 +61,8 @@ DEFINE_STUB_V(spdk_bdev_close, (struct spdk_bdev_desc *desc));
DEFINE_STUB(rte_vhost_driver_enable_features, int, (const char *path, uint64_t features), 0); DEFINE_STUB(rte_vhost_driver_enable_features, int, (const char *path, uint64_t features), 0);
DEFINE_STUB_P(spdk_bdev_get_io_channel, struct spdk_io_channel, (struct spdk_bdev_desc *desc), {0}); DEFINE_STUB_P(spdk_bdev_get_io_channel, struct spdk_io_channel, (struct spdk_bdev_desc *desc), {0});
SPDK_LOG_REGISTER_COMPONENT("vhost", SPDK_LOG_VHOST)
uint32_t uint32_t
spdk_bdev_get_block_size(const struct spdk_bdev *bdev) spdk_bdev_get_block_size(const struct spdk_bdev *bdev)
{ {

2
test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c
View File

@ -69,6 +69,8 @@ DEFINE_STUB_P(spdk_scsi_dev_construct, struct spdk_scsi_dev, (const char *name,
DEFINE_STUB(spdk_scsi_dev_add_port, int, (struct spdk_scsi_dev *dev, uint64_t id, const char *name), DEFINE_STUB(spdk_scsi_dev_add_port, int, (struct spdk_scsi_dev *dev, uint64_t id, const char *name),
0); 0);
SPDK_LOG_REGISTER_COMPONENT("vhost", SPDK_LOG_VHOST)
char * char *
spdk_conf_section_get_nval(struct spdk_conf_section *sp, const char *key, int idx) spdk_conf_section_get_nval(struct spdk_conf_section *sp, const char *key, int idx)
{ {