Skip to contentSkip to conversation

nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices

PATCH Applied Michael Kelley 3 participants 4 messages Sep 23, 2022 – Sep 30, 2022 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices

The IOC_PR_CLEAR and IOC_PR_RELEASE ioctls are non-functional on NVMe devices because the nvme_pr_clear() and nvme_pr_release() functions set the IEKEY field incorrectly. The IEKEY field should be set only when the key is zero (i.e, not specified). The current code does it backwards.

Furthermore, the NVMe spec describes the persistent reservation "clear" function as an option on the reservation release command. The current implementation of nvme_pr_clear() erroneously uses the reservation register command.

Fix these errors. Note that NVMe version 1.3 and later specify that setting the IEKEY field will return an error of Invalid Field in Command. The fix will set IEKEY when the key is zero, which is appropriate as these ioctls consider a zero key to be "unspecified", and the intention of the spec change is to require a valid key.

Tested on a version 1.4 PCI NVMe device in an Azure VM.

Fixes 1673f1f08c88 ("nvme: move block_device_operations and ns/ctrl freeing to common code")
Fixes 1d277a637a71 ("NVMe: Add persistent reservation ops")
---
 drivers/nvme/host/core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/nvme/host/core.c +3 -3
index 0038283..45ef8e8 100644
@@ -2162,14 +2162,14 @@ static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new,
 
 static int nvme_pr_clear(struct block_device *bdev, u64 key)
 {
-	u32 cdw10 = 1 | (key ? 1 << 3 : 0);
+	u32 cdw10 = 1 | (key ? 0 : 1 << 3);
 
-	return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_register);
+	return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);
 }
 
 static int nvme_pr_release(struct block_device *bdev, u64 key, enum pr_type type)
 {
-	u32 cdw10 = nvme_pr_type(type) << 8 | (key ? 1 << 3 : 0);
+	u32 cdw10 = nvme_pr_type(type) << 8 | (key ? 0 : 1 << 3);
 
 	return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);
 }
Signature · 1 line
1.8.3.1
#2 lore raw

From: Christoph Hellwig <[email protected]> Sent: Tuesday, September 27, 2022 12:21 AM

Quoted 9 lines

To: Michael Kelley (LINUX) <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; linux- [email protected]; [email protected]
Subject: Re: [PATCH 1/1] nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices

Thanks,

applied to 6.0.

Christoph -- where did this get applied? I'm not seeing it in either the linux or linux-next trees.

Michael

maintainer
#3 lore raw
Quoted 7 lines · Michael Kelley (LINUX)

From: Christoph Hellwig <[email protected]> Sent: Tuesday, September 27, 2022 12:21 AM

Quoted 6 lines

To: Michael Kelley (LINUX) <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; linux- [email protected]; [email protected]
Subject: Re: [PATCH 1/1] nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices

Quoted 6 lines
Quoted 3 lines

Thanks,

applied to 6.0.

Christoph -- where did this get applied? I'm not seeing it in either the linux or linux-next trees.

The path for nvme patches to upstream goes through the nvme tree[1] -> block tree [2], then linux mainline. The pull request from block to mainline containing your patch was sent earlier today[3], and we typically see those merged within a few hours.

[1] http://git.infradead.org/nvme.git
[2] https://git.kernel.dk/cgit/linux-block/
[3] https://lore.kernel.org/linux-block/[email protected]/T/#u