From 3844ffc1c248dc7c1b19b2524bc6f96958a83af4 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Tue, 6 Oct 2020 12:16:19 -0700 Subject: [PATCH] nvmf: Repack spdk_nvmf_subsystem Pack all of the hot data into the first cache line. The first cache line covers everything up to and including the ctrlrs TAILQ. Signed-off-by: Ben Walker Change-Id: I184520661743aec91b3bb3d81e53fe8610c9383e Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4554 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Reviewed-by: Aleksey Marchuk Reviewed-by: Shuhei Matsumoto --- lib/nvmf/nvmf_internal.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h index 7166d9ffc..7e373976c 100644 --- a/lib/nvmf/nvmf_internal.h +++ b/lib/nvmf/nvmf_internal.h @@ -252,8 +252,6 @@ struct spdk_nvmf_subsystem { uint32_t id; enum spdk_nvmf_subsystem_state state; - - char subnqn[SPDK_NVMF_NQN_MAX_LEN + 1]; enum spdk_nvmf_subtype subtype; uint16_t next_cntlid; @@ -269,9 +267,6 @@ struct spdk_nvmf_subsystem { struct spdk_nvmf_tgt *tgt; - char sn[SPDK_NVME_CTRLR_SN_LEN + 1]; - char mn[SPDK_NVME_CTRLR_MN_LEN + 1]; - /* Array of pointers to namespaces of size max_nsid indexed by nsid - 1 */ struct spdk_nvmf_ns **ns; uint32_t max_nsid; @@ -283,6 +278,10 @@ struct spdk_nvmf_subsystem { TAILQ_HEAD(, spdk_nvmf_subsystem_listener) listeners; TAILQ_ENTRY(spdk_nvmf_subsystem) entries; + + char sn[SPDK_NVME_CTRLR_SN_LEN + 1]; + char mn[SPDK_NVME_CTRLR_MN_LEN + 1]; + char subnqn[SPDK_NVMF_NQN_MAX_LEN + 1]; }; int nvmf_poll_group_add_transport(struct spdk_nvmf_poll_group *group,