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

nvme/opal: use static locking ranges table

Browse Source 
There are maximum 8 locking ranges per TPer, so we don't need to use
calloc() for each range.

Change-Id: Ie9d96ba28736dd7a91cb615ece99ebcefa695fc8
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1209
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Changpeng Liu 2020-03-10 00:44:41 +08:00 committed by Tomasz Zawadzki
parent 2fe1f500e8
commit 3020a6fb30
3 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdk/opal_spec.h
View File

@ -81,6 +81,8 @@
#define SPDK_OPAL_MAX_PASSWORD_SIZE 32 /* in bytes */ #define SPDK_OPAL_MAX_PASSWORD_SIZE 32 /* in bytes */
#define SPDK_OPAL_MAX_LOCKING_RANGE 8 /* maximum 8 ranges defined by spec */
/* /*
* Feature Code * Feature Code
*/ */

55
lib/nvme/nvme_opal.c
View File

@ -927,11 +927,6 @@ void
spdk_opal_dev_destruct(struct spdk_opal_dev *dev) spdk_opal_dev_destruct(struct spdk_opal_dev *dev)
{ {
pthread_mutex_destroy(&dev->mutex_lock); pthread_mutex_destroy(&dev->mutex_lock);
if (dev->max_ranges > 0) {
for (int i = 0; i < dev->max_ranges; i++) {
spdk_opal_free_locking_range_info(dev, i);
}
}
free(dev); free(dev);
} }
@ -1471,27 +1466,22 @@ opal_get_max_ranges(struct spdk_opal_dev *dev)
} }
static int static int
opal_get_locking_range_info_cb(struct spdk_opal_dev *dev, void *data) opal_get_locking_range_info_cb(struct spdk_opal_dev *dev, void *cb_arg)
{ {
int error = 0; int error = 0;
uint8_t id = *(uint8_t *)data; struct spdk_opal_locking_range_info *info = cb_arg;
error = opal_parse_and_check_status(dev, NULL); error = opal_parse_and_check_status(dev, NULL);
if (error) { if (error) {
return error; return error;
} }
if (dev->max_ranges != 0 && id > dev->max_ranges) { info->range_start = opal_response_get_u64(&dev->parsed_resp, 4);
SPDK_ERRLOG("Locking range ID not valid\n"); info->range_length = opal_response_get_u64(&dev->parsed_resp, 8);
return -EINVAL; info->read_lock_enabled = opal_response_get_u8(&dev->parsed_resp, 12);
} info->write_lock_enabled = opal_response_get_u8(&dev->parsed_resp, 16);
info->read_locked = opal_response_get_u8(&dev->parsed_resp, 20);
dev->locking_range_info[id]->range_start = opal_response_get_u64(&dev->parsed_resp, 4); info->write_locked = opal_response_get_u8(&dev->parsed_resp, 24);
dev->locking_range_info[id]->range_length = opal_response_get_u64(&dev->parsed_resp, 8);
dev->locking_range_info[id]->read_lock_enabled = opal_response_get_u8(&dev->parsed_resp, 12);
dev->locking_range_info[id]->write_lock_enabled = opal_response_get_u8(&dev->parsed_resp, 16);
dev->locking_range_info[id]->read_locked = opal_response_get_u8(&dev->parsed_resp, 20);
dev->locking_range_info[id]->write_locked = opal_response_get_u8(&dev->parsed_resp, 24);
return 0; return 0;
} }
@ -1509,19 +1499,10 @@ opal_get_locking_range_info(struct spdk_opal_dev *dev,
return err; return err;
} }
if (dev->locking_range_info[locking_range_id] == NULL) { assert(locking_range_id < SPDK_OPAL_MAX_LOCKING_RANGE);
info = calloc(1, sizeof(struct spdk_opal_locking_range_info)); info = &dev->locking_ranges[locking_range_id];
if (info == NULL) { memset(info, 0, sizeof(*info));
SPDK_ERRLOG("Memory allocation failed for spdk_opal_locking_range_info\n"); info->locking_range_id = locking_range_id;
return -ENOMEM;
}
info->locking_range_id = locking_range_id;
dev->locking_range_info[locking_range_id] = info;
} else {
info = dev->locking_range_info[locking_range_id];
memset(info, 0, sizeof(*info));
info->locking_range_id = locking_range_id;
}
opal_clear_cmd(dev); opal_clear_cmd(dev);
opal_set_comid(dev, dev->comid); opal_set_comid(dev, dev->comid);
@ -1549,7 +1530,7 @@ opal_get_locking_range_info(struct spdk_opal_dev *dev,
return err; return err;
} }
return opal_finalize_and_send(dev, 1, opal_get_locking_range_info_cb, &locking_range_id); return opal_finalize_and_send(dev, 1, opal_get_locking_range_info_cb, (void *)info);
} }
static int static int
@ -2484,16 +2465,18 @@ spdk_opal_supported(struct spdk_opal_dev *dev)
struct spdk_opal_locking_range_info * struct spdk_opal_locking_range_info *
spdk_opal_get_locking_range_info(struct spdk_opal_dev *dev, enum spdk_opal_locking_range id) spdk_opal_get_locking_range_info(struct spdk_opal_dev *dev, enum spdk_opal_locking_range id)
{ {
return dev->locking_range_info[id]; assert(id < SPDK_OPAL_MAX_LOCKING_RANGE);
return &dev->locking_ranges[id];
} }
void void
spdk_opal_free_locking_range_info(struct spdk_opal_dev *dev, enum spdk_opal_locking_range id) spdk_opal_free_locking_range_info(struct spdk_opal_dev *dev, enum spdk_opal_locking_range id)
{ {
struct spdk_opal_locking_range_info *info = dev->locking_range_info[id]; struct spdk_opal_locking_range_info *info;
free(info); assert(id < SPDK_OPAL_MAX_LOCKING_RANGE);
dev->locking_range_info[id] = NULL; info = &dev->locking_ranges[id];
memset(info, 0, sizeof(*info));
} }
uint8_t uint8_t

3
lib/nvme/nvme_opal_internal.h
View File

@ -42,7 +42,6 @@
#define MAX_TOKS 64 #define MAX_TOKS 64
#define OPAL_KEY_MAX 256 #define OPAL_KEY_MAX 256
#define OPAL_UID_LENGTH 8 #define OPAL_UID_LENGTH 8
#define OPAL_MAX_LRS 8 /* minimum 8 defined by spec */
#define SPDK_OPAL_TPER_TIMEOUT 600 /* seconds */ #define SPDK_OPAL_TPER_TIMEOUT 600 /* seconds */
@ -286,7 +285,7 @@ struct spdk_opal_dev {
uint64_t timeout; /* seconds */ uint64_t timeout; /* seconds */
uint8_t max_ranges; /* max locking range number */ uint8_t max_ranges; /* max locking range number */
struct spdk_opal_locking_range_info *locking_range_info[OPAL_MAX_LRS]; struct spdk_opal_locking_range_info locking_ranges[SPDK_OPAL_MAX_LOCKING_RANGE];
pthread_mutex_t mutex_lock; /* some structs are accessed by current thread only */ pthread_mutex_t mutex_lock; /* some structs are accessed by current thread only */
spdk_opal_revert_cb revert_cb_fn; spdk_opal_revert_cb revert_cb_fn;