nvme: use iommu_dmabuf api

Replace all pgmap/iommu_map_vaddr pairs with iommu_get/put_dmabuf. Signed-off-by: Klaus Jensen <[email protected]>
SamsungDS · Sep 6, 2024 · 9866a6d · 9866a6d
1 parent 6476e80
commit 9866a6d
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 133 deletions.
diff --git a/include/vfn/nvme.h b/include/vfn/nvme.h
@@ -36,6 +36,7 @@ extern "C" {
 #include <vfn/trace.h>
 #include <vfn/trace/events.h>
 #include <vfn/iommu.h>
+#include <vfn/iommu/dmabuf.h>
 #include <vfn/vfio.h>
 #include <vfn/nvme/types.h>
 #include <vfn/nvme/queue.h>

diff --git a/include/vfn/nvme/ctrl.h b/include/vfn/nvme/ctrl.h
@@ -82,8 +82,8 @@ struct nvme_ctrl {
 	 * @dbbuf: doorbell buffers
 	 */
 	struct {
-		void *doorbells;
-		void *eventidxs;
+		struct iommu_dmabuf doorbells;
+		struct iommu_dmabuf eventidxs;
 	} dbbuf;
 
 	/**

diff --git a/include/vfn/nvme/queue.h b/include/vfn/nvme/queue.h
@@ -27,8 +27,7 @@ struct nvme_dbbuf {
  */
 struct nvme_cq {
 	/* private: */
-	void *vaddr;
-	uint64_t iova;
+	struct iommu_dmabuf mem;
 
 	int id;
 	uint16_t head;
@@ -51,13 +50,8 @@ struct nvme_sq {
 	/* private: */
 	struct nvme_cq *cq;
 
-	void *vaddr;
-	uint64_t iova;
-
-	struct {
-		void *vaddr;
-		uint64_t iova;
-	} pages;
+	struct iommu_dmabuf mem;
+	struct iommu_dmabuf pages;
 
 	uint16_t tail, ptail;
 	int qsize;
@@ -84,7 +78,7 @@ struct nvme_sq {
  */
 static inline void nvme_sq_post(struct nvme_sq *sq, const union nvme_cmd *sqe)
 {
-	memcpy(sq->vaddr + (sq->tail << NVME_SQES), sqe, 1 << NVME_SQES);
+	memcpy(sq->mem.vaddr + (sq->tail << NVME_SQES), sqe, 1 << NVME_SQES);
 
 	trace_guard(NVME_SQ_POST) {
 		trace_emit("sqid %d tail %d\n", sq->id, sq->tail);
@@ -174,7 +168,7 @@ static inline void nvme_sq_exec(struct nvme_sq *sq, const union nvme_cmd *sqe)
  */
 static inline struct nvme_cqe *nvme_cq_head(struct nvme_cq *cq)
 {
-	return (struct nvme_cqe *)(cq->vaddr + (cq->head << NVME_CQES));
+	return (struct nvme_cqe *)(cq->mem.vaddr + (cq->head << NVME_CQES));
 }
 
 /**