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

iscsi: Use 4KiB alignment for data buffers

Browse Source 
This supports 4KiB required alignment in bdevs such as
AIO and some variants of the crypto bdev.

Change-Id: Ib6ab2e8b07fbbcc5fe3f76e41e9d3c5a7ae3fb4d
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/440767
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
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>
This commit is contained in:
Ben Walker 2019-01-16 11:26:33 -07:00 committed by Jim Harris
parent 42aa5a262b
commit 55ce66a0ad
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/iscsi/iscsi_subsystem.c
View File

@ -122,6 +122,9 @@ spdk_iscsi_globals_config_text(FILE *fp)
g_spdk_iscsi.ErrorRecoveryLevel); g_spdk_iscsi.ErrorRecoveryLevel);
} }
#define ISCSI_DATA_BUFFER_ALIGNMENT (0x1000)
#define ISCSI_DATA_BUFFER_MASK (ISCSI_DATA_BUFFER_ALIGNMENT - 1)
static void static void
spdk_mobj_ctor(struct spdk_mempool *mp, __attribute__((unused)) void *arg, spdk_mobj_ctor(struct spdk_mempool *mp, __attribute__((unused)) void *arg,
void *_m, __attribute__((unused)) unsigned i) void *_m, __attribute__((unused)) unsigned i)
@ -132,7 +135,8 @@ spdk_mobj_ctor(struct spdk_mempool *mp, __attribute__((unused)) void *arg,
m->mp = mp; m->mp = mp;
m->buf = (uint8_t *)m + sizeof(struct spdk_mobj); m->buf = (uint8_t *)m + sizeof(struct spdk_mobj);
m->buf = (void *)((unsigned long)((uint8_t *)m->buf + 512) & ~511UL); m->buf = (void *)((unsigned long)((uint8_t *)m->buf + ISCSI_DATA_BUFFER_ALIGNMENT) &
~ISCSI_DATA_BUFFER_MASK);
off = (uint64_t)(uint8_t *)m->buf - (uint64_t)(uint8_t *)m; off = (uint64_t)(uint8_t *)m->buf - (uint64_t)(uint8_t *)m;
/* /*
@ -152,9 +156,9 @@ static int spdk_iscsi_initialize_pdu_pool(void)
{ {
struct spdk_iscsi_globals *iscsi = &g_spdk_iscsi; struct spdk_iscsi_globals *iscsi = &g_spdk_iscsi;
int imm_mobj_size = spdk_get_immediate_data_buffer_size() + int imm_mobj_size = spdk_get_immediate_data_buffer_size() +
sizeof(struct spdk_mobj) + 512; sizeof(struct spdk_mobj) + ISCSI_DATA_BUFFER_ALIGNMENT;
int dout_mobj_size = spdk_get_data_out_buffer_size() + int dout_mobj_size = spdk_get_data_out_buffer_size() +
sizeof(struct spdk_mobj) + 512; sizeof(struct spdk_mobj) + ISCSI_DATA_BUFFER_ALIGNMENT;
/* create PDU pool */ /* create PDU pool */
iscsi->pdu_pool = spdk_mempool_create("PDU_Pool", iscsi->pdu_pool = spdk_mempool_create("PDU_Pool",