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

nvmf_tgt: extract offset from Get Log Page command

Browse Source 
Note that the offset is not actually used yet, just sanity checked.

Change-Id: I9464dc934e94e3d38ac0d474fce876552650f92b
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-12-13 12:56:10 -07:00
parent 86fc646fac
commit 03be4c1c59
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nvmf/request.c
View File

@ -74,6 +74,7 @@ nvmf_process_discovery_cmd(struct spdk_nvmf_request *req)
struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl;
struct spdk_nvmf_discovery_log_page *log;
uint64_t log_page_offset;
/* pre-set response details for this command */
response->status.sc = SPDK_NVME_SC_SUCCESS;
@ -98,6 +99,13 @@ nvmf_process_discovery_cmd(struct spdk_nvmf_request *req)
}
break;
case SPDK_NVME_OPC_GET_LOG_PAGE:
log_page_offset = (uint64_t)cmd->cdw12 | ((uint64_t)cmd->cdw13 << 32);
if (log_page_offset & 3) {
SPDK_ERRLOG("Invalid log page offset 0x%" PRIx64 "\n", log_page_offset);
response->status.sc = SPDK_NVME_SC_INVALID_FIELD;
return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
}
if ((cmd->cdw10 & 0xFF) == SPDK_NVME_LOG_DISCOVERY) {
log = (struct spdk_nvmf_discovery_log_page *)req->data;
log->numrec = 0;

8
lib/nvmf/virtual.c
View File

@ -148,6 +148,7 @@ nvmf_virtual_ctrlr_get_log_page(struct spdk_nvmf_request *req)
uint8_t lid;
struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl;
uint64_t log_page_offset;
if (req->data == NULL) {
SPDK_ERRLOG("get log command with no buffer\n");
@ -157,6 +158,13 @@ nvmf_virtual_ctrlr_get_log_page(struct spdk_nvmf_request *req)
memset(req->data, 0, req->length);
log_page_offset = (uint64_t)cmd->cdw12 | ((uint64_t)cmd->cdw13 << 32);
if (log_page_offset & 3) {
SPDK_ERRLOG("Invalid log page offset 0x%" PRIx64 "\n", log_page_offset);
response->status.sc = SPDK_NVME_SC_INVALID_FIELD;
return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
}
lid = cmd->cdw10 & 0xFF;
switch (lid) {
case SPDK_NVME_LOG_ERROR: