| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250714-jag-cdq-v1-4-01e027d256d5@kernel.org>
Date: Mon, 14 Jul 2025 11:15:35 +0200
From: Joel Granados <joel.granados@...nel.org>
To: Keith Busch <kbusch@...nel.org>, Jens Axboe <axboe@...nel.dk>,
Christoph Hellwig <hch@....de>, Sagi Grimberg <sagi@...mberg.me>
Cc: Klaus Jensen <k.jensen@...sung.com>, linux-nvme@...ts.infradead.org,
linux-kernel@...r.kernel.org, Joel Granados <joel.granados@...nel.org>
Subject: [PATCH RFC 4/8] nvme: Add function to create a CDQ
On CDQ initialization:
* The memory holding the CDQ structure (struct cdq_nvme_queue) is
allocated,
* DMAable memory for the entries is allocated.
* A CDQ create command is sent to the controller
* The newly created CDQ is stored in ctrl->cdqs
* A CDQ file descriptor is created
* The CDQ id returned by the controller and the file descriptor value
are returned to the user
Signed-off-by: Joel Granados <joel.granados@...nel.org>
---
drivers/nvme/host/core.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++
drivers/nvme/host/nvme.h | 4 ++
2 files changed, 120 insertions(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 8517253002941e1f892e62bb7dacac40395b16d9..81b7183a4e3167290e68dc2eb26a8dbcd88c7924 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1319,6 +1319,122 @@ static const struct file_operations cdq_fops = {
.read = nvme_cdq_fops_read,
};
+static int nvme_cdq_fd(struct cdq_nvme_queue *cdq, int *fdno)
+{
+ int ret = 0;
+ struct file *filep;
+
+ *fdno = -1;
+
+ if (cdq->filep)
+ return -EINVAL;
+
+ filep = anon_inode_getfile("[cdq-readfd]", &cdq_fops, cdq, O_RDWR);
+ if (IS_ERR(filep)) {
+ ret = PTR_ERR(filep);
+ goto out;
+ }
+
+ *fdno = get_unused_fd_flags(O_CLOEXEC | O_RDONLY | O_DIRECT);
+ if (*fdno < 0) {
+ ret = *fdno;
+ goto out_fput;
+ }
+
+ fd_install(*fdno, filep);
+ cdq->filep = filep;
+
+ return 0;
+
+out_fput:
+ put_unused_fd(*fdno);
+ fput(filep);
+out:
+ return ret;
+}
+
+static int nvme_cdq_alloc(struct nvme_ctrl *ctrl, struct cdq_nvme_queue **cdq,
+ u32 entry_nr, u32 entry_nbyte)
+{
+ struct cdq_nvme_queue *ret_cdq = kzalloc(sizeof(*ret_cdq), GFP_KERNEL);
+
+ if (!ret_cdq)
+ return -ENOMEM;
+
+ ret_cdq->entries = dma_alloc_coherent(ctrl->dev,
+ entry_nr * entry_nbyte,
+ &ret_cdq->entries_dma_addr,
+ GFP_KERNEL);
+ if (!ret_cdq->entries) {
+ kfree(ret_cdq);
+ return -ENOMEM;
+ }
+
+ *cdq = ret_cdq;
+
+ return 0;
+}
+
+static void nvme_cdq_free(struct nvme_ctrl *ctrl, struct cdq_nvme_queue *cdq)
+{
+ dma_free_coherent(ctrl->dev, cdq->entry_nr * cdq->entry_nbyte,
+ cdq->entries, cdq->entries_dma_addr);
+ kfree(cdq);
+}
+
+
+int nvme_cdq_create(struct nvme_ctrl *ctrl, struct nvme_command *c,
+ const u32 entry_nr, const u32 entry_nbyte,
+ uint cdqp_offset, uint cdqp_mask,
+ u16 *cdq_id, int *cdq_fd)
+{
+ int ret, fdno;
+ struct cdq_nvme_queue *cdq, *xa_ret;
+ union nvme_result result = { };
+
+ ret = nvme_cdq_alloc(ctrl, &cdq, entry_nr, entry_nbyte);
+ if (ret)
+ return ret;
+ c->cdq.prp1 = cdq->entries_dma_addr;
+
+ ret = __nvme_submit_sync_cmd(ctrl->admin_q, c, &result, NULL, 0, NVME_QID_ANY, 0);
+ if (ret)
+ goto err_cdq_free;
+
+ cdq->cdq_id = le16_to_cpu(result.u16);
+ cdq->entry_nbyte = entry_nbyte;
+ cdq->entry_nr = entry_nr;
+ cdq->ctrl = ctrl;
+ cdq->cdqp_offset = cdqp_offset;
+ cdq->cdqp_mask = cdqp_mask;
+
+ xa_ret = xa_store(&ctrl->cdqs, cdq->cdq_id, cdq, GFP_KERNEL);
+ if (xa_is_err(xa_ret)) {
+ ret = xa_err(xa_ret);
+ goto err_cdq_free;
+ }
+
+ ret = nvme_cdq_fd(cdq, &fdno);
+ if (ret)
+ goto err_cdq_erase;
+
+ *cdq_id = cdq->cdq_id;
+ *cdq_fd = fdno;
+
+ return 0;
+
+err_cdq_erase:
+ xa_erase(&ctrl->cdqs, cdq->cdq_id);
+
+err_cdq_free:
+ cdq_id = NULL;
+ cdq_fd = NULL;
+ nvme_cdq_free(ctrl, cdq);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(nvme_cdq_create);
+
void nvme_passthru_end(struct nvme_ctrl *ctrl, struct nvme_ns *ns, u32 effects,
struct nvme_command *cmd, int status)
{
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 800970a0bb87f7a3b6e855f56a2493a7deed1ecd..ddec5b44fe022831280458ed9fc1cb1ed11633b7 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -1207,6 +1207,10 @@ u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns, u8 opcode);
int nvme_execute_rq(struct request *rq, bool at_head);
void nvme_passthru_end(struct nvme_ctrl *ctrl, struct nvme_ns *ns, u32 effects,
struct nvme_command *cmd, int status);
+int nvme_cdq_create(struct nvme_ctrl *ctrl, struct nvme_command *c,
+ const u32 entry_nr, const u32 entry_nbyte,
+ uint cdqp_offset, uint cdqp_mask,
+ u16 *cdq_id, int *cdq_fd);
struct nvme_ctrl *nvme_ctrl_from_file(struct file *file);
struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid);
bool nvme_get_ns(struct nvme_ns *ns);
--
2.47.2
Powered by blists - more mailing lists