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

bdev/ftl: no need to alloc buf when get geo from ssd

Browse Source 
The ocssd spec and buildtime-check already ensures
sizeof(struct spdk_ocssd_geometry_data) is 4096, so we can use
struct spdk_ftl_dev::geo as buffer directly.

Change-Id: Id7a52f978d80284fe941d9f5d7bc7219518871e8
Signed-off-by: wuzhouhui <wuzhouhui@kingsoft.com>
Reviewed-on: https://review.gerrithub.io/c/443069
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
wuzhouhui 2019-02-02 15:02:27 +08:00 committed by Jim Harris
parent aea859eaab
commit 4ee969c2cf
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/ftl/ftl_init.c
View File

@ -347,20 +347,12 @@ static int
ftl_dev_retrieve_geo(struct spdk_ftl_dev *dev)
{
volatile struct ftl_admin_cmpl cmpl = {};
struct spdk_ocssd_geometry_data *buf;
uint32_t nsid = spdk_nvme_ns_get_id(dev->ns);
int rc = -1;
buf = malloc(PAGE_SIZE);
if (!buf) {
SPDK_ERRLOG("Memory allocation failure\n");
return -1;
}
if (spdk_nvme_ocssd_ctrlr_cmd_geometry(dev->ctrlr, nsid, buf, PAGE_SIZE,
if (spdk_nvme_ocssd_ctrlr_cmd_geometry(dev->ctrlr, nsid, &dev->geo, sizeof(dev->geo),
ftl_admin_cb, (void *)&cmpl)) {
SPDK_ERRLOG("Unable to retrieve geometry\n");
goto out;
return -1;
}
/* TODO: add a timeout */
@ -371,11 +363,9 @@ ftl_dev_retrieve_geo(struct spdk_ftl_dev *dev)
if (spdk_nvme_cpl_is_error(&cmpl.status)) {
SPDK_ERRLOG("Unexpected status code: [%d], status code type: [%d]\n",
cmpl.status.status.sc, cmpl.status.status.sct);
goto out;
return -1;
}
dev->geo = *buf;
/* TODO: add sanity checks for the geo */
dev->ppa_len = dev->geo.lbaf.grp_len +
dev->geo.lbaf.pu_len +
@ -394,10 +384,7 @@ ftl_dev_retrieve_geo(struct spdk_ftl_dev *dev)
/* We're using optimal write size as our xfer size */
dev->xfer_size = dev->geo.ws_opt;
rc = 0;
out:
free(buf);
return rc;
return 0;
}
static int