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

nvme: make nvme_tracker fit in a single page

Browse Source 
Also add a compile-time assert to make sure this doesn't accidentally
break again in the future.

Change-Id: I4d18cfbf21392291e1bdd76eff055429009d28d6
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-03-11 16:13:19 -07:00
parent a606a3ed5c
commit 68ef53d128
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nvme/nvme_internal.h
View File

@ -102,7 +102,7 @@
* NVME_MAX_SGL_DESCRIPTORS defines the maximum number of descriptors in one SGL * NVME_MAX_SGL_DESCRIPTORS defines the maximum number of descriptors in one SGL
* segment. * segment.
*/ */
#define NVME_MAX_SGL_DESCRIPTORS (256) #define NVME_MAX_SGL_DESCRIPTORS (253)
/* /*
* NVME_MAX_IO_ENTRIES is not defined, since it is specified in CC.MQES * NVME_MAX_IO_ENTRIES is not defined, since it is specified in CC.MQES
@ -251,6 +251,12 @@ struct nvme_tracker {
struct spdk_nvme_sgl_descriptor sgl[NVME_MAX_SGL_DESCRIPTORS]; struct spdk_nvme_sgl_descriptor sgl[NVME_MAX_SGL_DESCRIPTORS];
} u; } u;
}; };
/*
* struct nvme_tracker must fit in 4K (min page size) so that the alignment math in
* nvme_qpair_construct() works correctly to ensure prp[] does not cross a page boundary.
*/
SPDK_STATIC_ASSERT(sizeof(struct nvme_tracker) <= 4096, "nvme_tracker too large");
struct spdk_nvme_qpair { struct spdk_nvme_qpair {
volatile uint32_t *sq_tdbl; volatile uint32_t *sq_tdbl;