Implement the NVMe reservation feature
Subsystems (2)
v18 cover Implement the NVMe reservation feature
Hi guys,
I've implemented the NVMe reservation feature. Please review it, all
comments are welcome as usual.
Changes from v17 to v18:
- Use semaphore to replace mutex pr_lock for async aborting.
Changes from v16 to v17:
- Put nvmet_pr_do_abort() into workqueue to not block the the transport thread.
- Fix a bug in nvmet_pr_get_ns_pc_ref(), we should set req->pc_ref after percpu_ref_tryget_live() scucess, otherwise the pc_ref may be decremented one extra.
Changes from v15 to v16:
- Fix kerenl message print "INFO: trying to register non-static key", when the namespace is not enable reservation.
- Fix the race condition between nvmet_ctrl_init_pr() and nvmet_ns_enable() by putting nvmet_ctrl_init_pr() and nvmet_ctrl_destroy_pr() into the brace of mutex_lock(&subsys->lock). Avoid the double init of per-controller percpu ref.
Changes from v14 to v15:
- Change first patch commit message.
Changes from v13 to v14:
- Fix some grammatical mistake in commit message.
- Add two characters to bulleted lists in commit message to make it more readble.
- Adjust some tab indent.
Changes from v12 to v13:
- Set regctl to the number of all registrants instead of reported when reporting.
Changes from v11 to v12:
- Change patch to fit newest 6.12-rc2.
- Fix possible out-of-bounds access in nvmet_execute_pr_report.
- Use sysfs_emit instead of printf in nvmet_ns_resv_enable_show.
- Add struct rcu_head to nvmet_pr_registrant to free.
- Introduce a helper nvmet_pr_parse_ignore_key.
- Use NVME_CNTLID_DYNAMIC when report cntlid.
- Fix some over long line.
- Add more details to commit body.
- Separate out the include/linux/nvme.h changes to a single patch.
- Add a nvmetcli patch to support resv_enable configuration.
Changes from v10 to v11:
- Remove the cntlid from struct nvmet_pr_registrant. And add hostid to nvmet_pr_per_ctrl_ref to set the correct ctrl to do abort.
- Report all registrants, and report cntlid 0xffff.
- Change nvmet_req's flags to pc_ref.
Changes from v9 to v10:
- Fix the misjudgement in nvmet_pr_unregister_one.
- Fix the non-atomicity problem in nvmet_pr_preempt, now we set the new holder first before unregistering, this can not only make sure that during unregistering other host can not access, but also ensure that nvmet_pr_unregister_one will not unregiter the new holder(In nvmet_pr_unreg_all_others_by_prkey, I exclude current host).
- Remove the pr_abort in nvmet_ctrl, instead kill the per-controller percpu ref first and then wait to zero at the end of preempt_and_abort.
- Fix some spelling mistakes.
Changes from v8 to v9:
- Remove the maintianer request.
- Support "preemt and abort" by adding a per-controller percpu ref to ns, doing wait per-controller percpu ref to zero when a controller's reservation or registration is preempt and the racqa == "preempt and abort". Currently add per-controller percpu ref only when nvmet_pr_check_cmd_access success, others are not cared.
- Report ns support reservation when resv is enabled.
- Report ctrl support reservation.
- Change the log level to info when log lost.
- Fix the UAF issue in nvmet_pr_unreg_by_prkey, and change nvmet_pr_unreg_by_prkey to nvmet_pr_unreg_all_host_by_prkey.
- Dont unregister the host when ctrl is destroyed for keep the reservation info when reconnect.
- Remove the rcu lock and mutex lock when free ns's pr info.
- Fix the situation of log.count is zero.
- Move the rtype check to the start of preemtion, Dmitry suggests that:
1.4.1.6 reserved
Receipt of reserved coded values in defined fields in commands shall be reported as an error.
Look forward the suggestions.
And also, this avoid the non-atomic change of unregister and set new holder.
- Fix the compile error when close CONFIG_LOCKDEP.
- Change nvmet_pr_send_event_by_hostid to nvmet_pr_send_event_to_host.
- Change nvmet_pr_unreg_by_prkey_except_hostid to nvmet_pr_unreg_all_others_by_prkey.
- Change nvmet_pr_unreg_by_prkey to nvmet_pr_unreg_all_host_by_prkey.
Changes from v7 to v8:
- Add me as the new file pr.c's maintainer.
Changes from v6 to v7:
- Handle "reservation notification mask" feature command to mask reservation log.
- Add all the registrants that need to be freed to a temporary list fist, and then after calling synchronize_rcu(), release all the registrants on the temporary list.
- Fix the resv log page is random when there is no resv log page.
- Change nvmet_is_host_still_connected() to nvmet_is_host_connected().
- Remove nvmet_pr_set_rtype_and_holder() and change nvmet_pr_create_new_resv() to nvmet_pr_create_new_reservation().
- Change nvmet_pr_find_registrant_by_hostid() to nvmet_pr_find_registrant().
- Change nvmet_pr_send_resv_released() to nvmet_pr_resv_released().
- Change __nvmet_pr_unregister_one() to nvmet_pr_unregister_one().
- In nvmet_pr_unreg_by_prkey(), nvmet_pr_unreg_by_prkey_except_hostid() and nvmet_pr_unreg_except_hostid(), first do unregistering and then do event sending.
Changes from v5 to v6:
- Use synchronize_rcu() and kfree() to free registrant instead of kfree_rcu().
- Remove nvmet_pr_register_check_rkey(), put the check into pr_lock warp. And refactor the nvmet_pr_register().
- Add the print fmt to the head.
- Add lockdep_is_held(&pr->pr_lock) condition to list_for_each_entry_rcu.
- Fix the bug in nvmet_pr_update_reg_attr(), when the change_attr hook return fail, we should not replace the holder.
Changes from v4 to v5:
- Use rculist macros to handle registration_list instead of list macros regardless of in mutex lock or not.
- Use goto statement instead of return in nvmet_is_host_still_connected and __nvmet_pr_unregister_one.
- Add lockdep_assert_held and rcu_read_lock_held assert to many functions, if it's necessary.
- Add a comment to nvmet_execute_get_log_page_resv to explain how lost_count works.
- In nvmet_pr_clear, we should set holder to NULL first, I fixed this.
- Unify nvmet_pr_update_holder_rtype and __nvmet_pr_do_replace to nvmet_pr_update_reg_attr.
- Fix wrong nr_pages in nvmet_execute_get_log_page_resv.
- Fix the deadlock issue of nvmet_pr_exit_ns, put it out of the subsys lock.
Changes from v3 to v4:
- Use kfifo to handle resv log page instead of list, and also limit the resv log queue to 64.
- Change the function calling alignment style to:
nvmet_pr_send_event_by_hostid(pr, hostid,
NVME_PR_LOG_RESERVATOPM_PREEMPTED); - Put kmalloc out of rcu_read_lock in nvmet_execute_pr_report().
- Remove the goto in __nvmet_pr_unregister_one().
- Change generation to atomic_t, and remove nvmet_pr_inc_generation().
- In addtion, the number2 patch "nvmet: unify aer type enum" is not relate with this patch, so I will send it separately.
Changes from v2 to v3:
- Use rcu instead of rwlock to make IO path run faster, and put the rtype into the struct nvmet_pr_registrant.
- Limit the resv_log_list to 128.
- Change generation to atomic64.
- Put register rkey check to a warpper.
- Change nr_avl_pages to nr_pages.
- Use NVME_SC_SUCCESS instead of 0.
- Change kmalloc param to let it not sleep in mutex lock.
Changes from v1 to v2:
- Implement the reservation notification report, includes registration preempted, reservation released and reservation preempted. And also handle the reservation log page available event and send get
reservation log page command to clear log page at host.
- Put the reservation check access after validate opcode. And remove opcodes which nvmet not implement yet check.
Now there is no admin opcode nvmet implemented needs reservation check,
so I dont add reservation check to admin command path.
Next we need to do reservation check includes the situation of nsid is0xffffffff at each admin command path, if it is needed.
- Add reservation commands support in nvmet_get_cmd_effects_nvm().
- From Chaitanya, change the local variable tree style to make it cleaner, and add some comments about NVMe spec.
And also change others advice from chaitanya.
- Put the nvmet_pr_check_cmd_access and nvmet_parse_pr_cmd into reservation enable check warp.
- Remove kmem_cache instead to use kmalloc and kfree.
- Change others advice from Sagi.
- Add a blktest test case, this patch will be sent before these series of patches.
Guixin Liu (2):
nvme: add reservation command's defines
nvmet: support reservation feature
drivers/nvme/target/Makefile | 2 +- drivers/nvme/target/admin-cmd.c | 24 +- drivers/nvme/target/configfs.c | 27 + drivers/nvme/target/core.c | 58 +- drivers/nvme/target/fabrics-cmd.c | 4 +- drivers/nvme/target/nvmet.h | 66 +- drivers/nvme/target/pr.c | 1163 +++++++++++++++++++++++++++++ include/linux/nvme.h | 68 ++ 8 files changed, 1400 insertions(+), 12 deletions(-) create mode 100644 drivers/nvme/target/pr.c
Signature · 1 line
2.43.0
PATCH v18 1/2 nvme: add reservation command's defines
This is a preparation patch for NVMeOF target reservation commands implantation.
Add the defines of reservation command, such as reservation log and sub operations.
--- include/linux/nvme.h | 68 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+)
include/linux/nvme.h +68 -0
@@ -2037,4 +2037,72 @@ struct nvme_completion {#define NVME_MINOR (ver) (((ver) >> 8) & 0xff)#define NVME_TERTIARY (ver) ((ver) & 0xff) +enum { +NVME_AEN_RESV_LOG_PAGE_AVALIABLE =0x00 , +}; + +enum { +NVME_PR_LOG_EMPTY_LOG_PAGE =0x00 , +NVME_PR_LOG_REGISTRATION_PREEMPTED =0x01 , +NVME_PR_LOG_RESERVATION_RELEASED =0x02 , +NVME_PR_LOG_RESERVATOPM_PREEMPTED =0x03 , +}; + +enum { +NVME_PR_NOTIFY_BIT_REG_PREEMPTED =1 , +NVME_PR_NOTIFY_BIT_RESV_RELEASED =2 , +NVME_PR_NOTIFY_BIT_RESV_PREEMPTED =3 , +}; + +struct nvme_pr_log { +__le64 count; +__u8 type; +__u8 nr_pages; +__u8 rsvd1[2 ]; +__le32 nsid; +__u8 rsvd2[48 ]; +}; + +struct nvmet_pr_register_data { +__le64 crkey; +__le64 nrkey; +}; + +struct nvmet_pr_acquire_data { +__le64 crkey; +__le64 prkey; +}; + +struct nvmet_pr_release_data { +__le64 crkey; +}; + +enum nvme_pr_capabilities { +NVME_PR_SUPPORT_PTPL =1 , +NVME_PR_SUPPORT_WRITE_EXCLUSIVE =1 <<1 , +NVME_PR_SUPPORT_EXCLUSIVE_ACCESS =1 <<2 , +NVME_PR_SUPPORT_WRITE_EXCLUSIVE_REG_ONLY =1 <<3 , +NVME_PR_SUPPORT_EXCLUSIVE_ACCESS_REG_ONLY =1 <<4 , +NVME_PR_SUPPORT_WRITE_EXCLUSIVE_ALL_REGS =1 <<5 , +NVME_PR_SUPPORT_EXCLUSIVE_ACCESS_ALL_REGS =1 <<6 , +NVME_PR_SUPPORT_IEKEY_VER_1_3_DEF =1 <<7 , +}; + +enum nvme_pr_register_action { +NVME_PR_REGISTER_ACT_REG =0 , +NVME_PR_REGISTER_ACT_UNREG =1 , +NVME_PR_REGISTER_ACT_REPLACE =1 <<1 , +}; + +enum nvme_pr_acquire_action { +NVME_PR_ACQUIRE_ACT_ACQUIRE =0 , +NVME_PR_ACQUIRE_ACT_PREEMPT =1 , +NVME_PR_ACQUIRE_ACT_PREEMPT_AND_ABORT =1 <<1 , +}; + +enum nvme_pr_release_action { +NVME_PR_RELEASE_ACT_RELEASE =0 , +NVME_PR_RELEASE_ACT_CLEAR =1 , +}; +#endif /* _LINUX_NVME_H */
Signature · 1 line
2.43.0
PATCH v18 2/2 nvmet: support reservation feature
In reply to Guixin LiuThis patch implements the reservation feature, including:
1. reservation register(register, unregister and replace).
2. reservation acquire(acquire, preempt, preempt and abort).
3. reservation release(release and clear).
4. reservation report.
5. set feature and get feature of reservation notify mask.
6. get log page of reservation event.
Not supported:
1. persistent reservation through power loss.
Test cases:
Use nvme-cli and fio to test all implemented sub features:
1. use nvme resv-register to register host a registrant or unregister or replace a new key.
2. use nvme resv-acquire to set host to the holder, and use fio to send read and write io in all reservation type. And also test preempt and "preempt and abort".
3. use nvme resv-report to show all registrants and reservation status.
4. use nvme resv-release to release all registrants.
5. use nvme get-log to get events generated by the preceding operations.
In addition, make reservation configurable, one can set ns to support reservation before enable ns. The default of resv_enable is false.
--- drivers/nvme/target/Makefile | 2 +- drivers/nvme/target/admin-cmd.c | 24 +- drivers/nvme/target/configfs.c | 27 + drivers/nvme/target/core.c | 58 +- drivers/nvme/target/fabrics-cmd.c | 4 +- drivers/nvme/target/nvmet.h | 66 +- drivers/nvme/target/pr.c | 1163 +++++++++++++++++++++++++++++ 7 files changed, 1332 insertions(+), 12 deletions(-) create mode 100644 drivers/nvme/target/pr.c
drivers/nvme/target/Makefile +1 -1
@@ -10,7 +10,7 @@ obj-$(CONFIG_NVME_TARGET_FCLOOP) += nvme-fcloop.o obj-$(CONFIG_NVME_TARGET_TCP) += nvmet-tcp.o nvmet-y += core.o configfs.o admin-cmd.o fabrics-cmd.o \ - discovery.o io-cmd-file.o io-cmd-bdev.o + discovery.o io-cmd-file.o io-cmd-bdev.o pr.o nvmet-$(CONFIG_NVME_TARGET_DEBUGFS) += debugfs.o nvmet-$(CONFIG_NVME_TARGET_PASSTHRU) += passthru.o nvmet-$(CONFIG_BLK_DEV_ZONED) += zns.o
drivers/nvme/target/admin-cmd.c +23 -1
@@ -176,6 +176,10 @@ static void nvmet_get_cmd_effects_nvm(struct nvme_effects_log *log) log->iocs[nvme_cmd_read] = log->iocs[nvme_cmd_flush] = log->iocs[nvme_cmd_dsm] = + log->iocs[nvme_cmd_resv_acquire] = + log->iocs[nvme_cmd_resv_register] = + log->iocs[nvme_cmd_resv_release] = + log->iocs[nvme_cmd_resv_report] =cpu_to_le32 (NVME_CMD_EFFECTS_CSUPP ); log->iocs[nvme_cmd_write] = log->iocs[nvme_cmd_write_zeroes] =
@@ -340,6 +344,8 @@ static void nvmet_execute_get_log_page(struct nvmet_req *req)return nvmet_execute_get_log_cmd_effects_ns (req);case NVME_LOG_ANA :return nvmet_execute_get_log_page_ana (req); +case NVME_LOG_RESERVATION : +return nvmet_execute_get_log_page_resv (req); }pr_debug ("unhandled lid %d on qid %d\n" , req->cmd->get_log_page.lid, req->sq->qid);
@@ -433,7 +439,8 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) id->nn =cpu_to_le32 (NVMET_MAX_NAMESPACES ); id->mnan =cpu_to_le32 (NVMET_MAX_NAMESPACES ); id->oncs =cpu_to_le16 (NVME_CTRL_ONCS_DSM | -NVME_CTRL_ONCS_WRITE_ZEROES ); +NVME_CTRL_ONCS_WRITE_ZEROES | +NVME_CTRL_ONCS_RESERVATIONS );/* XXX: don't report vwc if the underlying device is write through */ id->vwc =NVME_CTRL_VWC_PRESENT ;
@@ -551,6 +558,15 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req) id->nmic =NVME_NS_NMIC_SHARED ; id->anagrpid =cpu_to_le32 (req->ns->anagrpid); +if (req->ns->pr.enable) + id->rescap =NVME_PR_SUPPORT_WRITE_EXCLUSIVE | +NVME_PR_SUPPORT_EXCLUSIVE_ACCESS | +NVME_PR_SUPPORT_WRITE_EXCLUSIVE_REG_ONLY | +NVME_PR_SUPPORT_EXCLUSIVE_ACCESS_REG_ONLY | +NVME_PR_SUPPORT_WRITE_EXCLUSIVE_ALL_REGS | +NVME_PR_SUPPORT_EXCLUSIVE_ACCESS_ALL_REGS | +NVME_PR_SUPPORT_IEKEY_VER_1_3_DEF ; +memcpy (&id->nguid, &req->ns->nguid,sizeof (id->nguid)); id->lbaf[0 ].ds = req->ns->blksize_shift;
@@ -861,6 +877,9 @@ void nvmet_execute_set_features(struct nvmet_req *req)case NVME_FEAT_WRITE_PROTECT : status =nvmet_set_feat_write_protect (req);break ; +case NVME_FEAT_RESV_MASK : + status =nvmet_set_feat_resv_notif_mask (req, cdw11); +break ;default : req->error_loc = offsetof(struct nvme_common_command , cdw10); status =NVME_SC_INVALID_FIELD |NVME_STATUS_DNR ;
@@ -959,6 +978,9 @@ void nvmet_execute_get_features(struct nvmet_req *req)case NVME_FEAT_WRITE_PROTECT : status =nvmet_get_feat_write_protect (req);break ; +case NVME_FEAT_RESV_MASK : + status =nvmet_get_feat_resv_notif_mask (req); +break ;default : req->error_loc = offsetof(struct nvme_common_command , cdw10);
drivers/nvme/target/configfs.c +27 -0
@@ -769,6 +769,32 @@ static ssize_t nvmet_ns_revalidate_size_store(struct config_item *item,CONFIGFS_ATTR_WO (nvmet_ns_, revalidate_size); +static ssize_t nvmet_ns_resv_enable_show (struct config_item *item,char *page) +{ +return sysfs_emit (page,"%d\n" ,to_nvmet_ns (item)->pr.enable); +} + +static ssize_t nvmet_ns_resv_enable_store (struct config_item *item, +const char *page,size_t count) +{ +struct nvmet_ns *ns =to_nvmet_ns (item); +bool val; + +if (kstrtobool (page, &val)) +return -EINVAL ; + +mutex_lock (&ns->subsys->lock); +if (ns->enabled) { +pr_err ("the ns:%d is already enabled.\n" , ns->nsid); +mutex_unlock (&ns->subsys->lock); +return -EINVAL ; + } + ns->pr.enable = val; +mutex_unlock (&ns->subsys->lock); +return count; +} +CONFIGFS_ATTR (nvmet_ns_, resv_enable); +static struct configfs_attribute *nvmet_ns_attrs[] = { &nvmet_ns_attr_device_path, &nvmet_ns_attr_device_nguid,
@@ -777,6 +803,7 @@ static struct configfs_attribute *nvmet_ns_attrs[] = { &nvmet_ns_attr_enable, &nvmet_ns_attr_buffered_io, &nvmet_ns_attr_revalidate_size, + &nvmet_ns_attr_resv_enable, #ifdef CONFIG_PCI_P2PDMA &nvmet_ns_attr_p2pmem, #endif
drivers/nvme/target/core.c +52 -6
137 lines not on this page · raw message
drivers/nvme/target/fabrics-cmd.c +1 -3
@@ -245,12 +245,10 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req) d->subsysnqn[NVMF_NQN_FIELD_LEN -1 ] ='\0' ; d->hostnqn[NVMF_NQN_FIELD_LEN -1 ] ='\0' ; status =nvmet_alloc_ctrl (d->subsysnqn, d->hostnqn, req, -le32_to_cpu (c->kato), &ctrl); +le32_to_cpu (c->kato), &ctrl, &d->hostid);if (status) goto out; -uuid_copy (&ctrl->hostid, &d->hostid); - dhchap_status =nvmet_setup_auth (ctrl);if (dhchap_status) { pr_err("Failed to setup authentication, dhchap status %u\n",
drivers/nvme/target/nvmet.h +65 -1
124 lines not on this page · raw message
drivers/nvme/target/pr.c new file +1163 -0
1,163 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v18 2/2] nvmet: support reservation feature
Quoted 423 lines · Guixin Liu
This patch implements the reservation feature, including:
1. reservationregister(register, unregister and replace).
2. reservationacquire(acquire, preempt, preempt and abort).
3. reservation release(release and clear).
4. reservation report.
5. set feature and get feature of reservation notify mask.
6. get log page of reservation event.Not supported:
1. persistent reservation through power loss.Test cases:
Use nvme-cli and fio to test all implemented sub features:
1. use nvme resv-register to register host a registrant or unregister or replace a new key.
2. use nvme resv-acquire to set host to the holder, and use fio to send read and write io in all reservation type. And also test preempt and "preempt and abort".
3. use nvme resv-report to show all registrants and reservation status.
4. use nvme resv-release to release all registrants.
5. use nvme get-log to get events generated by the preceding operations.In addition, make reservation configurable, one can set ns to support reservation before enable ns. The default of
resv_enableis false.Signed-off-by Guixin Liu <[email protected]>Reviewed-by Dmitry Bogdanov <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Tested-by Chaitanya Kulkarni <[email protected]>Reviewed-by Chaitanya Kulkarni <[email protected]>--- drivers/nvme/target/Makefile | 2 +- drivers/nvme/target/admin-cmd.c | 24 +- drivers/nvme/target/configfs.c | 27 + drivers/nvme/target/core.c | 58 +- drivers/nvme/target/fabrics-cmd.c | 4 +- drivers/nvme/target/nvmet.h | 66 +- drivers/nvme/target/pr.c | 1163 +++++++++++++++++++++++++++++ 7 files changed, 1332 insertions(+), 12 deletions(-) create mode 100644 drivers/nvme/target/pr.cdrivers/nvme/target/Makefile +1
-1@@ -10,7 +10,7 @@ obj-$(CONFIG_NVME_TARGET_FCLOOP) += nvme-fcloop.o obj-$(CONFIG_NVME_TARGET_TCP) += nvmet-tcp.o nvmet-y += core.o configfs.o admin-cmd.o fabrics-cmd.o \ - discovery.o io-cmd-file.o io-cmd-bdev.o + discovery.o io-cmd-file.o io-cmd-bdev.o pr.o nvmet-$(CONFIG_NVME_TARGET_DEBUGFS) += debugfs.o nvmet-$(CONFIG_NVME_TARGET_PASSTHRU) += passthru.o nvmet-$(CONFIG_BLK_DEV_ZONED) += zns.odrivers/nvme/target/admin-cmd.c +23
-1@@ -176,6 +176,10 @@ static void nvmet_get_cmd_effects_nvm(struct nvme_effects_log *log) log->iocs[nvme_cmd_read] = log->iocs[nvme_cmd_flush] = log->iocs[nvme_cmd_dsm] = + log->iocs[nvme_cmd_resv_acquire] = + log->iocs[nvme_cmd_resv_register] = + log->iocs[nvme_cmd_resv_release] = + log->iocs[nvme_cmd_resv_report] =cpu_to_le32 (NVME_CMD_EFFECTS_CSUPP ); log->iocs[nvme_cmd_write] = log->iocs[nvme_cmd_write_zeroes] =@@ -340,6 +344,8 @@ static void nvmet_execute_get_log_page(struct nvmet_req *req)return nvmet_execute_get_log_cmd_effects_ns (req);case NVME_LOG_ANA :return nvmet_execute_get_log_page_ana (req); +case NVME_LOG_RESERVATION : +return nvmet_execute_get_log_page_resv (req); }pr_debug ("unhandled lid %d on qid %d\n" , req->cmd->get_log_page.lid, req->sq->qid);@@ -433,7 +439,8 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) id->nn =cpu_to_le32 (NVMET_MAX_NAMESPACES ); id->mnan =cpu_to_le32 (NVMET_MAX_NAMESPACES ); id->oncs =cpu_to_le16 (NVME_CTRL_ONCS_DSM | -NVME_CTRL_ONCS_WRITE_ZEROES ); +NVME_CTRL_ONCS_WRITE_ZEROES | +NVME_CTRL_ONCS_RESERVATIONS );/* XXX: don't report vwc if the underlying device is write through */ id->vwc =NVME_CTRL_VWC_PRESENT ;@@ -551,6 +558,15 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req) id->nmic =NVME_NS_NMIC_SHARED ; id->anagrpid =cpu_to_le32 (req->ns->anagrpid); +if (req->ns->pr.enable) + id->rescap =NVME_PR_SUPPORT_WRITE_EXCLUSIVE | +NVME_PR_SUPPORT_EXCLUSIVE_ACCESS | +NVME_PR_SUPPORT_WRITE_EXCLUSIVE_REG_ONLY | +NVME_PR_SUPPORT_EXCLUSIVE_ACCESS_REG_ONLY | +NVME_PR_SUPPORT_WRITE_EXCLUSIVE_ALL_REGS | +NVME_PR_SUPPORT_EXCLUSIVE_ACCESS_ALL_REGS | +NVME_PR_SUPPORT_IEKEY_VER_1_3_DEF ; +memcpy (&id->nguid, &req->ns->nguid,sizeof (id->nguid)); id->lbaf[0 ].ds = req->ns->blksize_shift;@@ -861,6 +877,9 @@ void nvmet_execute_set_features(struct nvmet_req *req)case NVME_FEAT_WRITE_PROTECT : status =nvmet_set_feat_write_protect (req);break ; +case NVME_FEAT_RESV_MASK : + status =nvmet_set_feat_resv_notif_mask (req, cdw11); +break ;default : req->error_loc = offsetof(struct nvme_common_command , cdw10); status =NVME_SC_INVALID_FIELD |NVME_STATUS_DNR ;@@ -959,6 +978,9 @@ void nvmet_execute_get_features(struct nvmet_req *req)case NVME_FEAT_WRITE_PROTECT : status =nvmet_get_feat_write_protect (req);break ; +case NVME_FEAT_RESV_MASK : + status =nvmet_get_feat_resv_notif_mask (req); +break ;default : req->error_loc = offsetof(struct nvme_common_command , cdw10);drivers/nvme/target/configfs.c +27
-0@@ -769,6 +769,32 @@ static ssize_t nvmet_ns_revalidate_size_store(struct config_item *item,CONFIGFS_ATTR_WO (nvmet_ns_, revalidate_size); +static ssize_t nvmet_ns_resv_enable_show (struct config_item *item,char *page) +{ +return sysfs_emit (page,"%d\n" ,to_nvmet_ns (item)->pr.enable); +} + +static ssize_t nvmet_ns_resv_enable_store (struct config_item *item, +const char *page,size_t count) +{ +struct nvmet_ns *ns =to_nvmet_ns (item); +bool val; + +if (kstrtobool (page, &val)) +return -EINVAL ; + +mutex_lock (&ns->subsys->lock); +if (ns->enabled) { +pr_err ("the ns:%d is already enabled.\n" , ns->nsid); +mutex_unlock (&ns->subsys->lock); +return -EINVAL ; + } + ns->pr.enable = val; +mutex_unlock (&ns->subsys->lock); +return count; +} +CONFIGFS_ATTR (nvmet_ns_, resv_enable); +static struct configfs_attribute *nvmet_ns_attrs[] = { &nvmet_ns_attr_device_path, &nvmet_ns_attr_device_nguid,@@ -777,6 +803,7 @@ static struct configfs_attribute *nvmet_ns_attrs[] = { &nvmet_ns_attr_enable, &nvmet_ns_attr_buffered_io, &nvmet_ns_attr_revalidate_size, + &nvmet_ns_attr_resv_enable, #ifdef CONFIG_PCI_P2PDMA &nvmet_ns_attr_p2pmem, #endifdrivers/nvme/target/core.c +52
-6@@ -611,6 +611,12 @@ int nvmet_ns_enable(struct nvmet_ns *ns)if (ret) goto out_restore_subsys_maxnsid; +if (ns->pr.enable) { + ret =nvmet_pr_init_ns (ns); +if (ret) + goto out_remove_from_subsys; + } + subsys->nr_namespaces++;nvmet_ns_changed (subsys, ns->nsid);@@ -620,6 +626,8 @@ int nvmet_ns_enable(struct nvmet_ns *ns)mutex_unlock (&subsys->lock);return ret; +out_remove_from_subsys: +xa_erase (&subsys->namespaces, ns->nsid); out_restore_subsys_maxnsid: subsys->max_nsid =nvmet_max_nsid (subsys);percpu_ref_exit (&ns->ref);@@ -663,6 +671,9 @@ void nvmet_ns_disable(struct nvmet_ns *ns)wait_for_completion (&ns->disable_done);percpu_ref_exit (&ns->ref); +if (ns->pr.enable) +nvmet_pr_exit_ns (ns); +mutex_lock (&subsys->lock); subsys->nr_namespaces--;@@ -766,6 +777,7 @@ static void __nvmet_req_complete(struct nvmet_req *req, u16 status)trace_nvmet_req_complete (req); req->ops->queue_response (req); +nvmet_pr_put_ns_pc_ref (req);if (ns)nvmet_put_namespace (ns); }@@ -929,18 +941,39 @@ static u16 nvmet_parse_io_cmd(struct nvmet_req *req)return ret; } +if (req->ns->pr.enable) { + ret =nvmet_parse_pr_cmd (req); +if (!ret) +return ret; + } +switch (req->ns->csi) {case NVME_CSI_NVM :if (req->ns->file) -return nvmet_file_parse_io_cmd (req); -return nvmet_bdev_parse_io_cmd (req); + ret =nvmet_file_parse_io_cmd (req); +else + ret =nvmet_bdev_parse_io_cmd (req); +break ;case NVME_CSI_ZNS :if (IS_ENABLED (CONFIG_BLK_DEV_ZONED )) -return nvmet_bdev_zns_parse_io_cmd (req); -return NVME_SC_INVALID_IO_CMD_SET ; + ret =nvmet_bdev_zns_parse_io_cmd (req); +else + ret =NVME_SC_INVALID_IO_CMD_SET ; +break ;default : -return NVME_SC_INVALID_IO_CMD_SET ; + ret =NVME_SC_INVALID_IO_CMD_SET ; + } +if (ret) +return ret; + +if (req->ns->pr.enable) { + ret =nvmet_pr_check_cmd_access (req); +if (ret) +return ret; + + ret =nvmet_pr_get_ns_pc_ref (req); } +return ret; } bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq,@@ -964,6 +997,7 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq, req->ns =NULL ; req->error_loc =NVMET_NO_ERROR_LOC ; req->error_slba =0 ; + req->pc_ref =NULL ;/* no support for fused commands yet */ if (unlikely (flags & (NVME_CMD_FUSE_FIRST |NVME_CMD_FUSE_SECOND ))) {@@ -1015,6 +1049,7 @@ EXPORT_SYMBOL_GPL(nvmet_req_init);void nvmet_req_uninit (struct nvmet_req *req) {percpu_ref_put (&req->sq->ref); +nvmet_pr_put_ns_pc_ref (req);if (req->ns)nvmet_put_namespace (req->ns); }@@ -1383,7 +1418,8 @@ static void nvmet_fatal_error_handler(struct work_struct *work) }u16 nvmet_alloc_ctrl (const char *subsysnqn,const char *hostnqn, -struct nvmet_req *req,u32 kato,struct nvmet_ctrl **ctrlp) +struct nvmet_req *req,u32 kato,struct nvmet_ctrl **ctrlp, +uuid_t *hostid) {struct nvmet_subsys *subsys;struct nvmet_ctrl *ctrl;@@ -1462,6 +1498,8 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn, } ctrl->cntlid = ret; +uuid_copy (&ctrl->hostid, hostid); +/* * Discovery controllers may use some arbitrary high value * in order to cleanup stale discovery sessions @@ -1478,6 +1516,9 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,nvmet_start_keep_alive_timer (ctrl);mutex_lock (&subsys->lock); + ret =nvmet_ctrl_init_pr (ctrl); +if (ret) + goto init_pr_fail;list_add_tail (&ctrl->subsys_entry, &subsys->ctrls);nvmet_setup_p2p_ns_map (ctrl, req);nvmet_debugfs_ctrl_setup (ctrl);@@ -1486,6 +1527,10 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn, *ctrlp = ctrl;return 0 ; +init_pr_fail: +mutex_unlock (&subsys->lock); +nvmet_stop_keep_alive_timer (ctrl); +ida_free (&cntlid_ida, ctrl->cntlid); out_free_sqs:kfree (ctrl->sqs); out_free_changed_ns_list:@@ -1504,6 +1549,7 @@ static void nvmet_ctrl_free(struct kref *ref)struct nvmet_subsys *subsys = ctrl->subsys;mutex_lock (&subsys->lock); +nvmet_ctrl_destroy_pr (ctrl);nvmet_release_p2p_ns_map (ctrl);list_del (&ctrl->subsys_entry);mutex_unlock (&subsys->lock);drivers/nvme/target/fabrics-cmd.c +1
-3@@ -245,12 +245,10 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req) d->subsysnqn[NVMF_NQN_FIELD_LEN -1 ] ='\0' ; d->hostnqn[NVMF_NQN_FIELD_LEN -1 ] ='\0' ; status =nvmet_alloc_ctrl (d->subsysnqn, d->hostnqn, req, -le32_to_cpu (c->kato), &ctrl); +le32_to_cpu (c->kato), &ctrl, &d->hostid);if (status) goto out; -uuid_copy (&ctrl->hostid, &d->hostid); - dhchap_status =nvmet_setup_auth (ctrl);if (dhchap_status) { pr_err("Failed to setup authentication, dhchap status %u\n",drivers/nvme/target/nvmet.h +57
-0@@ -20,6 +20,7 @@#include <linux/blkdev.h> #include <linux/radix-tree.h> #include <linux/t10-pi.h> +#include <linux/kfifo.h> #define NVMET_DEFAULT_VS NVME_VS(1, 3, 0)@@ -30,6 +31,7 @@#define NVMET_MN_MAX_SIZE 40#define NVMET_SN_MAX_SIZE 20#define NVMET_FR_MAX_SIZE 8 +#define NVMET_PR_LOG_QUEUE_SIZE 64/* * Supported optional AENs: @@ -56,6 +58,38 @@#define IPO_IATTR_CONNECT_SQE (x) \ (cpu_to_le32(offsetof(struct nvmf_connect_command, x))) +struct nvmet_pr_registrant { +u64 rkey; +uuid_t hostid; +enum nvme_pr_type rtype; +struct list_head entry; +struct rcu_head rcu; +}; + +struct nvmet_pr { +bool enable; +unsigned long notify_mask; +atomic_t generation; +struct nvmet_pr_registrant __rcu *holder; +/* +* During the execution of the reservation command, mutual +* exclusion is required throughout the process. However, +* while waiting asynchronously for the 'per controller +* percpu_ref' to complete before the 'preempt and abort' +* command finishes, a semaphore is needed to ensure mutual +* exclusion instead of a mutex. +*/ +struct semaphore pr_sem; +struct list_head registrant_list; +}; + +struct nvmet_pr_per_ctrl_ref { +struct percpu_ref ref; +struct completion free_done; +struct completion confirm_done; +uuid_t hostid; +}; + +static void nvmet_pr_set_ctrl_to_abort (struct nvmet_req *req,uuid_t *hostid) +{ +struct nvmet_pr_per_ctrl_ref *pc_ref; +struct nvmet_ns *ns = req->ns; +unsigned long idx; + +xa_for_each (&ns->pr_per_ctrl_refs, idx, pc_ref) { +if (uuid_equal (&pc_ref->hostid, hostid)) { +percpu_ref_kill_and_confirm (&pc_ref->ref, + nvmet_pr_confirm_ns_pc_ref); +wait_for_completion (&pc_ref->confirm_done); + } + } +} + +static void nvmet_pr_do_abort (struct work_struct *w) +{ + struct nvmet_req *req = container_of(w, struct nvmet_req, r.abort_work); +struct nvmet_pr_per_ctrl_ref *pc_ref; +struct nvmet_ns *ns = req->ns; +unsigned long idx; + +/*
drivers/nvme/target/nvmet.h
Quoted 10 lines
drivers/nvme/target/nvmet.h +10
-0+* The target does not support abort, just wait per-controller ref to 0. +*/ +xa_for_each (&ns->pr_per_ctrl_refs, idx, pc_ref) { +if (percpu_ref_is_dying (&pc_ref->ref)) { +wait_for_completion (&pc_ref->free_done); +reinit_completion (&pc_ref->confirm_done); +reinit_completion (&pc_ref->free_done); +percpu_ref_resurrect (&pc_ref->ref); + } + }
If you want just to protect this particular loop against of a parallel execution, why simply not to protect it by its own mutex?
Quoted 30 lines
drivers/nvme/target/nvmet.h +29
-0+up (&ns->pr.pr_sem); +nvmet_req_complete (req,NVME_SC_SUCCESS ); +} + +static void nvmet_execute_pr_acquire (struct nvmet_req *req) +{ +u32 cdw10 =le32_to_cpu (req->cmd->common.cdw10); +bool ignore_key =nvmet_pr_parse_ignore_key (cdw10); +/* Reservation type, bit 15:08 */ +u8 rtype = (u8)((cdw10 >>8 ) &0xff ); +/* Reservation acquire action, bit 02:00 */ +u8 acquire_act = cdw10 &0x07 ; +struct nvmet_ctrl *ctrl = req->sq->ctrl; +struct nvmet_pr_acquire_data *d =NULL ; +struct nvmet_pr *pr = &req->ns->pr; +struct nvmet_pr_registrant *reg; +u16 status =NVME_SC_SUCCESS ; + +if (ignore_key || + rtype <NVME_PR_WRITE_EXCLUSIVE || + rtype >NVME_PR_EXCLUSIVE_ACCESS_ALL_REGS ) { + status =NVME_SC_INVALID_FIELD |NVME_STATUS_DNR ; + goto out; + } + + d =kmalloc (sizeof (*d),GFP_KERNEL ); +if (!d) { + status =NVME_SC_INTERNAL ; + goto out;
drivers/nvme/target/nvmet.h
Quoted 10 lines
drivers/nvme/target/nvmet.h +10
-0+ } + + status =nvmet_copy_from_sgl (req,0 , d,sizeof (*d)); +if (status) + goto free_data; + + status =NVME_SC_RESERVATION_CONFLICT |NVME_STATUS_DNR ; +down (&pr->pr_sem); +list_for_each_entry_rcu (reg, &pr->registrant_list, entry, +lockdep_is_held (&pr->pr_lock)) {
lockdep_is_held does not work with semaphores. Using a semaphore drops your lockdep effort.
Quoted 191 lines
drivers/nvme/target/nvmet.h +190
-1+if (uuid_equal (®->hostid, &ctrl->hostid) && + reg->rkey ==le64_to_cpu (d->crkey)) { + status =__nvmet_execute_pr_acquire (req, reg, + acquire_act, rtype, d); +break ; + } + } + +if (!status && acquire_act ==NVME_PR_ACQUIRE_ACT_PREEMPT_AND_ABORT ) { +kfree (d); +INIT_WORK (&req->r.abort_work, nvmet_pr_do_abort); +queue_work (nvmet_wq, &req->r.abort_work); +return ; + } + +up (&pr->pr_sem); + +free_data: +kfree (d); +out: +nvmet_req_complete (req, status); +} + +u16 nvmet_pr_get_ns_pc_ref (struct nvmet_req *req) +{ +struct nvmet_pr_per_ctrl_ref *pc_ref; + + pc_ref =xa_load (&req->ns->pr_per_ctrl_refs, + req->sq->ctrl->cntlid); +if (unlikely (!percpu_ref_tryget_live (&pc_ref->ref))) +return NVME_SC_INTERNAL ; + req->pc_ref = pc_ref; +return NVME_SC_SUCCESS ; +} + +static void nvmet_pr_ctrl_ns_all_cmds_done (struct percpu_ref *ref) +{ +struct nvmet_pr_per_ctrl_ref *pc_ref = + container_of(ref, struct nvmet_pr_per_ctrl_ref, ref); + +complete (&pc_ref->free_done); +} + +static int nvmet_pr_alloc_and_insert_pc_ref (struct nvmet_ns *ns, +unsigned long idx, +uuid_t *hostid) +{ +struct nvmet_pr_per_ctrl_ref *pc_ref; +int ret; + + pc_ref =kmalloc (sizeof (*pc_ref),GFP_ATOMIC ); +if (!pc_ref) +return -ENOMEM ; + + ret =percpu_ref_init (&pc_ref->ref, nvmet_pr_ctrl_ns_all_cmds_done, +PERCPU_REF_ALLOW_REINIT ,GFP_KERNEL ); +if (ret) + goto free; + +init_completion (&pc_ref->free_done); +init_completion (&pc_ref->confirm_done); +uuid_copy (&pc_ref->hostid, hostid); + + ret =xa_insert (&ns->pr_per_ctrl_refs, idx, pc_ref,GFP_KERNEL ); +if (ret) + goto exit; +return ret; +exit: +percpu_ref_exit (&pc_ref->ref); +free: +kfree (pc_ref); +return ret; +} + +int nvmet_ctrl_init_pr (struct nvmet_ctrl *ctrl) +{ +struct nvmet_subsys *subsys = ctrl->subsys; +struct nvmet_pr_per_ctrl_ref *pc_ref; +struct nvmet_ns *ns =NULL ; +unsigned long idx; +int ret; + + ctrl->pr_log_mgr.counter =0 ; + ctrl->pr_log_mgr.lost_count =0 ; +mutex_init (&ctrl->pr_log_mgr.lock); +INIT_KFIFO (ctrl->pr_log_mgr.log_queue); + +/* +* Here we are under subsys lock, if an ns not in subsys->namespaces, +* we can make sure that ns is not enabled, and not call +* nvmet_pr_init_ns(), see more details in nvmet_ns_enable(). +* So just check ns->pr.enable. +*/ +xa_for_each (&subsys->namespaces, idx, ns) { +if (ns->pr.enable) { + ret =nvmet_pr_alloc_and_insert_pc_ref (ns, ctrl->cntlid, + &ctrl->hostid); +if (ret) + goto free_per_ctrl_refs; + } + } +return 0 ; + +free_per_ctrl_refs: +xa_for_each (&subsys->namespaces, idx, ns) { +if (ns->pr.enable) { + pc_ref =xa_erase (&ns->pr_per_ctrl_refs, ctrl->cntlid); +if (pc_ref) +percpu_ref_exit (&pc_ref->ref); +kfree (pc_ref); + } + } +return ret; +} + +void nvmet_ctrl_destroy_pr (struct nvmet_ctrl *ctrl) +{ +struct nvmet_pr_per_ctrl_ref *pc_ref; +struct nvmet_ns *ns; +unsigned long idx; + +kfifo_free (&ctrl->pr_log_mgr.log_queue); +mutex_destroy (&ctrl->pr_log_mgr.lock); + +xa_for_each (&ctrl->subsys->namespaces, idx, ns) { +if (ns->pr.enable) { + pc_ref =xa_erase (&ns->pr_per_ctrl_refs, ctrl->cntlid); +if (pc_ref) +percpu_ref_exit (&pc_ref->ref); +kfree (pc_ref); + } + } +} + +int nvmet_pr_init_ns (struct nvmet_ns *ns) +{ +struct nvmet_subsys *subsys = ns->subsys; +struct nvmet_pr_per_ctrl_ref *pc_ref; +struct nvmet_ctrl *ctrl =NULL ; +unsigned long idx; +int ret; + + ns->pr.holder =NULL ; +atomic_set (&ns->pr.generation,0 ); +sema_init (&ns->pr.pr_sem,1 ); +INIT_LIST_HEAD (&ns->pr.registrant_list); + ns->pr.notify_mask =0 ; + +xa_init (&ns->pr_per_ctrl_refs); + +list_for_each_entry (ctrl, &subsys->ctrls, subsys_entry) { + ret =nvmet_pr_alloc_and_insert_pc_ref (ns, ctrl->cntlid, + &ctrl->hostid); +if (ret) + goto free_per_ctrl_refs; + } +return 0 ; + +free_per_ctrl_refs: +xa_for_each (&ns->pr_per_ctrl_refs, idx, pc_ref) { +xa_erase (&ns->pr_per_ctrl_refs, idx); +percpu_ref_exit (&pc_ref->ref); +kfree (pc_ref); + } +return ret; +} + +void nvmet_pr_exit_ns (struct nvmet_ns *ns) +{ +struct nvmet_pr_registrant *reg, *tmp; +struct nvmet_pr_per_ctrl_ref *pc_ref; +struct nvmet_pr *pr = &ns->pr; +unsigned long idx; + +list_for_each_entry_safe (reg, tmp, &pr->registrant_list, entry) { +list_del (®->entry); +kfree (reg); + } + +xa_for_each (&ns->pr_per_ctrl_refs, idx, pc_ref) { +/* +* No command on ns here, we can safely free pc_ref. +*/ + pc_ref =xa_erase (&ns->pr_per_ctrl_refs, idx); +percpu_ref_exit (&pc_ref->ref); +kfree (pc_ref); + } + +xa_destroy (&ns->pr_per_ctrl_refs); +} --
Quoted 1 line
2.43.0
BR,
Dmitry
Re: [PATCH v18 2/2] nvmet: support reservation feature
Quoted 427 lines · Dmitry Bogdanov
Quoted 426 lines · Guixin Liu
This patch implements the reservation feature, including:
1. reservationregister(register, unregister and replace).
2. reservationacquire(acquire, preempt, preempt and abort).
3. reservation release(release and clear).
4. reservation report.
5. set feature and get feature of reservation notify mask.
6. get log page of reservation event.Not supported:
1. persistent reservation through power loss.Test cases:
Use nvme-cli and fio to test all implemented sub features:
1. use nvme resv-register to register host a registrant or unregister or replace a new key.
2. use nvme resv-acquire to set host to the holder, and use fio to send read and write io in all reservation type. And also test preempt and "preempt and abort".
3. use nvme resv-report to show all registrants and reservation status.
4. use nvme resv-release to release all registrants.
5. use nvme get-log to get events generated by the preceding operations.In addition, make reservation configurable, one can set ns to support reservation before enable ns. The default of
resv_enableis false.Signed-off-by Guixin Liu <[email protected]>Reviewed-by Dmitry Bogdanov <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Tested-by Chaitanya Kulkarni <[email protected]>Reviewed-by Chaitanya Kulkarni <[email protected]>--- drivers/nvme/target/Makefile | 2 +- drivers/nvme/target/admin-cmd.c | 24 +- drivers/nvme/target/configfs.c | 27 + drivers/nvme/target/core.c | 58 +- drivers/nvme/target/fabrics-cmd.c | 4 +- drivers/nvme/target/nvmet.h | 66 +- drivers/nvme/target/pr.c | 1163 +++++++++++++++++++++++++++++ 7 files changed, 1332 insertions(+), 12 deletions(-)create mode 100644
drivers/nvme/target/pr.cdrivers/nvme/target/Makefile +1
-1@@ -10,7 +10,7 @@ obj-$(CONFIG_NVME_TARGET_FCLOOP) += nvme-fcloop.o obj-$(CONFIG_NVME_TARGET_TCP) += nvmet-tcp.o nvmet-y += core.o configfs.o admin-cmd.o fabrics-cmd.o \ - discovery.o io-cmd-file.o io-cmd-bdev.o + discovery.o io-cmd-file.o io-cmd-bdev.o pr.o nvmet-$(CONFIG_NVME_TARGET_DEBUGFS) += debugfs.o nvmet-$(CONFIG_NVME_TARGET_PASSTHRU) += passthru.o nvmet-$(CONFIG_BLK_DEV_ZONED) += zns.odrivers/nvme/target/admin-cmd.c +23
-1@@ -176,6 +176,10 @@ static void nvmet_get_cmd_effects_nvm(struct nvme_effects_log *log) log->iocs[nvme_cmd_read] = log->iocs[nvme_cmd_flush] = log->iocs[nvme_cmd_dsm] = + log->iocs[nvme_cmd_resv_acquire] = + log->iocs[nvme_cmd_resv_register] = + log->iocs[nvme_cmd_resv_release] = + log->iocs[nvme_cmd_resv_report] =cpu_to_le32 (NVME_CMD_EFFECTS_CSUPP ); log->iocs[nvme_cmd_write] = log->iocs[nvme_cmd_write_zeroes] =@@ -340,6 +344,8 @@ static void nvmet_execute_get_log_page(struct nvmet_req *req)return nvmet_execute_get_log_cmd_effects_ns (req);case NVME_LOG_ANA :return nvmet_execute_get_log_page_ana (req); +case NVME_LOG_RESERVATION : +return nvmet_execute_get_log_page_resv (req); }pr_debug ("unhandled lid %d on qid %d\n" , req->cmd->get_log_page.lid, req->sq->qid);@@ -433,7 +439,8 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) id->nn =cpu_to_le32 (NVMET_MAX_NAMESPACES ); id->mnan =cpu_to_le32 (NVMET_MAX_NAMESPACES ); id->oncs =cpu_to_le16 (NVME_CTRL_ONCS_DSM | -NVME_CTRL_ONCS_WRITE_ZEROES ); +NVME_CTRL_ONCS_WRITE_ZEROES | +NVME_CTRL_ONCS_RESERVATIONS );/* XXX: don't report vwc if the underlying device is write through */ id->vwc =NVME_CTRL_VWC_PRESENT ;@@ -551,6 +558,15 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req) id->nmic =NVME_NS_NMIC_SHARED ; id->anagrpid =cpu_to_le32 (req->ns->anagrpid); +if (req->ns->pr.enable) + id->rescap =NVME_PR_SUPPORT_WRITE_EXCLUSIVE | +NVME_PR_SUPPORT_EXCLUSIVE_ACCESS | +NVME_PR_SUPPORT_WRITE_EXCLUSIVE_REG_ONLY | +NVME_PR_SUPPORT_EXCLUSIVE_ACCESS_REG_ONLY | +NVME_PR_SUPPORT_WRITE_EXCLUSIVE_ALL_REGS | +NVME_PR_SUPPORT_EXCLUSIVE_ACCESS_ALL_REGS | +NVME_PR_SUPPORT_IEKEY_VER_1_3_DEF ; +memcpy (&id->nguid, &req->ns->nguid,sizeof (id->nguid)); id->lbaf[0 ].ds = req->ns->blksize_shift;@@ -861,6 +877,9 @@ void nvmet_execute_set_features(struct nvmet_req *req)case NVME_FEAT_WRITE_PROTECT : status =nvmet_set_feat_write_protect (req);break ; +case NVME_FEAT_RESV_MASK : + status =nvmet_set_feat_resv_notif_mask (req, cdw11); +break ;default : req->error_loc = offsetof(struct nvme_common_command , cdw10); status =NVME_SC_INVALID_FIELD |NVME_STATUS_DNR ;@@ -959,6 +978,9 @@ void nvmet_execute_get_features(struct nvmet_req *req)case NVME_FEAT_WRITE_PROTECT : status =nvmet_get_feat_write_protect (req);break ; +case NVME_FEAT_RESV_MASK : + status =nvmet_get_feat_resv_notif_mask (req); +break ;default : req->error_loc = offsetof(struct nvme_common_command , cdw10);drivers/nvme/target/configfs.c +27
-0@@ -769,6 +769,32 @@ static ssize_t nvmet_ns_revalidate_size_store(struct config_item *item,CONFIGFS_ATTR_WO (nvmet_ns_, revalidate_size); +static ssize_t nvmet_ns_resv_enable_show (struct config_item *item,char *page) +{ +return sysfs_emit (page,"%d\n" ,to_nvmet_ns (item)->pr.enable); +} + +static ssize_t nvmet_ns_resv_enable_store (struct config_item *item, +const char *page,size_t count) +{ +struct nvmet_ns *ns =to_nvmet_ns (item); +bool val; + +if (kstrtobool (page, &val)) +return -EINVAL ; + +mutex_lock (&ns->subsys->lock); +if (ns->enabled) { +pr_err ("the ns:%d is already enabled.\n" , ns->nsid); +mutex_unlock (&ns->subsys->lock); +return -EINVAL ; + } + ns->pr.enable = val; +mutex_unlock (&ns->subsys->lock); +return count; +} +CONFIGFS_ATTR (nvmet_ns_, resv_enable); +static struct configfs_attribute *nvmet_ns_attrs[] = { &nvmet_ns_attr_device_path, &nvmet_ns_attr_device_nguid,@@ -777,6 +803,7 @@ static struct configfs_attribute *nvmet_ns_attrs[] = { &nvmet_ns_attr_enable, &nvmet_ns_attr_buffered_io, &nvmet_ns_attr_revalidate_size, + &nvmet_ns_attr_resv_enable, #ifdef CONFIG_PCI_P2PDMA &nvmet_ns_attr_p2pmem, #endifdrivers/nvme/target/core.c +52
-6@@ -611,6 +611,12 @@ int nvmet_ns_enable(struct nvmet_ns *ns)if (ret) goto out_restore_subsys_maxnsid; +if (ns->pr.enable) { + ret =nvmet_pr_init_ns (ns); +if (ret) + goto out_remove_from_subsys; + } + subsys->nr_namespaces++;nvmet_ns_changed (subsys, ns->nsid);@@ -620,6 +626,8 @@ int nvmet_ns_enable(struct nvmet_ns *ns)mutex_unlock (&subsys->lock);return ret; +out_remove_from_subsys: +xa_erase (&subsys->namespaces, ns->nsid); out_restore_subsys_maxnsid: subsys->max_nsid =nvmet_max_nsid (subsys);percpu_ref_exit (&ns->ref);@@ -663,6 +671,9 @@ void nvmet_ns_disable(struct nvmet_ns *ns)wait_for_completion (&ns->disable_done);percpu_ref_exit (&ns->ref); +if (ns->pr.enable) +nvmet_pr_exit_ns (ns); +mutex_lock (&subsys->lock); subsys->nr_namespaces--;@@ -766,6 +777,7 @@ static void __nvmet_req_complete(struct nvmet_req *req, u16 status)trace_nvmet_req_complete (req); req->ops->queue_response (req); +nvmet_pr_put_ns_pc_ref (req);if (ns)nvmet_put_namespace (ns); }@@ -929,18 +941,39 @@ static u16 nvmet_parse_io_cmd(struct nvmet_req *req)return ret; } +if (req->ns->pr.enable) { + ret =nvmet_parse_pr_cmd (req); +if (!ret) +return ret; + } +switch (req->ns->csi) {case NVME_CSI_NVM :if (req->ns->file) -return nvmet_file_parse_io_cmd (req); -return nvmet_bdev_parse_io_cmd (req); + ret =nvmet_file_parse_io_cmd (req); +else + ret =nvmet_bdev_parse_io_cmd (req); +break ;case NVME_CSI_ZNS :if (IS_ENABLED (CONFIG_BLK_DEV_ZONED )) -return nvmet_bdev_zns_parse_io_cmd (req); -return NVME_SC_INVALID_IO_CMD_SET ; + ret =nvmet_bdev_zns_parse_io_cmd (req); +else + ret =NVME_SC_INVALID_IO_CMD_SET ; +break ;default : -return NVME_SC_INVALID_IO_CMD_SET ; + ret =NVME_SC_INVALID_IO_CMD_SET ; + } +if (ret) +return ret; + +if (req->ns->pr.enable) { + ret =nvmet_pr_check_cmd_access (req); +if (ret) +return ret; + + ret =nvmet_pr_get_ns_pc_ref (req); } +return ret; } bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq,@@ -964,6 +997,7 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq, req->ns =NULL ; req->error_loc =NVMET_NO_ERROR_LOC ; req->error_slba =0 ; + req->pc_ref =NULL ;/* no support for fused commands yet */ if (unlikely (flags & (NVME_CMD_FUSE_FIRST |NVME_CMD_FUSE_SECOND ))) {@@ -1015,6 +1049,7 @@ EXPORT_SYMBOL_GPL(nvmet_req_init);void nvmet_req_uninit (struct nvmet_req *req) {percpu_ref_put (&req->sq->ref); +nvmet_pr_put_ns_pc_ref (req);if (req->ns)nvmet_put_namespace (req->ns); }@@ -1383,7 +1418,8 @@ static void nvmet_fatal_error_handler(struct work_struct *work) }u16 nvmet_alloc_ctrl (const char *subsysnqn,const char *hostnqn, -struct nvmet_req *req,u32 kato,struct nvmet_ctrl **ctrlp) +struct nvmet_req *req,u32 kato,struct nvmet_ctrl **ctrlp, +uuid_t *hostid) {struct nvmet_subsys *subsys;struct nvmet_ctrl *ctrl;@@ -1462,6 +1498,8 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn, } ctrl->cntlid = ret; +uuid_copy (&ctrl->hostid, hostid); +/* * Discovery controllers may use some arbitrary high value * in order to cleanup stale discovery sessions @@ -1478,6 +1516,9 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,nvmet_start_keep_alive_timer (ctrl);mutex_lock (&subsys->lock); + ret =nvmet_ctrl_init_pr (ctrl); +if (ret) + goto init_pr_fail;list_add_tail (&ctrl->subsys_entry, &subsys->ctrls);nvmet_setup_p2p_ns_map (ctrl, req);nvmet_debugfs_ctrl_setup (ctrl);@@ -1486,6 +1527,10 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn, *ctrlp = ctrl;return 0 ; +init_pr_fail: +mutex_unlock (&subsys->lock); +nvmet_stop_keep_alive_timer (ctrl); +ida_free (&cntlid_ida, ctrl->cntlid); out_free_sqs:kfree (ctrl->sqs); out_free_changed_ns_list:@@ -1504,6 +1549,7 @@ static void nvmet_ctrl_free(struct kref *ref)struct nvmet_subsys *subsys = ctrl->subsys;mutex_lock (&subsys->lock); +nvmet_ctrl_destroy_pr (ctrl);nvmet_release_p2p_ns_map (ctrl);list_del (&ctrl->subsys_entry);mutex_unlock (&subsys->lock);drivers/nvme/target/fabrics-cmd.c +1
-3@@ -245,12 +245,10 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req) d->subsysnqn[NVMF_NQN_FIELD_LEN -1 ] ='\0' ; d->hostnqn[NVMF_NQN_FIELD_LEN -1 ] ='\0' ; status =nvmet_alloc_ctrl (d->subsysnqn, d->hostnqn, req, -le32_to_cpu (c->kato), &ctrl); +le32_to_cpu (c->kato), &ctrl, &d->hostid);if (status) goto out; -uuid_copy (&ctrl->hostid, &d->hostid); - dhchap_status =nvmet_setup_auth (ctrl);if (dhchap_status) { pr_err("Failed to setup authentication, dhchap status %u\n",drivers/nvme/target/nvmet.h +61
-0@@ -20,6 +20,7 @@#include <linux/blkdev.h> #include <linux/radix-tree.h> #include <linux/t10-pi.h> +#include <linux/kfifo.h> #define NVMET_DEFAULT_VS NVME_VS(1, 3, 0)@@ -30,6 +31,7 @@#define NVMET_MN_MAX_SIZE 40#define NVMET_SN_MAX_SIZE 20#define NVMET_FR_MAX_SIZE 8 +#define NVMET_PR_LOG_QUEUE_SIZE 64/* * Supported optional AENs: @@ -56,6 +58,38 @@#define IPO_IATTR_CONNECT_SQE (x) \ (cpu_to_le32(offsetof(struct nvmf_connect_command, x))) +struct nvmet_pr_registrant { +u64 rkey; +uuid_t hostid; +enum nvme_pr_type rtype; +struct list_head entry; +struct rcu_head rcu; +}; + +struct nvmet_pr { +bool enable; +unsigned long notify_mask; +atomic_t generation; +struct nvmet_pr_registrant __rcu *holder; +/* +* During the execution of the reservation command, mutual +* exclusion is required throughout the process. However, +* while waiting asynchronously for the 'per controller +* percpu_ref' to complete before the 'preempt and abort' +* command finishes, a semaphore is needed to ensure mutual +* exclusion instead of a mutex. +*/ +struct semaphore pr_sem; +struct list_head registrant_list; +}; + +struct nvmet_pr_per_ctrl_ref { +struct percpu_ref ref; +struct completion free_done; +struct completion confirm_done; +uuid_t hostid; +}; + +static void nvmet_pr_set_ctrl_to_abort (struct nvmet_req *req,uuid_t *hostid) +{ +struct nvmet_pr_per_ctrl_ref *pc_ref; +struct nvmet_ns *ns = req->ns; +unsigned long idx; + +xa_for_each (&ns->pr_per_ctrl_refs, idx, pc_ref) { +if (uuid_equal (&pc_ref->hostid, hostid)) { +percpu_ref_kill_and_confirm (&pc_ref->ref, + nvmet_pr_confirm_ns_pc_ref); +wait_for_completion (&pc_ref->confirm_done); + } + } +} + +static void nvmet_pr_do_abort (struct work_struct *w) +{ + struct nvmet_req *req = container_of(w, struct nvmet_req, r.abort_work); +struct nvmet_pr_per_ctrl_ref *pc_ref; +struct nvmet_ns *ns = req->ns; +unsigned long idx; + +/* +* The target does not support abort, just wait per-controller ref to 0. +*/ +xa_for_each (&ns->pr_per_ctrl_refs, idx, pc_ref) { +if (percpu_ref_is_dying (&pc_ref->ref)) {
Quoted 8 lines
drivers/nvme/target/nvmet.h
Quoted 6 lines
drivers/nvme/target/nvmet.h +6
-0+wait_for_completion (&pc_ref->free_done); +reinit_completion (&pc_ref->confirm_done); +reinit_completion (&pc_ref->free_done); +percpu_ref_resurrect (&pc_ref->ref); + } + }If you want just to protect this particular loop against of a parallel execution, why simply not to protect it by its own mutex?
When a work is added to the work_queue, other reservation commands may be
executed before this work is actually executed, potentially affecting the
results of the commands. Therefore, I need to ensure that only one
reservation command is being executed at any time to prevent any
unforeseen behavior.
Quoted 33 lines
Quoted 33 lines
drivers/nvme/target/nvmet.h +33
-0+up (&ns->pr.pr_sem); +nvmet_req_complete (req,NVME_SC_SUCCESS ); +} + +static void nvmet_execute_pr_acquire (struct nvmet_req *req) +{ +u32 cdw10 =le32_to_cpu (req->cmd->common.cdw10); +bool ignore_key =nvmet_pr_parse_ignore_key (cdw10); +/* Reservation type, bit 15:08 */ +u8 rtype = (u8)((cdw10 >>8 ) &0xff ); +/* Reservation acquire action, bit 02:00 */ +u8 acquire_act = cdw10 &0x07 ; +struct nvmet_ctrl *ctrl = req->sq->ctrl; +struct nvmet_pr_acquire_data *d =NULL ; +struct nvmet_pr *pr = &req->ns->pr; +struct nvmet_pr_registrant *reg; +u16 status =NVME_SC_SUCCESS ; + +if (ignore_key || + rtype <NVME_PR_WRITE_EXCLUSIVE || + rtype >NVME_PR_EXCLUSIVE_ACCESS_ALL_REGS ) { + status =NVME_SC_INVALID_FIELD |NVME_STATUS_DNR ; + goto out; + } + + d =kmalloc (sizeof (*d),GFP_KERNEL ); +if (!d) { + status =NVME_SC_INTERNAL ; + goto out; + } + + status =nvmet_copy_from_sgl (req,0 , d,sizeof (*d)); +if (status)
Quoted 8 lines
drivers/nvme/target/nvmet.h
Quoted 6 lines
drivers/nvme/target/nvmet.h +6
-0+ goto free_data; + + status =NVME_SC_RESERVATION_CONFLICT |NVME_STATUS_DNR ; +down (&pr->pr_sem); +list_for_each_entry_rcu (reg, &pr->registrant_list, entry, +lockdep_is_held (&pr->pr_lock)) {
lockdep_is_helddoes not work with semaphores. Using a semaphore drops your lockdep effort.
Sorry, I miss this, will be changed in v19, thanks.
Best Regards,
Guixin Liu
Quoted 194 lines
Quoted 191 lines
drivers/nvme/target/nvmet.h +190
-1+if (uuid_equal (®->hostid, &ctrl->hostid) && + reg->rkey ==le64_to_cpu (d->crkey)) { + status =__nvmet_execute_pr_acquire (req, reg, + acquire_act, rtype, d); +break ; + } + } + +if (!status && acquire_act ==NVME_PR_ACQUIRE_ACT_PREEMPT_AND_ABORT ) { +kfree (d); +INIT_WORK (&req->r.abort_work, nvmet_pr_do_abort); +queue_work (nvmet_wq, &req->r.abort_work); +return ; + } + +up (&pr->pr_sem); + +free_data: +kfree (d); +out: +nvmet_req_complete (req, status); +} + +u16 nvmet_pr_get_ns_pc_ref (struct nvmet_req *req) +{ +struct nvmet_pr_per_ctrl_ref *pc_ref; + + pc_ref =xa_load (&req->ns->pr_per_ctrl_refs, + req->sq->ctrl->cntlid); +if (unlikely (!percpu_ref_tryget_live (&pc_ref->ref))) +return NVME_SC_INTERNAL ; + req->pc_ref = pc_ref; +return NVME_SC_SUCCESS ; +} + +static void nvmet_pr_ctrl_ns_all_cmds_done (struct percpu_ref *ref) +{ +struct nvmet_pr_per_ctrl_ref *pc_ref = + container_of(ref, struct nvmet_pr_per_ctrl_ref, ref); + +complete (&pc_ref->free_done); +} + +static int nvmet_pr_alloc_and_insert_pc_ref (struct nvmet_ns *ns, +unsigned long idx, +uuid_t *hostid) +{ +struct nvmet_pr_per_ctrl_ref *pc_ref; +int ret; + + pc_ref =kmalloc (sizeof (*pc_ref),GFP_ATOMIC ); +if (!pc_ref) +return -ENOMEM ; + + ret =percpu_ref_init (&pc_ref->ref, nvmet_pr_ctrl_ns_all_cmds_done, +PERCPU_REF_ALLOW_REINIT ,GFP_KERNEL ); +if (ret) + goto free; + +init_completion (&pc_ref->free_done); +init_completion (&pc_ref->confirm_done); +uuid_copy (&pc_ref->hostid, hostid); + + ret =xa_insert (&ns->pr_per_ctrl_refs, idx, pc_ref,GFP_KERNEL ); +if (ret) + goto exit; +return ret; +exit: +percpu_ref_exit (&pc_ref->ref); +free: +kfree (pc_ref); +return ret; +} + +int nvmet_ctrl_init_pr (struct nvmet_ctrl *ctrl) +{ +struct nvmet_subsys *subsys = ctrl->subsys; +struct nvmet_pr_per_ctrl_ref *pc_ref; +struct nvmet_ns *ns =NULL ; +unsigned long idx; +int ret; + + ctrl->pr_log_mgr.counter =0 ; + ctrl->pr_log_mgr.lost_count =0 ; +mutex_init (&ctrl->pr_log_mgr.lock); +INIT_KFIFO (ctrl->pr_log_mgr.log_queue); + +/* +* Here we are under subsys lock, if an ns not in subsys->namespaces, +* we can make sure that ns is not enabled, and not call +* nvmet_pr_init_ns(), see more details in nvmet_ns_enable(). +* So just check ns->pr.enable. +*/ +xa_for_each (&subsys->namespaces, idx, ns) { +if (ns->pr.enable) { + ret =nvmet_pr_alloc_and_insert_pc_ref (ns, ctrl->cntlid, + &ctrl->hostid); +if (ret) + goto free_per_ctrl_refs; + } + } +return 0 ; + +free_per_ctrl_refs: +xa_for_each (&subsys->namespaces, idx, ns) { +if (ns->pr.enable) { + pc_ref =xa_erase (&ns->pr_per_ctrl_refs, ctrl->cntlid); +if (pc_ref) +percpu_ref_exit (&pc_ref->ref); +kfree (pc_ref); + } + } +return ret; +} + +void nvmet_ctrl_destroy_pr (struct nvmet_ctrl *ctrl) +{ +struct nvmet_pr_per_ctrl_ref *pc_ref; +struct nvmet_ns *ns; +unsigned long idx; + +kfifo_free (&ctrl->pr_log_mgr.log_queue); +mutex_destroy (&ctrl->pr_log_mgr.lock); + +xa_for_each (&ctrl->subsys->namespaces, idx, ns) { +if (ns->pr.enable) { + pc_ref =xa_erase (&ns->pr_per_ctrl_refs, ctrl->cntlid); +if (pc_ref) +percpu_ref_exit (&pc_ref->ref); +kfree (pc_ref); + } + } +} + +int nvmet_pr_init_ns (struct nvmet_ns *ns) +{ +struct nvmet_subsys *subsys = ns->subsys; +struct nvmet_pr_per_ctrl_ref *pc_ref; +struct nvmet_ctrl *ctrl =NULL ; +unsigned long idx; +int ret; + + ns->pr.holder =NULL ; +atomic_set (&ns->pr.generation,0 ); +sema_init (&ns->pr.pr_sem,1 ); +INIT_LIST_HEAD (&ns->pr.registrant_list); + ns->pr.notify_mask =0 ; + +xa_init (&ns->pr_per_ctrl_refs); + +list_for_each_entry (ctrl, &subsys->ctrls, subsys_entry) { + ret =nvmet_pr_alloc_and_insert_pc_ref (ns, ctrl->cntlid, + &ctrl->hostid); +if (ret) + goto free_per_ctrl_refs; + } +return 0 ; + +free_per_ctrl_refs: +xa_for_each (&ns->pr_per_ctrl_refs, idx, pc_ref) { +xa_erase (&ns->pr_per_ctrl_refs, idx); +percpu_ref_exit (&pc_ref->ref); +kfree (pc_ref); + } +return ret; +} + +void nvmet_pr_exit_ns (struct nvmet_ns *ns) +{ +struct nvmet_pr_registrant *reg, *tmp; +struct nvmet_pr_per_ctrl_ref *pc_ref; +struct nvmet_pr *pr = &ns->pr; +unsigned long idx; + +list_for_each_entry_safe (reg, tmp, &pr->registrant_list, entry) { +list_del (®->entry); +kfree (reg); + } + +xa_for_each (&ns->pr_per_ctrl_refs, idx, pc_ref) { +/* +* No command on ns here, we can safely free pc_ref. +*/ + pc_ref =xa_erase (&ns->pr_per_ctrl_refs, idx); +percpu_ref_exit (&pc_ref->ref); +kfree (pc_ref); + } + +xa_destroy (&ns->pr_per_ctrl_refs); +} --Quoted 1 line
2.43.0
BR,
Dmitry