niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

nvme: remove nvme_revalidate_ns

Browse source 
The function is used in two places, and the shared code for those will
diverge later in this series.

Instead factor out a new helper to get the ids for a namespace, simplify
the calling conventions for nvme_identify_ns and just open code the
sequence.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
This commit is contained in:
Christoph Hellwig 2017-08-16 16:14:47 +02:00
parent 57eeaf8ec6
commit cdbff4f26b
1 changed files with 53 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
drivers/nvme/host/core.c
View file

@ -783,7 +783,8 @@ static int nvme_identify_ctrl(struct nvme_ctrl *dev, struct nvme_id_ctrl **id)
return error; return error;
} }
static int nvme_identify_ns_descs(struct nvme_ns *ns, unsigned nsid) static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl, unsigned nsid,
u8 *eui64, u8 *nguid, uuid_t *uuid)
{ {
struct nvme_command c = { }; struct nvme_command c = { };
int status; int status;
@ -799,7 +800,7 @@ static int nvme_identify_ns_descs(struct nvme_ns *ns, unsigned nsid)
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
status = nvme_submit_sync_cmd(ns->ctrl->admin_q, &c, data, status = nvme_submit_sync_cmd(ctrl->admin_q, &c, data,
NVME_IDENTIFY_DATA_SIZE); NVME_IDENTIFY_DATA_SIZE);
if (status) if (status)
goto free_data; goto free_data;
@ -813,33 +814,33 @@ static int nvme_identify_ns_descs(struct nvme_ns *ns, unsigned nsid)
switch (cur->nidt) { switch (cur->nidt) {
case NVME_NIDT_EUI64: case NVME_NIDT_EUI64:
if (cur->nidl != NVME_NIDT_EUI64_LEN) { if (cur->nidl != NVME_NIDT_EUI64_LEN) {
dev_warn(ns->ctrl->device, dev_warn(ctrl->device,
"ctrl returned bogus length: %d for NVME_NIDT_EUI64\n", "ctrl returned bogus length: %d for NVME_NIDT_EUI64\n",
cur->nidl); cur->nidl);
goto free_data; goto free_data;
} }
len = NVME_NIDT_EUI64_LEN; len = NVME_NIDT_EUI64_LEN;
memcpy(ns->eui, data + pos + sizeof(*cur), len); memcpy(eui64, data + pos + sizeof(*cur), len);
break; break;
case NVME_NIDT_NGUID: case NVME_NIDT_NGUID:
if (cur->nidl != NVME_NIDT_NGUID_LEN) { if (cur->nidl != NVME_NIDT_NGUID_LEN) {
dev_warn(ns->ctrl->device, dev_warn(ctrl->device,
"ctrl returned bogus length: %d for NVME_NIDT_NGUID\n", "ctrl returned bogus length: %d for NVME_NIDT_NGUID\n",
cur->nidl); cur->nidl);
goto free_data; goto free_data;
} }
len = NVME_NIDT_NGUID_LEN; len = NVME_NIDT_NGUID_LEN;
memcpy(ns->nguid, data + pos + sizeof(*cur), len); memcpy(nguid, data + pos + sizeof(*cur), len);
break; break;
case NVME_NIDT_UUID: case NVME_NIDT_UUID:
if (cur->nidl != NVME_NIDT_UUID_LEN) { if (cur->nidl != NVME_NIDT_UUID_LEN) {
dev_warn(ns->ctrl->device, dev_warn(ctrl->device,
"ctrl returned bogus length: %d for NVME_NIDT_UUID\n", "ctrl returned bogus length: %d for NVME_NIDT_UUID\n",
cur->nidl); cur->nidl);
goto free_data; goto free_data;
} }
len = NVME_NIDT_UUID_LEN; len = NVME_NIDT_UUID_LEN;
uuid_copy(&ns->uuid, data + pos + sizeof(*cur)); uuid_copy(uuid, data + pos + sizeof(*cur));
break; break;
default: default:
/* Skip unnkown types */ /* Skip unnkown types */
@ -864,9 +865,10 @@ static int nvme_identify_ns_list(struct nvme_ctrl *dev, unsigned nsid, __le32 *n
return nvme_submit_sync_cmd(dev->admin_q, &c, ns_list, 0x1000); return nvme_submit_sync_cmd(dev->admin_q, &c, ns_list, 0x1000);
} }
static int nvme_identify_ns(struct nvme_ctrl *dev, unsigned nsid, static struct nvme_id_ns *nvme_identify_ns(struct nvme_ctrl *ctrl,
struct nvme_id_ns **id) unsigned nsid)
{ {
struct nvme_id_ns *id;
struct nvme_command c = { }; struct nvme_command c = { };
int error; int error;
@ -875,15 +877,18 @@ static int nvme_identify_ns(struct nvme_ctrl *dev, unsigned nsid,
c.identify.nsid = cpu_to_le32(nsid); c.identify.nsid = cpu_to_le32(nsid);
c.identify.cns = NVME_ID_CNS_NS; c.identify.cns = NVME_ID_CNS_NS;
*id = kmalloc(sizeof(struct nvme_id_ns), GFP_KERNEL); id = kmalloc(sizeof(*id), GFP_KERNEL);
if (!*id) if (!id)
return -ENOMEM; return NULL;
error = nvme_submit_sync_cmd(dev->admin_q, &c, *id, error = nvme_submit_sync_cmd(ctrl->admin_q, &c, id, sizeof(*id));
sizeof(struct nvme_id_ns)); if (error) {
if (error) dev_warn(ctrl->device, "Identify namespace failed\n");
kfree(*id); kfree(id);
return error; return NULL;
}
return id;
} }
static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11, static int nvme_set_features(struct nvme_ctrl *dev, unsigned fid, unsigned dword11,
@ -1174,32 +1179,21 @@ static void nvme_config_discard(struct nvme_ns *ns)
blk_queue_max_write_zeroes_sectors(ns->queue, UINT_MAX); blk_queue_max_write_zeroes_sectors(ns->queue, UINT_MAX);
} }
static int nvme_revalidate_ns(struct nvme_ns *ns, struct nvme_id_ns **id) static void nvme_report_ns_ids(struct nvme_ctrl *ctrl, unsigned int nsid,
struct nvme_id_ns *id, u8 *eui64, u8 *nguid, uuid_t *uuid)
{ {
if (nvme_identify_ns(ns->ctrl, ns->ns_id, id)) { if (ctrl->vs >= NVME_VS(1, 1, 0))
dev_warn(ns->ctrl->device, "Identify namespace failed\n"); memcpy(eui64, id->eui64, sizeof(id->eui64));
return -ENODEV; if (ctrl->vs >= NVME_VS(1, 2, 0))
} memcpy(nguid, id->nguid, sizeof(id->nguid));
if (ctrl->vs >= NVME_VS(1, 3, 0)) {
if ((*id)->ncap == 0) {
kfree(*id);
return -ENODEV;
}
if (ns->ctrl->vs >= NVME_VS(1, 1, 0))
memcpy(ns->eui, (*id)->eui64, sizeof(ns->eui));
if (ns->ctrl->vs >= NVME_VS(1, 2, 0))
memcpy(ns->nguid, (*id)->nguid, sizeof(ns->nguid));
if (ns->ctrl->vs >= NVME_VS(1, 3, 0)) {
/* Don't treat error as fatal we potentially /* Don't treat error as fatal we potentially
* already have a NGUID or EUI-64 * already have a NGUID or EUI-64
*/ */
if (nvme_identify_ns_descs(ns, ns->ns_id)) if (nvme_identify_ns_descs(ctrl, nsid, eui64, nguid, uuid))
dev_warn(ns->ctrl->device, dev_warn(ctrl->device,
"%s: Identify Descriptors failed\n", __func__); "%s: Identify Descriptors failed\n", __func__);
} }
return 0;
} }
static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id) static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
@ -1240,22 +1234,28 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
static int nvme_revalidate_disk(struct gendisk *disk) static int nvme_revalidate_disk(struct gendisk *disk)
{ {
struct nvme_ns *ns = disk->private_data; struct nvme_ns *ns = disk->private_data;
struct nvme_id_ns *id = NULL; struct nvme_ctrl *ctrl = ns->ctrl;
int ret; struct nvme_id_ns *id;
int ret = 0;
if (test_bit(NVME_NS_DEAD, &ns->flags)) { if (test_bit(NVME_NS_DEAD, &ns->flags)) {
set_capacity(disk, 0); set_capacity(disk, 0);
return -ENODEV; return -ENODEV;
} }
ret = nvme_revalidate_ns(ns, &id); id = nvme_identify_ns(ctrl, ns->ns_id);
if (ret) if (!id)
return ret; return -ENODEV;
__nvme_revalidate_disk(disk, id); if (id->ncap == 0) {
ret = -ENODEV;
goto out;
}
nvme_report_ns_ids(ctrl, ns->ns_id, id, ns->eui, ns->nguid, &ns->uuid);
out:
kfree(id); kfree(id);
return ret;
return 0;
} }
static char nvme_pr_type(enum pr_type type) static char nvme_pr_type(enum pr_type type)
@ -2361,9 +2361,15 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
sprintf(disk_name, "nvme%dn%d", ctrl->instance, ns->instance); sprintf(disk_name, "nvme%dn%d", ctrl->instance, ns->instance);
if (nvme_revalidate_ns(ns, &id)) id = nvme_identify_ns(ctrl, nsid);
if (!id)
goto out_free_queue; goto out_free_queue;
if (id->ncap == 0)
goto out_free_id;
nvme_report_ns_ids(ctrl, ns->ns_id, id, ns->eui, ns->nguid, &ns->uuid);
if (nvme_nvm_ns_supported(ns, id) && if (nvme_nvm_ns_supported(ns, id) &&
nvme_nvm_register(ns, disk_name, node)) { nvme_nvm_register(ns, disk_name, node)) {
dev_warn(ctrl->device, "%s: LightNVM init failure\n", __func__); dev_warn(ctrl->device, "%s: LightNVM init failure\n", __func__);