nvmet: fix Reservation Register Replace for unregistered host with IEKEY
Subsystems (2)
PATCH 1/1 nvmet: fix Reservation Register Replace for unregistered host with IEKEY
When a host sends a Reservation Register command with RREGA=Replace and IEKEY=1 without being previously registered, nvmet returns Reservation Conflict. SPDK accepts this combination and creates a new registrant with the provided NRKEY, with an explicit unit test covering this scenario (test/unit/lib/nvmf/subsystem.c).
Fix nvmet_pr_replace() to add a new registrant when the host is not found in the registrant list and IEKEY is set with a non-zero NRKEY, consistent with SPDK's behavior.
Tested with nvme-cli against nvmet-tcp:
# no prior registration nvme resv-register /dev/nvmeXn1 -n 1 --rrega=2 --iekey --nrkey=0x9999
Before: RESERVATION_CONFLICT (0x4083)
After: success, registrant created with rkey 0x9999
--- drivers/nvme/target/pr.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
drivers/nvme/target/pr.c +19 -1
@@ -355,12 +355,14 @@ static u16 nvmet_pr_replace(struct nvmet_req *req,u16 status =NVME_SC_RESERVATION_CONFLICT |NVME_STATUS_DNR ;struct nvmet_ctrl *ctrl = req->sq->ctrl;struct nvmet_pr *pr = &req->ns->pr; -struct nvmet_pr_registrant *reg; +struct nvmet_pr_registrant *reg, *new;u64 nrkey =le64_to_cpu (d->nrkey); +bool found = false;down (&pr->pr_sem);list_for_each_entry_rcu (reg, &pr->registrant_list, entry) {if (uuid_equal (®->hostid, &ctrl->hostid)) { + found = true;if (ignore_key || reg->rkey ==le64_to_cpu (d->crkey)) status = nvmet_pr_update_reg_attr(pr, reg, nvmet_pr_update_reg_rkey,
@@ -368,6 +370,22 @@ static u16 nvmet_pr_replace(struct nvmet_req *req,break ; } } + +if (!found && ignore_key && nrkey) { + new =kmalloc_obj (*new); +if (!new) { + status =NVME_SC_INTERNAL ; + goto out; + } +memset (new,0 ,sizeof (*new)); +INIT_LIST_HEAD (&new->entry); + new->rkey = nrkey; +uuid_copy (&new->hostid, &ctrl->hostid); +list_add_tail_rcu (&new->entry, &pr->registrant_list); + status =NVME_SC_SUCCESS ; + } + +out:up (&pr->pr_sem);return status; }
Signature · 1 line
2.43.7
Quoted 10 lines · Zhengrong Li
When a host sends a Reservation Register command with RREGA=Replace and IEKEY=1 without being previously registered, nvmet returns Reservation Conflict. SPDK accepts this combination and creates a new registrant with the provided NRKEY, with an explicit unit test covering this scenario (
test/unit/lib/nvmf/subsystem.c).Fix
nvmet_pr_replace()to add a new registrant when the host is not found in the registrant list and IEKEY is set with a non-zero NRKEY, consistent with SPDK's behavior.
Quoted 7 lines
Tested with nvme-cli against nvmet-tcp:
# no prior registration nvme resv-register /dev/nvmeXn1 -n 1 --rrega=2 --iekey --nrkey=0x9999Before:
RESERVATION_CONFLICT(0x4083)
After: success, registrant created with rkey0x9999
The SPDK behaviour seems to be correct, the spec indeed says that
"A host may replace
its reservation key without regard to its registration status or current reservation key value by setting the Ignore Existing Key (IEKEY) bit to '1' in the Reservation Register
command."
Quoted 28 lines
Signed-off-by Zhengrong Li <[email protected]>--- drivers/nvme/target/pr.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)drivers/nvme/target/pr.c +3
-1@@ -355,12 +355,14 @@ static u16 nvmet_pr_replace(struct nvmet_req *req,u16 status =NVME_SC_RESERVATION_CONFLICT |NVME_STATUS_DNR ;struct nvmet_ctrl *ctrl = req->sq->ctrl;struct nvmet_pr *pr = &req->ns->pr; -struct nvmet_pr_registrant *reg; +struct nvmet_pr_registrant *reg, *new;u64 nrkey =le64_to_cpu (d->nrkey); +bool found = false;down (&pr->pr_sem);list_for_each_entry_rcu (reg, &pr->registrant_list, entry) {if (uuid_equal (®->hostid, &ctrl->hostid)) { + found = true;if (ignore_key || reg->rkey ==le64_to_cpu (d->crkey)) status = nvmet_pr_update_reg_attr(pr, reg, nvmet_pr_update_reg_rkey,@@ -368,6 +370,22 @@ static u16 nvmet_pr_replace(struct nvmet_req *req,break ;
drivers/nvme/target/pr.c static u16 nvmet_pr_replace(struct nvmet_req *req, · line 380
Quoted 10 lines
drivers/nvme/target/pr.c +8
-0} } + +if (!found && ignore_key && nrkey) { + new =kmalloc_obj (*new); +if (!new) { + status =NVME_SC_INTERNAL ; + goto out; + } +memset (new,0 ,sizeof (*new));
Just use kzalloc_obj()?
Maurizio
PATCH v2 1/1 nvmet: fix Reservation Register Replace for unregistered host with IEKEY
In reply to Zhengrong LiWhen a host sends a Reservation Register command with RREGA=Replace and IEKEY=1 without being previously registered, nvmet returns Reservation Conflict. SPDK accepts this combination and creates a new registrant with the provided NRKEY, with an explicit unit test covering this scenario (test/unit/lib/nvmf/subsystem.c).
Fix nvmet_pr_replace() to add a new registrant when the host is not found in the registrant list and IEKEY is set with a non-zero NRKEY, consistent with SPDK's behavior.
Tested with nvme-cli against nvmet-tcp:
# no prior registration nvme resv-register /dev/nvmeXn1 -n 1 --rrega=2 --iekey --nrkey=0x9999
Before: RESERVATION_CONFLICT (0x4083)
After: success, registrant created with rkey 0x9999
---
Changes since v1:
- Use kzalloc_obj() instead of kmalloc_obj() + memset() (Maurizio).
--- drivers/nvme/target/pr.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/nvme/target/pr.c +18 -1
@@ -355,12 +355,14 @@ static u16 nvmet_pr_replace(struct nvmet_req *req,u16 status =NVME_SC_RESERVATION_CONFLICT |NVME_STATUS_DNR ;struct nvmet_ctrl *ctrl = req->sq->ctrl;struct nvmet_pr *pr = &req->ns->pr; -struct nvmet_pr_registrant *reg; +struct nvmet_pr_registrant *reg, *new;u64 nrkey =le64_to_cpu (d->nrkey); +bool found = false;down (&pr->pr_sem);list_for_each_entry_rcu (reg, &pr->registrant_list, entry) {if (uuid_equal (®->hostid, &ctrl->hostid)) { + found = true;if (ignore_key || reg->rkey ==le64_to_cpu (d->crkey)) status = nvmet_pr_update_reg_attr(pr, reg, nvmet_pr_update_reg_rkey,
@@ -368,6 +370,21 @@ static u16 nvmet_pr_replace(struct nvmet_req *req,break ; } } + +if (!found && ignore_key && nrkey) { + new =kzalloc_obj (*new); +if (!new) { + status =NVME_SC_INTERNAL ; + goto out; + } +INIT_LIST_HEAD (&new->entry); + new->rkey = nrkey; +uuid_copy (&new->hostid, &ctrl->hostid); +list_add_tail_rcu (&new->entry, &pr->registrant_list); + status =NVME_SC_SUCCESS ; + } + +out:up (&pr->pr_sem);return status; }
Signature · 1 line
2.43.0
Hi Zhengrong:
Quoted 9 lines · Zhengrong Li
When a host sends a Reservation Register command with RREGA=Replace and IEKEY=1 without being previously registered, nvmet returns Reservation Conflict. SPDK accepts this combination and creates a new registrant with the provided NRKEY, with an explicit unit test covering this scenario (
test/unit/lib/nvmf/subsystem.c).Fix
nvmet_pr_replace()to add a new registrant when the host is not found in the registrant list and IEKEY is set with a non-zero NRKEY, consistent with SPDK's behavior.
Just quote the NVMe spec rather than mentioning SPDK.
Quoted 8 lines
Tested with nvme-cli against nvmet-tcp:
# no prior registration nvme resv-register /dev/nvmeXn1 -n 1 --rrega=2 --iekey --nrkey=0x9999Before:
RESERVATION_CONFLICT(0x4083)
After: success, registrant created with rkey0x9999
Here need add: Fixes: 5a47c2080a73 ("nvmet: support reservation feature").
Quoted 29 lines
Signed-off-by Zhengrong Li <[email protected]>---
Changes since v1:
- Usekzalloc_obj()instead ofkmalloc_obj()+memset()(Maurizio).--- drivers/nvme/target/pr.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)drivers/nvme/target/pr.c +3
-1@@ -355,12 +355,14 @@ static u16 nvmet_pr_replace(struct nvmet_req *req,u16 status =NVME_SC_RESERVATION_CONFLICT |NVME_STATUS_DNR ;struct nvmet_ctrl *ctrl = req->sq->ctrl;struct nvmet_pr *pr = &req->ns->pr; -struct nvmet_pr_registrant *reg; +struct nvmet_pr_registrant *reg, *new;u64 nrkey =le64_to_cpu (d->nrkey); +bool found = false;down (&pr->pr_sem);list_for_each_entry_rcu (reg, &pr->registrant_list, entry) {if (uuid_equal (®->hostid, &ctrl->hostid)) { + found = true;if (ignore_key || reg->rkey ==le64_to_cpu (d->crkey)) status = nvmet_pr_update_reg_attr(pr, reg, nvmet_pr_update_reg_rkey,
drivers/nvme/target/pr.c static u16 nvmet_pr_replace(struct nvmet_req *req, · line 375
Quoted 6 lines
drivers/nvme/target/pr.c +3
-0@@ -368,6 +370,21 @@ static u16 nvmet_pr_replace(struct nvmet_req *req,break ; } } + +if (!found && ignore_key && nrkey) { + new =kzalloc_obj (*new);
Nit: you can alloc new before down(&pr->pr_sem).
drivers/nvme/target/pr.c static u16 nvmet_pr_replace(struct nvmet_req *req, · line 386
Quoted 11 lines
drivers/nvme/target/pr.c +11
-0+if (!new) { + status =NVME_SC_INTERNAL ; + goto out; + } +INIT_LIST_HEAD (&new->entry); + new->rkey = nrkey; +uuid_copy (&new->hostid, &ctrl->hostid); +list_add_tail_rcu (&new->entry, &pr->registrant_list); + status =NVME_SC_SUCCESS ; + } +
If the nrkey==0, should return NVME_SC_INVALID_FIELD | NVME_STATUS_DNR instead of
NVME_SC_RESERVATION_CONFLICT | NVME_STATUS_DNR;
drivers/nvme/target/pr.c static u16 nvmet_pr_replace(struct nvmet_req *req, · line 390
Quoted 4 lines
drivers/nvme/target/pr.c +1
-0+out:up (&pr->pr_sem);return status; }
Others looks good, thanks.
Best Regards,
Guixin Liu
PATCH v3 1/1 nvmet: fix Reservation Register Replace for unregistered host with IEKEY
In reply to Zhengrong LiWhen a host sends a Reservation Register command with RREGA=Replace and IEKEY=1 without being previously registered, nvmet returns Reservation Conflict.
The NVMe specification states:
"A host may replace its reservation key without regard to its
registration status or current reservation key value by setting the Ignore Existing Key (IEKEY) bit to '1' in the Reservation Register command."
Fix nvmet_pr_replace() to add a new registrant when the host is not found in the registrant list and IEKEY is set with a non-zero NRKEY. If IEKEY is set but NRKEY is zero, return Invalid Field since there is no valid reservation key to register.
Tested with nvme-cli against nvmet-tcp:
# no prior registration nvme resv-register /dev/nvmeXn1 -n 1 --rrega=2 --iekey --nrkey=0x9999
Before: RESERVATION_CONFLICT (0x4083)
After: success, registrant created with rkey 0x9999
---
Changes since v2:
- Quote the NVMe specification instead of referencing SPDK (Guixin).
- Add the Fixes tag (Guixin).
- Return NVME_SC_INVALID_FIELD when IEKEY is set but NRKEY is zero for an unregistered host (Guixin).
- Allocate the new registrant before taking pr_sem and free it if unused (Guixin).
--- drivers/nvme/target/pr.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
drivers/nvme/target/pr.c +25 -1
@@ -355,12 +355,20 @@ static u16 nvmet_pr_replace(struct nvmet_req *req,u16 status =NVME_SC_RESERVATION_CONFLICT |NVME_STATUS_DNR ;struct nvmet_ctrl *ctrl = req->sq->ctrl;struct nvmet_pr *pr = &req->ns->pr; -struct nvmet_pr_registrant *reg; +struct nvmet_pr_registrant *reg, *new =NULL ;u64 nrkey =le64_to_cpu (d->nrkey); +bool found = false; + +if (ignore_key && nrkey) { + new =kzalloc_obj (*new); +if (!new) +return NVME_SC_INTERNAL ; + }down (&pr->pr_sem);list_for_each_entry_rcu (reg, &pr->registrant_list, entry) {if (uuid_equal (®->hostid, &ctrl->hostid)) { + found = true;if (ignore_key || reg->rkey ==le64_to_cpu (d->crkey)) status = nvmet_pr_update_reg_attr(pr, reg, nvmet_pr_update_reg_rkey,
@@ -368,7 +376,23 @@ static u16 nvmet_pr_replace(struct nvmet_req *req,break ; } } + +if (!found && ignore_key) { +if (!nrkey) { + status =NVME_SC_INVALID_FIELD |NVME_STATUS_DNR ; + goto out; + } +INIT_LIST_HEAD (&new->entry); + new->rkey = nrkey; +uuid_copy (&new->hostid, &ctrl->hostid); +list_add_tail_rcu (&new->entry, &pr->registrant_list); + status =NVME_SC_SUCCESS ; + new =NULL ; + } + +out:up (&pr->pr_sem); +kfree (new);return status; }
Signature · 1 line
2.43.0
PATCH v4 1/1 nvmet: fix Reservation Register Replace for unregistered host with IEKEY
In reply to Zhengrong LiWhen a host sends a Reservation Register command with RREGA=Replace and IEKEY=1 without being previously registered, nvmet returns Reservation Conflict.
The NVMe specification states:
"A host may replace its reservation key without regard to its
registration status or current reservation key value by setting the Ignore Existing Key (IEKEY) bit to '1' in the Reservation Register command."
Fix nvmet_pr_replace() to add a new registrant when the host is not found in the registrant list and IEKEY is set with a non-zero NRKEY. If IEKEY is set but NRKEY is zero, return Invalid Field since there is no valid reservation key to register.
Tested with nvme-cli against nvmet-tcp:
# no prior registration nvme resv-register /dev/nvmeXn1 -n 1 --rrega=2 --iekey --nrkey=0x9999
Before: RESERVATION_CONFLICT (0x4083)
After: success, registrant created with rkey 0x9999
---
Changes since v3:
- Use explicit goto free_data/out cleanup labels instead of the NULL-pointer kfree trick, consistent with the rest of pr.c.
- Remove the redundant 'found' bool variable.
Changes since v2:
- Quote the NVMe specification instead of referencing SPDK (Guixin).
- Add the Fixes tag (Guixin).
- Return NVME_SC_INVALID_FIELD when IEKEY is set but NRKEY is zero for an unregistered host (Guixin).
- Allocate the new registrant before taking pr_sem and free it if unused (Guixin).
--- drivers/nvme/target/pr.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)
drivers/nvme/target/pr.c +25 -2
@@ -355,9 +355,15 @@ static u16 nvmet_pr_replace(struct nvmet_req *req,u16 status =NVME_SC_RESERVATION_CONFLICT |NVME_STATUS_DNR ;struct nvmet_ctrl *ctrl = req->sq->ctrl;struct nvmet_pr *pr = &req->ns->pr; -struct nvmet_pr_registrant *reg; +struct nvmet_pr_registrant *reg, *new =NULL ;u64 nrkey =le64_to_cpu (d->nrkey); +if (ignore_key && nrkey) { + new =kzalloc_obj (*new); +if (!new) +return NVME_SC_INTERNAL ; + } +down (&pr->pr_sem);list_for_each_entry_rcu (reg, &pr->registrant_list, entry) {if (uuid_equal (®->hostid, &ctrl->hostid)) {
@@ -365,9 +371,26 @@ static u16 nvmet_pr_replace(struct nvmet_req *req, status =nvmet_pr_update_reg_attr (pr, reg, nvmet_pr_update_reg_rkey, &nrkey); -break ; + goto free_data; + } + } + +if (ignore_key) { +if (!nrkey) { + status =NVME_SC_INVALID_FIELD |NVME_STATUS_DNR ; + goto free_data; } +INIT_LIST_HEAD (&new->entry); + new->rkey = nrkey; +uuid_copy (&new->hostid, &ctrl->hostid); +list_add_tail_rcu (&new->entry, &pr->registrant_list); + status =NVME_SC_SUCCESS ; + goto out; } + +free_data: +kfree (new); +out:up (&pr->pr_sem);return status; }
Signature · 1 line
2.43.0
LGTM.
Looks good:
Quoted 3 lines · Zhengrong Li
When a host sends a Reservation Register command with RREGA=Replace and IEKEY=1 without being previously registered, nvmet returns Reservation Conflict.
Thanks, applied to nvme-7.3.