Keeping a global discovery log page was meant to be a time saving mechanism, but in the current implementation, it doesn't work properly, and can cause undesirable behavior and potential crashes. There are two main problems with keeping a global log page. 1. Admin qpairs can be assigned to any SPDK thread. This means that when multiple initiators connect to the host and request the discovery log, they can both be running through the spdk_nvmf_ctrlr_get_log_page function at the same time. In the event that the discovery generation counter is incremented while these accesses are occurring, it can cause one or both of the threads to update the log at the same time. This results in both logs trying to free the old log page (double free) and set their log as the new one (possible memory leak). 2. The second problem is that each host is supposed to get a unique discovery log based on the subsystems to which they have access. Currently the code relies on whether the discovery log page offset in the request is equal to 0 to determine if it should load a new discovery log page or use the cached one. This is inherently faulty because it relies on initiator provided value to determine what information to provide from the log page. An initiator could easily send a discovery request with an offset greater than 0 on purpose to procure most of a log page provided to another host. Overall, I think it's safest to not cache the log page at all anymore and rely on a thread local fresh log page each time. Reported-by: Curt Bruns <curt.e.bruns@intel.com> Change-Id: Ib048e26f139927d888fed7019e0deec346359582 Signed-off-by: Seth Howell <seth.howell@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466839 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
306 lines
8.7 KiB
C
306 lines
8.7 KiB
C
/*-
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright (c) Intel Corporation.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name of Intel Corporation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "spdk/stdinc.h"
|
|
|
|
#include "spdk_cunit.h"
|
|
#include "spdk_internal/mock.h"
|
|
|
|
#include "common/lib/test_env.c"
|
|
#include "nvmf/ctrlr_discovery.c"
|
|
#include "nvmf/subsystem.c"
|
|
|
|
SPDK_LOG_REGISTER_COMPONENT("nvmf", SPDK_LOG_NVMF)
|
|
|
|
DEFINE_STUB_V(spdk_bdev_module_release_bdev,
|
|
(struct spdk_bdev *bdev));
|
|
|
|
DEFINE_STUB(spdk_bdev_get_block_size, uint32_t,
|
|
(const struct spdk_bdev *bdev), 512);
|
|
|
|
DEFINE_STUB(spdk_nvmf_transport_stop_listen,
|
|
int,
|
|
(struct spdk_nvmf_transport *transport,
|
|
const struct spdk_nvme_transport_id *trid), 0);
|
|
|
|
struct spdk_event *
|
|
spdk_event_allocate(uint32_t core, spdk_event_fn fn, void *arg1, void *arg2)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
spdk_event_call(struct spdk_event *event)
|
|
{
|
|
|
|
}
|
|
|
|
int
|
|
spdk_bdev_open(struct spdk_bdev *bdev, bool write, spdk_bdev_remove_cb_t remove_cb,
|
|
void *remove_ctx, struct spdk_bdev_desc **desc)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
spdk_bdev_close(struct spdk_bdev_desc *desc)
|
|
{
|
|
}
|
|
|
|
const char *
|
|
spdk_bdev_get_name(const struct spdk_bdev *bdev)
|
|
{
|
|
return "test";
|
|
}
|
|
|
|
const struct spdk_uuid *
|
|
spdk_bdev_get_uuid(const struct spdk_bdev *bdev)
|
|
{
|
|
return &bdev->uuid;
|
|
}
|
|
|
|
int
|
|
spdk_nvmf_transport_listen(struct spdk_nvmf_transport *transport,
|
|
const struct spdk_nvme_transport_id *trid)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
spdk_nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport,
|
|
struct spdk_nvme_transport_id *trid,
|
|
struct spdk_nvmf_discovery_log_page_entry *entry)
|
|
{
|
|
entry->trtype = 42;
|
|
}
|
|
|
|
static struct spdk_nvmf_transport g_transport = {};
|
|
|
|
struct spdk_nvmf_transport *
|
|
spdk_nvmf_transport_create(enum spdk_nvme_transport_type type,
|
|
struct spdk_nvmf_transport_opts *tprt_opts)
|
|
{
|
|
if (type == SPDK_NVME_TRANSPORT_RDMA) {
|
|
return &g_transport;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
struct spdk_nvmf_subsystem *
|
|
spdk_nvmf_tgt_find_subsystem(struct spdk_nvmf_tgt *tgt, const char *subnqn)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
struct spdk_nvmf_transport *
|
|
spdk_nvmf_tgt_get_transport(struct spdk_nvmf_tgt *tgt, enum spdk_nvme_transport_type trtype)
|
|
{
|
|
return &g_transport;
|
|
}
|
|
|
|
int
|
|
spdk_nvme_transport_id_parse_trtype(enum spdk_nvme_transport_type *trtype, const char *str)
|
|
{
|
|
if (trtype == NULL || str == NULL) {
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (strcasecmp(str, "PCIe") == 0) {
|
|
*trtype = SPDK_NVME_TRANSPORT_PCIE;
|
|
} else if (strcasecmp(str, "RDMA") == 0) {
|
|
*trtype = SPDK_NVME_TRANSPORT_RDMA;
|
|
} else {
|
|
return -ENOENT;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
spdk_nvme_transport_id_compare(const struct spdk_nvme_transport_id *trid1,
|
|
const struct spdk_nvme_transport_id *trid2)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
spdk_nvmf_ctrlr_ns_changed(struct spdk_nvmf_ctrlr *ctrlr, uint32_t nsid)
|
|
{
|
|
}
|
|
|
|
void
|
|
spdk_nvmf_ctrlr_destruct(struct spdk_nvmf_ctrlr *ctrlr)
|
|
{
|
|
}
|
|
|
|
int
|
|
spdk_nvmf_poll_group_update_subsystem(struct spdk_nvmf_poll_group *group,
|
|
struct spdk_nvmf_subsystem *subsystem)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
spdk_nvmf_poll_group_add_subsystem(struct spdk_nvmf_poll_group *group,
|
|
struct spdk_nvmf_subsystem *subsystem,
|
|
spdk_nvmf_poll_group_mod_done cb_fn, void *cb_arg)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
spdk_nvmf_poll_group_remove_subsystem(struct spdk_nvmf_poll_group *group,
|
|
struct spdk_nvmf_subsystem *subsystem,
|
|
spdk_nvmf_poll_group_mod_done cb_fn, void *cb_arg)
|
|
{
|
|
}
|
|
|
|
void
|
|
spdk_nvmf_poll_group_pause_subsystem(struct spdk_nvmf_poll_group *group,
|
|
struct spdk_nvmf_subsystem *subsystem,
|
|
spdk_nvmf_poll_group_mod_done cb_fn, void *cb_arg)
|
|
{
|
|
}
|
|
|
|
void
|
|
spdk_nvmf_poll_group_resume_subsystem(struct spdk_nvmf_poll_group *group,
|
|
struct spdk_nvmf_subsystem *subsystem,
|
|
spdk_nvmf_poll_group_mod_done cb_fn, void *cb_arg)
|
|
{
|
|
}
|
|
|
|
static void
|
|
test_discovery_log(void)
|
|
{
|
|
struct spdk_nvmf_tgt tgt = {};
|
|
struct spdk_nvmf_subsystem *subsystem;
|
|
uint8_t buffer[8192];
|
|
struct iovec iov;
|
|
struct spdk_nvmf_discovery_log_page *disc_log;
|
|
struct spdk_nvmf_discovery_log_page_entry *entry;
|
|
struct spdk_nvme_transport_id trid = {};
|
|
|
|
iov.iov_base = buffer;
|
|
iov.iov_len = 8192;
|
|
|
|
tgt.max_subsystems = 1024;
|
|
tgt.subsystems = calloc(tgt.max_subsystems, sizeof(struct spdk_nvmf_subsystem *));
|
|
SPDK_CU_ASSERT_FATAL(tgt.subsystems != NULL);
|
|
|
|
/* Add one subsystem and verify that the discovery log contains it */
|
|
subsystem = spdk_nvmf_subsystem_create(&tgt, "nqn.2016-06.io.spdk:subsystem1",
|
|
SPDK_NVMF_SUBTYPE_NVME, 0);
|
|
subsystem->allow_any_host = true;
|
|
SPDK_CU_ASSERT_FATAL(subsystem != NULL);
|
|
|
|
trid.trtype = SPDK_NVME_TRANSPORT_RDMA;
|
|
trid.adrfam = SPDK_NVMF_ADRFAM_IPV4;
|
|
snprintf(trid.traddr, sizeof(trid.traddr), "1234");
|
|
snprintf(trid.trsvcid, sizeof(trid.trsvcid), "5678");
|
|
SPDK_CU_ASSERT_FATAL(spdk_nvmf_subsystem_add_listener(subsystem, &trid) == 0);
|
|
subsystem->state = SPDK_NVMF_SUBSYSTEM_ACTIVE;
|
|
|
|
/* Get only genctr (first field in the header) */
|
|
memset(buffer, 0xCC, sizeof(buffer));
|
|
disc_log = (struct spdk_nvmf_discovery_log_page *)buffer;
|
|
spdk_nvmf_get_discovery_log_page(&tgt, "nqn.2016-06.io.spdk:host1", &iov, 1, 0,
|
|
sizeof(disc_log->genctr));
|
|
CU_ASSERT(disc_log->genctr == 1); /* one added subsystem */
|
|
|
|
/* Get only the header, no entries */
|
|
memset(buffer, 0xCC, sizeof(buffer));
|
|
disc_log = (struct spdk_nvmf_discovery_log_page *)buffer;
|
|
spdk_nvmf_get_discovery_log_page(&tgt, "nqn.2016-06.io.spdk:host1", &iov, 1, 0, sizeof(*disc_log));
|
|
CU_ASSERT(disc_log->genctr == 1);
|
|
CU_ASSERT(disc_log->numrec == 1);
|
|
|
|
/* Offset 0, exact size match */
|
|
memset(buffer, 0xCC, sizeof(buffer));
|
|
disc_log = (struct spdk_nvmf_discovery_log_page *)buffer;
|
|
spdk_nvmf_get_discovery_log_page(&tgt, "nqn.2016-06.io.spdk:host1", &iov, 1, 0,
|
|
sizeof(*disc_log) + sizeof(disc_log->entries[0]));
|
|
CU_ASSERT(disc_log->genctr != 0);
|
|
CU_ASSERT(disc_log->numrec == 1);
|
|
CU_ASSERT(disc_log->entries[0].trtype == 42);
|
|
|
|
/* Offset 0, oversize buffer */
|
|
memset(buffer, 0xCC, sizeof(buffer));
|
|
disc_log = (struct spdk_nvmf_discovery_log_page *)buffer;
|
|
spdk_nvmf_get_discovery_log_page(&tgt, "nqn.2016-06.io.spdk:host1", &iov, 1, 0, sizeof(buffer));
|
|
CU_ASSERT(disc_log->genctr != 0);
|
|
CU_ASSERT(disc_log->numrec == 1);
|
|
CU_ASSERT(disc_log->entries[0].trtype == 42);
|
|
CU_ASSERT(spdk_mem_all_zero(buffer + sizeof(*disc_log) + sizeof(disc_log->entries[0]),
|
|
sizeof(buffer) - (sizeof(*disc_log) + sizeof(disc_log->entries[0]))));
|
|
|
|
/* Get just the first entry, no header */
|
|
memset(buffer, 0xCC, sizeof(buffer));
|
|
entry = (struct spdk_nvmf_discovery_log_page_entry *)buffer;
|
|
spdk_nvmf_get_discovery_log_page(&tgt, "nqn.2016-06.io.spdk:host1", &iov,
|
|
1,
|
|
offsetof(struct spdk_nvmf_discovery_log_page, entries[0]),
|
|
sizeof(*entry));
|
|
CU_ASSERT(entry->trtype == 42);
|
|
subsystem->state = SPDK_NVMF_SUBSYSTEM_INACTIVE;
|
|
spdk_nvmf_subsystem_destroy(subsystem);
|
|
free(tgt.subsystems);
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
CU_pSuite suite = NULL;
|
|
unsigned int num_failures;
|
|
|
|
if (CU_initialize_registry() != CUE_SUCCESS) {
|
|
return CU_get_error();
|
|
}
|
|
|
|
suite = CU_add_suite("nvmf", NULL, NULL);
|
|
if (suite == NULL) {
|
|
CU_cleanup_registry();
|
|
return CU_get_error();
|
|
}
|
|
|
|
if (
|
|
CU_add_test(suite, "discovery_log", test_discovery_log) == NULL) {
|
|
CU_cleanup_registry();
|
|
return CU_get_error();
|
|
}
|
|
|
|
CU_basic_set_mode(CU_BRM_VERBOSE);
|
|
CU_basic_run_tests();
|
|
num_failures = CU_get_number_of_failures();
|
|
CU_cleanup_registry();
|
|
return num_failures;
|
|
}
|