RDMA/cxgb4: use dma_mmap_coherent() for mapping non-contiguous memory
Subsystems (2)
PATCH v2 1/1 RDMA/cxgb4: use dma_mmap_coherent() for mapping non-contiguous memory
dma_alloc_coherent() allocates contiguous memory irrespective of iommu mode, but after commit f5ff79fddf0e ("dma-mapping: remove CONFIG_DMA_REMAP") if iommu is enabled in translate mode, dma_alloc_coherent() may allocate non-contiguous memory. Attempt to map this memory results in panic.
This patch fixes the issue by using dma_mmap_coherent() to map each page to user space.
---
Changes since v1:
Addressed previous reveiw comments
Introduced flag to determine the type of memory mapping Removed fixes line
--- drivers/infiniband/hw/cxgb4/cq.c | 8 ++- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 35 ++++++++++++++ drivers/infiniband/hw/cxgb4/provider.c | 67 +++++++++++++------------- drivers/infiniband/hw/cxgb4/qp.c | 27 +++++++++-- 4 files changed, 99 insertions(+), 38 deletions(-)
drivers/infiniband/hw/cxgb4/cq.c +7 -1
@@ -1126,13 +1126,19 @@ int c4iw_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, goto err_free_mm2; mm->key = uresp.key; - mm->addr =virt_to_phys (chp->cq.queue); + mm->addr =0 ; + mm->vaddr = chp->cq.queue; + mm->dma_addr = chp->cq.dma_addr; mm->len = chp->cq.memsize; +insert_flag_to_mmap (&rhp->rdev, mm, mm->addr);insert_mmap (ucontext, mm); mm2->key = uresp.gts_key; mm2->addr = chp->cq.bar2_pa; mm2->len =PAGE_SIZE ; + mm2->vaddr =NULL ; + mm2->dma_addr =0 ; +insert_flag_to_mmap (&rhp->rdev, mm2, mm2->addr);insert_mmap (ucontext, mm2); }
drivers/infiniband/hw/cxgb4/iw_cxgb4.h +35 -0
@@ -532,11 +532,21 @@ static inline struct c4iw_ucontext *to_c4iw_ucontext(struct ib_ucontext *c) return container_of(c, struct c4iw_ucontext, ibucontext); } +enum { +CXGB4_MMAP_BAR , +CXGB4_MMAP_BAR_WC , +CXGB4_MMAP_CONTIG , +CXGB4_MMAP_NON_CONTIG , +}; +struct c4iw_mm_entry {struct list_head entry;u64 addr;u32 key; +void *vaddr; +dma_addr_t dma_addr;unsigned len; +u8 mmap_flag; }; static inline struct c4iw_mm_entry *remove_mmap(struct c4iw_ucontext *ucontext,
@@ -561,6 +571,31 @@ static inline struct c4iw_mm_entry *remove_mmap(struct c4iw_ucontext *ucontext,return NULL ; } +static inline void insert_flag_to_mmap (struct c4iw_rdev *rdev,struct c4iw_mm_entry *mm,u64 addr) +{ +if (addr >=pci_resource_start (rdev->lldi.pdev,0 ) && + (addr < (pci_resource_start (rdev->lldi.pdev,0 ) + +pci_resource_len (rdev->lldi.pdev,0 )))) + mm->mmap_flag =CXGB4_MMAP_BAR ; +else if (addr >=pci_resource_start (rdev->lldi.pdev,2 ) && + (addr < (pci_resource_start (rdev->lldi.pdev,2 ) + +pci_resource_len (rdev->lldi.pdev,2 )))) { +if (addr >= rdev->oc_mw_pa) { + mm->mmap_flag =CXGB4_MMAP_BAR_WC ; + }else { +if (is_t4 (rdev->lldi.adapter_type)) + mm->mmap_flag =CXGB4_MMAP_BAR ; +else + mm->mmap_flag =CXGB4_MMAP_BAR_WC ; + } + }else { +if (addr) + mm->mmap_flag =CXGB4_MMAP_CONTIG ; +else + mm->mmap_flag =CXGB4_MMAP_NON_CONTIG ; + } +} +static inline void insert_mmap (struct c4iw_ucontext *ucontext,struct c4iw_mm_entry *mm) {
drivers/infiniband/hw/cxgb4/provider.c +33 -34
92 lines not on this page · raw message
drivers/infiniband/hw/cxgb4/qp.c +24 -3
@@ -2281,24 +2281,36 @@ int c4iw_create_qp(struct ib_qp *qp, struct ib_qp_init_attr *attrs,if (ret) goto err_free_ma_sync_key; sq_key_mm->key = uresp.sq_key; - sq_key_mm->addr = qhp->wq.sq.phys_addr; + sq_key_mm->addr =0 ; + sq_key_mm->vaddr = qhp->wq.sq.queue; + sq_key_mm->dma_addr = qhp->wq.sq.dma_addr; sq_key_mm->len =PAGE_ALIGN (qhp->wq.sq.memsize); +insert_flag_to_mmap (&rhp->rdev, sq_key_mm, sq_key_mm->addr);insert_mmap (ucontext, sq_key_mm);if (!attrs->srq) { rq_key_mm->key = uresp.rq_key; - rq_key_mm->addr =virt_to_phys (qhp->wq.rq.queue); + rq_key_mm->addr =0 ; + rq_key_mm->vaddr = qhp->wq.rq.queue; + rq_key_mm->dma_addr = qhp->wq.rq.dma_addr; rq_key_mm->len =PAGE_ALIGN (qhp->wq.rq.memsize); +insert_flag_to_mmap (&rhp->rdev, rq_key_mm, rq_key_mm->addr);insert_mmap (ucontext, rq_key_mm); } sq_db_key_mm->key = uresp.sq_db_gts_key; sq_db_key_mm->addr = (u64 )(unsigned long )qhp->wq.sq.bar2_pa; + sq_db_key_mm->vaddr =NULL ; + sq_db_key_mm->dma_addr =0 ; sq_db_key_mm->len =PAGE_SIZE ; +insert_flag_to_mmap (&rhp->rdev, sq_db_key_mm, sq_db_key_mm->addr);insert_mmap (ucontext, sq_db_key_mm);if (!attrs->srq) { rq_db_key_mm->key = uresp.rq_db_gts_key; rq_db_key_mm->addr = (u64 )(unsigned long )qhp->wq.rq.bar2_pa; rq_db_key_mm->len =PAGE_SIZE ; + rq_db_key_mm->vaddr =NULL ; + rq_db_key_mm->dma_addr =0 ; +insert_flag_to_mmap (&rhp->rdev, rq_db_key_mm, rq_db_key_mm->addr);insert_mmap (ucontext, rq_db_key_mm); }if (ma_sync_key_mm) {
@@ -2307,6 +2319,9 @@ int c4iw_create_qp(struct ib_qp *qp, struct ib_qp_init_attr *attrs, (pci_resource_start (rhp->rdev.lldi.pdev,0 ) +PCIE_MA_SYNC_A ) &PAGE_MASK ; ma_sync_key_mm->len =PAGE_SIZE ; + ma_sync_key_mm->vaddr =NULL ; + ma_sync_key_mm->dma_addr =0 ; +insert_flag_to_mmap (&rhp->rdev, ma_sync_key_mm, ma_sync_key_mm->addr);insert_mmap (ucontext, ma_sync_key_mm); }
@@ -2761,12 +2776,18 @@ int c4iw_create_srq(struct ib_srq *ib_srq, struct ib_srq_init_attr *attrs,if (ret) goto err_free_srq_db_key_mm; srq_key_mm->key = uresp.srq_key; - srq_key_mm->addr =virt_to_phys (srq->wq.queue); + srq_key_mm->addr =0 ; srq_key_mm->len =PAGE_ALIGN (srq->wq.memsize); + srq_key_mm->vaddr = srq->wq.queue; + srq_key_mm->dma_addr = srq->wq.dma_addr; +insert_flag_to_mmap (&rhp->rdev, srq_key_mm, srq_key_mm->addr);insert_mmap (ucontext, srq_key_mm); srq_db_key_mm->key = uresp.srq_db_gts_key; srq_db_key_mm->addr = (u64 )(unsigned long )srq->wq.bar2_pa; srq_db_key_mm->len =PAGE_SIZE ; + srq_db_key_mm->vaddr =NULL ; + srq_db_key_mm->dma_addr =0 ; +insert_flag_to_mmap (&rhp->rdev, srq_db_key_mm, srq_db_key_mm->addr);insert_mmap (ucontext, srq_db_key_mm); }
Signature · 1 line
2.39.3
Leon Romanovsky
AppliedQuoted 9 lines · Anumula Murali Mohan Reddy
dma_alloc_coherent()allocates contiguous memory irrespective of iommu mode, but after commitf5ff79fddf0e("dma-mapping: removeCONFIG_DMA_REMAP") if iommu is enabled in translate mode,dma_alloc_coherent()may allocate non-contiguous memory. Attempt to map this memory results in panic.
This patch fixes the issue by usingdma_mmap_coherent()to map each page to user space.[...]
Applied, thanks!
[1/1] RDMA/cxgb4: use dma_mmap_coherent() for mapping non-contiguous memory
https://git.kernel.org/rdma/rdma/c/75ab1533d79b04
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>