@@ -26,6 +26,26 @@ static enum nvme_pr_type nvme_pr_type_from_blk(enum pr_type type)
return 0;
}
+static enum pr_type block_pr_type_from_nvme(enum nvme_pr_type type)
+{
+ switch (type) {
+ case NVME_PR_WRITE_EXCLUSIVE:
+ return PR_WRITE_EXCLUSIVE;
+ case NVME_PR_EXCLUSIVE_ACCESS:
+ return PR_EXCLUSIVE_ACCESS;
+ case NVME_PR_WRITE_EXCLUSIVE_REG_ONLY:
+ return PR_WRITE_EXCLUSIVE_REG_ONLY;
+ case NVME_PR_EXCLUSIVE_ACCESS_REG_ONLY:
+ return PR_EXCLUSIVE_ACCESS_REG_ONLY;
+ case NVME_PR_WRITE_EXCLUSIVE_ALL_REGS:
+ return PR_WRITE_EXCLUSIVE_ALL_REGS;
+ case NVME_PR_EXCLUSIVE_ACCESS_ALL_REGS:
+ return NVME_PR_EXCLUSIVE_ACCESS_ALL_REGS;
+ }
+
+ return 0;
+}
+
static int nvme_send_ns_head_pr_command(struct block_device *bdev,
struct nvme_command *c, void *data, unsigned int data_len)
{
@@ -215,6 +235,66 @@ static int nvme_pr_read_keys(struct block_device *bdev,
return ret;
}
+static int nvme_pr_read_reservation(struct block_device *bdev,
+ struct pr_held_reservation *resv)
+{
+ struct nvme_reservation_status tmp_rs, *rs;
+ int ret, i, num_regs;
+ u32 rs_len;
+ bool eds;
+
+get_num_regs:
+ /*
+ * Get the number of registrations so we know how big to allocate
+ * the response buffer.
+ */
+ ret = nvme_pr_resv_report(bdev, &tmp_rs, sizeof(tmp_rs), &eds);
+ if (ret)
+ return ret;
+
+ num_regs = get_unaligned_le16(&tmp_rs.regctl);
+ if (!num_regs) {
+ resv->generation = le32_to_cpu(tmp_rs.gen);
+ return 0;
+ }
+
+ rs_len = sizeof(*rs) +
+ num_regs * sizeof(struct nvme_registered_ctrl_ext);
+ rs = kzalloc(rs_len, GFP_KERNEL);
+ if (!rs)
+ return -ENOMEM;
+
+ ret = nvme_pr_resv_report(bdev, rs, rs_len, &eds);
+ if (ret)
+ goto free_rs;
+
+ if (num_regs != get_unaligned_le16(&rs->regctl)) {
+ kfree(rs);
+ goto get_num_regs;
+ }
+
+ resv->generation = le32_to_cpu(rs->gen);
+ resv->type = block_pr_type_from_nvme(rs->rtype);
+
+ for (i = 0; i < num_regs; i++) {
+ if (eds) {
+ if (rs->regctl_eds[i].rcsts) {
+ resv->key = le64_to_cpu(rs->regctl_eds[i].rkey);
+ break;
+ }
+ } else {
+ if (rs->regctl_ds[i].rcsts) {
+ resv->key = le64_to_cpu(rs->regctl_ds[i].rkey);
+ break;
+ }
+ }
+ }
+
+free_rs:
+ kfree(rs);
+ return ret;
+}
+
const struct pr_ops nvme_pr_ops = {
.pr_register = nvme_pr_register,
.pr_reserve = nvme_pr_reserve,
@@ -222,4 +302,5 @@ const struct pr_ops nvme_pr_ops = {
.pr_preempt = nvme_pr_preempt,
.pr_clear = nvme_pr_clear,
.pr_read_keys = nvme_pr_read_keys,
+ .pr_read_reservation = nvme_pr_read_reservation,
};
This patch adds support for the pr_ops read_reservation callout by calling the NVMe Reservation Report helper. It then parses that info to detect if there is a reservation and if there is then convert the returned info to a pr_ops pr_held_reservation struct. Signed-off-by: Mike Christie <michael.christie@oracle.com> --- drivers/nvme/host/pr.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+)