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

nvme/opal: using malloc data buffer instead of global buffer in discovery

Browse Source 
Althrough the drive reports that only one session and one comID are
supported, and it can only support synchronous method, but it should
allow users to send multiple security send/receive commands at the
same time.  Looking back the implementation of existing library, it
works but not so good, here as the first step, we will not use the
global data buffer for security receive command when doing level 0
discovery.

Change-Id: Ib735129b7cb6b1fd98be5fc208fbe149f3971773
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1454
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Changpeng Liu 2020-03-25 22:54:00 +08:00
parent 7707df48a3
commit 35aab73cc2
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/nvme/nvme_opal.c
View File

@ -792,18 +792,18 @@ opal_get_comid_v200(struct spdk_opal_dev *dev, const void *data)
} }
static int static int
opal_discovery0_end(struct spdk_opal_dev *dev) opal_discovery0_end(struct spdk_opal_dev *dev, void *payload, uint32_t payload_size)
{ {
bool supported = false, single_user = false; bool supported = false, single_user = false;
const struct spdk_opal_d0_hdr *hdr = (struct spdk_opal_d0_hdr *)dev->resp; const struct spdk_opal_d0_hdr *hdr = (struct spdk_opal_d0_hdr *)payload;
struct spdk_opal_d0_feat_hdr *feat_hdr; struct spdk_opal_d0_feat_hdr *feat_hdr;
const uint8_t *epos = dev->resp, *cpos = dev->resp; const uint8_t *epos = payload, *cpos = payload;
uint16_t comid = 0; uint16_t comid = 0;
uint32_t hlen = from_be32(&(hdr->length)); uint32_t hlen = from_be32(&(hdr->length));
if (hlen > IO_BUFFER_LENGTH - sizeof(*hdr)) { if (hlen > payload_size - sizeof(*hdr)) {
SPDK_ERRLOG("Discovery length overflows buffer (%zu+%u)/%u\n", SPDK_ERRLOG("Discovery length overflows buffer (%zu+%u)/%u\n",
sizeof(*hdr), hlen, IO_BUFFER_LENGTH); sizeof(*hdr), hlen, payload_size);
return -EFAULT; return -EFAULT;
} }
@ -853,23 +853,23 @@ opal_discovery0_end(struct spdk_opal_dev *dev)
SPDK_INFOLOG(SPDK_LOG_OPAL, "Single User Mode Not Supported\n"); SPDK_INFOLOG(SPDK_LOG_OPAL, "Single User Mode Not Supported\n");
} }
dev->supported = true;
dev->comid = comid; dev->comid = comid;
return 0; return 0;
} }
static int static int
opal_discovery0(struct spdk_opal_dev *dev) opal_discovery0(struct spdk_opal_dev *dev, void *payload, uint32_t payload_size)
{ {
int ret; int ret;
memset(dev->resp, 0, IO_BUFFER_LENGTH); ret = spdk_nvme_ctrlr_security_receive(dev->ctrlr, SPDK_SCSI_SECP_TCG, LV0_DISCOVERY_COMID,
dev->comid = LV0_DISCOVERY_COMID; 0, payload, payload_size);
ret = opal_recv_cmd(dev);
if (ret) { if (ret) {
return ret; return ret;
} }
return opal_discovery0_end(dev); return opal_discovery0_end(dev, payload, payload_size);
} }
static inline void static inline void
@ -903,19 +903,6 @@ opal_end_session(struct spdk_opal_dev *dev)
return opal_finalize_and_send(dev, eod, opal_end_session_cb, NULL); return opal_finalize_and_send(dev, eod, opal_end_session_cb, NULL);
} }
static int
opal_check_support(struct spdk_opal_dev *dev)
{
int ret;
opal_setup_dev(dev);
ret = opal_discovery0(dev);
dev->supported = (ret == 0 ? true : false);
return ret;
}
void void
spdk_opal_dev_destruct(struct spdk_opal_dev *dev) spdk_opal_dev_destruct(struct spdk_opal_dev *dev)
{ {
@ -1739,6 +1726,7 @@ struct spdk_opal_dev *
spdk_opal_dev_construct(struct spdk_nvme_ctrlr *ctrlr) spdk_opal_dev_construct(struct spdk_nvme_ctrlr *ctrlr)
{ {
struct spdk_opal_dev *dev; struct spdk_opal_dev *dev;
void *payload;
dev = calloc(1, sizeof(*dev)); dev = calloc(1, sizeof(*dev));
if (!dev) { if (!dev) {
@ -1749,11 +1737,20 @@ struct spdk_opal_dev *
dev->ctrlr = ctrlr; dev->ctrlr = ctrlr;
dev->timeout = SPDK_OPAL_TPER_TIMEOUT; dev->timeout = SPDK_OPAL_TPER_TIMEOUT;
if (opal_check_support(dev) != 0) { payload = calloc(1, IO_BUFFER_LENGTH);
SPDK_INFOLOG(SPDK_LOG_OPAL, "Opal is not supported on this device\n"); if (!payload) {
dev->supported = false; free(dev);
return NULL;
} }
if (opal_discovery0(dev, payload, IO_BUFFER_LENGTH)) {
SPDK_INFOLOG(SPDK_LOG_OPAL, "Opal is not supported on this device\n");
free(dev);
free(payload);
return NULL;
}
free(payload);
if (pthread_mutex_init(&dev->mutex_lock, NULL)) { if (pthread_mutex_init(&dev->mutex_lock, NULL)) {
SPDK_ERRLOG("Mutex init failed\n"); SPDK_ERRLOG("Mutex init failed\n");
free(dev); free(dev);