From: Haggai Eran <haggaie@mellanox.com> To: linux-rdma@vger.kernel.org, linux-nvme@lists.infradead.org Cc: linux-pci@vger.kernel.org, Stephen Bates <stephen.bates@microsemi.com>, Liran Liss <liranl@mellanox.com>, Leon Romanovsky <leonro@mellanox.com>, Artemy Kovalyov <artemyko@mellanox.com>, Jerome Glisse <j.glisse@gmail.com>, Yishai Hadas <yishaih@mellanox.com>, Haggai Eran <haggaie@mellanox.com> Subject: [RFC 5/7] IB/mlx5: Implement reg_user_dma_buf_mr Date: Mon, 1 Aug 2016 09:57:31 +0300 [thread overview] Message-ID: <1470034653-9097-6-git-send-email-haggaie@mellanox.com> (raw) In-Reply-To: <1470034653-9097-1-git-send-email-haggaie@mellanox.com> Register DMA-BUF buffers as memory regions using the ib_mr_attach_dmabuf helper function. The code posts the fast registration request on the UMR QP and syncs before returning. Signed-off-by: Haggai Eran <haggaie@mellanox.com> --- drivers/infiniband/hw/mlx5/main.c | 4 ++- drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 +++ drivers/infiniband/hw/mlx5/mr.c | 51 ++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index f41254f3689a..852be161b68e 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -2368,7 +2368,8 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) dev->ib_dev.uverbs_ex_cmd_mask = (1ull << IB_USER_VERBS_EX_CMD_QUERY_DEVICE) | (1ull << IB_USER_VERBS_EX_CMD_CREATE_CQ) | - (1ull << IB_USER_VERBS_EX_CMD_CREATE_QP); + (1ull << IB_USER_VERBS_EX_CMD_CREATE_QP) | + (1ull << IB_USER_VERBS_EX_CMD_REG_DMA_BUF_MR); dev->ib_dev.query_device = mlx5_ib_query_device; dev->ib_dev.query_port = mlx5_ib_query_port; @@ -2409,6 +2410,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) dev->ib_dev.get_dma_mr = mlx5_ib_get_dma_mr; dev->ib_dev.reg_user_mr = mlx5_ib_reg_user_mr; dev->ib_dev.rereg_user_mr = mlx5_ib_rereg_user_mr; + dev->ib_dev.reg_user_dma_buf_mr = mlx5_ib_reg_user_dma_buf_mr; dev->ib_dev.dereg_mr = mlx5_ib_dereg_mr; dev->ib_dev.attach_mcast = mlx5_ib_mcg_attach; dev->ib_dev.detach_mcast = mlx5_ib_mcg_detach; diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h index c4a9825828bc..a722dcb367fc 100644 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h @@ -711,6 +711,10 @@ int mlx5_ib_update_mtt(struct mlx5_ib_mr *mr, u64 start_page_index, int mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start, u64 length, u64 virt_addr, int access_flags, struct ib_pd *pd, struct ib_udata *udata); +struct ib_mr *mlx5_ib_reg_user_dma_buf_mr(struct ib_pd *pd, + struct dma_buf *dmabuf, + int mr_access_flags, + struct ib_udata *udata); int mlx5_ib_dereg_mr(struct ib_mr *ibmr); struct ib_mr *mlx5_ib_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type, diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index fb2bb25c6cf0..f773787013bd 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -39,6 +39,7 @@ #include <rdma/ib_umem.h> #include <rdma/ib_umem_odp.h> #include <rdma/ib_verbs.h> +#include <linux/dma-buf.h> #include "mlx5_ib.h" #include "user.h" @@ -1447,6 +1448,8 @@ int mlx5_ib_dereg_mr(struct ib_mr *ibmr) struct mlx5_ib_mr *mr = to_mmr(ibmr); int npages = mr->npages; struct ib_umem *umem = mr->umem; + struct dma_buf_attachment *attach = ibmr->attach; + struct sg_table *sg = ibmr->sg; #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING if (umem && umem->odp_data) { @@ -1477,6 +1480,9 @@ int mlx5_ib_dereg_mr(struct ib_mr *ibmr) atomic_sub(npages, &dev->mdev->priv.reg_pages); } + if (attach) + ib_mr_detach_dmabuf(attach, sg); + return 0; } @@ -1785,3 +1791,48 @@ int mlx5_ib_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents, return n; } + +struct ib_mr *mlx5_ib_reg_user_dma_buf_mr(struct ib_pd *pd, + struct dma_buf *dmabuf, + int mr_access_flags, + struct ib_udata *udata) +{ + struct mlx5_ib_dev *dev = to_mdev(pd->device); + struct ib_mr *mr; + struct mlx5_ib_umr_context umr_context; + struct ib_reg_wr regwr = {}; + int ret; + + if (mr_access_flags & IB_ACCESS_ON_DEMAND) { + mlx5_ib_err(dev, "reg DMA-BUF MR with on-demand paging not supported"); + return ERR_PTR(-EINVAL); + } + + mr = ib_alloc_mr(pd, IB_MR_TYPE_MEM_REG, + DIV_ROUND_UP(dmabuf->size, PAGE_SIZE)); + if (IS_ERR(mr)) + return mr; + + ret = ib_mr_attach_dmabuf(mr, dmabuf, mr_access_flags); + if (ret) + goto dereg; + + mlx5_ib_init_umr_context(&umr_context); + regwr.wr.wr_cqe = &umr_context.cqe; + regwr.wr.opcode = IB_WR_REG_MR; + regwr.mr = mr; + regwr.key = mr->lkey; + regwr.access = mr_access_flags; + + ret = mlx5_ib_post_umr_sync(dev, ®wr.wr); + if (ret) + goto detach; + + return mr; + +detach: + ib_mr_detach_dmabuf(mr->attach, mr->sg); +dereg: + WARN_ON_ONCE(ib_dereg_mr(mr)); + return ERR_PTR(ret); +} -- 1.7.11.2
WARNING: multiple messages have this Message-ID (diff)
From: haggaie@mellanox.com (Haggai Eran) Subject: [RFC 5/7] IB/mlx5: Implement reg_user_dma_buf_mr Date: Mon, 1 Aug 2016 09:57:31 +0300 [thread overview] Message-ID: <1470034653-9097-6-git-send-email-haggaie@mellanox.com> (raw) In-Reply-To: <1470034653-9097-1-git-send-email-haggaie@mellanox.com> Register DMA-BUF buffers as memory regions using the ib_mr_attach_dmabuf helper function. The code posts the fast registration request on the UMR QP and syncs before returning. Signed-off-by: Haggai Eran <haggaie at mellanox.com> --- drivers/infiniband/hw/mlx5/main.c | 4 ++- drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 +++ drivers/infiniband/hw/mlx5/mr.c | 51 ++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index f41254f3689a..852be161b68e 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -2368,7 +2368,8 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) dev->ib_dev.uverbs_ex_cmd_mask = (1ull << IB_USER_VERBS_EX_CMD_QUERY_DEVICE) | (1ull << IB_USER_VERBS_EX_CMD_CREATE_CQ) | - (1ull << IB_USER_VERBS_EX_CMD_CREATE_QP); + (1ull << IB_USER_VERBS_EX_CMD_CREATE_QP) | + (1ull << IB_USER_VERBS_EX_CMD_REG_DMA_BUF_MR); dev->ib_dev.query_device = mlx5_ib_query_device; dev->ib_dev.query_port = mlx5_ib_query_port; @@ -2409,6 +2410,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) dev->ib_dev.get_dma_mr = mlx5_ib_get_dma_mr; dev->ib_dev.reg_user_mr = mlx5_ib_reg_user_mr; dev->ib_dev.rereg_user_mr = mlx5_ib_rereg_user_mr; + dev->ib_dev.reg_user_dma_buf_mr = mlx5_ib_reg_user_dma_buf_mr; dev->ib_dev.dereg_mr = mlx5_ib_dereg_mr; dev->ib_dev.attach_mcast = mlx5_ib_mcg_attach; dev->ib_dev.detach_mcast = mlx5_ib_mcg_detach; diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h index c4a9825828bc..a722dcb367fc 100644 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h @@ -711,6 +711,10 @@ int mlx5_ib_update_mtt(struct mlx5_ib_mr *mr, u64 start_page_index, int mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start, u64 length, u64 virt_addr, int access_flags, struct ib_pd *pd, struct ib_udata *udata); +struct ib_mr *mlx5_ib_reg_user_dma_buf_mr(struct ib_pd *pd, + struct dma_buf *dmabuf, + int mr_access_flags, + struct ib_udata *udata); int mlx5_ib_dereg_mr(struct ib_mr *ibmr); struct ib_mr *mlx5_ib_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type, diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index fb2bb25c6cf0..f773787013bd 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -39,6 +39,7 @@ #include <rdma/ib_umem.h> #include <rdma/ib_umem_odp.h> #include <rdma/ib_verbs.h> +#include <linux/dma-buf.h> #include "mlx5_ib.h" #include "user.h" @@ -1447,6 +1448,8 @@ int mlx5_ib_dereg_mr(struct ib_mr *ibmr) struct mlx5_ib_mr *mr = to_mmr(ibmr); int npages = mr->npages; struct ib_umem *umem = mr->umem; + struct dma_buf_attachment *attach = ibmr->attach; + struct sg_table *sg = ibmr->sg; #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING if (umem && umem->odp_data) { @@ -1477,6 +1480,9 @@ int mlx5_ib_dereg_mr(struct ib_mr *ibmr) atomic_sub(npages, &dev->mdev->priv.reg_pages); } + if (attach) + ib_mr_detach_dmabuf(attach, sg); + return 0; } @@ -1785,3 +1791,48 @@ int mlx5_ib_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents, return n; } + +struct ib_mr *mlx5_ib_reg_user_dma_buf_mr(struct ib_pd *pd, + struct dma_buf *dmabuf, + int mr_access_flags, + struct ib_udata *udata) +{ + struct mlx5_ib_dev *dev = to_mdev(pd->device); + struct ib_mr *mr; + struct mlx5_ib_umr_context umr_context; + struct ib_reg_wr regwr = {}; + int ret; + + if (mr_access_flags & IB_ACCESS_ON_DEMAND) { + mlx5_ib_err(dev, "reg DMA-BUF MR with on-demand paging not supported"); + return ERR_PTR(-EINVAL); + } + + mr = ib_alloc_mr(pd, IB_MR_TYPE_MEM_REG, + DIV_ROUND_UP(dmabuf->size, PAGE_SIZE)); + if (IS_ERR(mr)) + return mr; + + ret = ib_mr_attach_dmabuf(mr, dmabuf, mr_access_flags); + if (ret) + goto dereg; + + mlx5_ib_init_umr_context(&umr_context); + regwr.wr.wr_cqe = &umr_context.cqe; + regwr.wr.opcode = IB_WR_REG_MR; + regwr.mr = mr; + regwr.key = mr->lkey; + regwr.access = mr_access_flags; + + ret = mlx5_ib_post_umr_sync(dev, ®wr.wr); + if (ret) + goto detach; + + return mr; + +detach: + ib_mr_detach_dmabuf(mr->attach, mr->sg); +dereg: + WARN_ON_ONCE(ib_dereg_mr(mr)); + return ERR_PTR(ret); +} -- 1.7.11.2
next prev parent reply other threads:[~2016-08-01 6:57 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-08-01 6:57 [RFC 0/7] RDMA subsystem DMA-BUF support Haggai Eran 2016-08-01 6:57 ` Haggai Eran 2016-08-01 6:57 ` Haggai Eran 2016-08-01 6:57 ` [RFC 1/7] IB/mlx5: Helper for posting work-requests on the UMR QP Haggai Eran 2016-08-01 6:57 ` Haggai Eran 2016-08-01 6:57 ` [RFC 2/7] IB/mlx5: Support registration and invalidate operations " Haggai Eran 2016-08-01 6:57 ` Haggai Eran 2016-08-01 6:57 ` [RFC 3/7] IB/core: Helpers for mapping DMA-BUF in MRs Haggai Eran 2016-08-01 6:57 ` Haggai Eran 2016-08-01 6:57 ` [RFC 4/7] IB/uverbs: Add command to register a DMA-BUF fd Haggai Eran 2016-08-01 6:57 ` Haggai Eran 2016-08-01 6:57 ` Haggai Eran [this message] 2016-08-01 6:57 ` [RFC 5/7] IB/mlx5: Implement reg_user_dma_buf_mr Haggai Eran 2016-08-01 6:57 ` [RFC 6/7] NVMe: Use genalloc to allocate CMB regions Haggai Eran 2016-08-01 6:57 ` Haggai Eran 2016-08-01 15:53 ` Christoph Hellwig 2016-08-01 16:20 ` Jon Derrick 2016-08-01 16:20 ` Jon Derrick 2016-08-01 16:20 ` Jon Derrick 2016-08-02 7:15 ` Haggai Eran 2016-08-02 7:15 ` Haggai Eran 2016-08-02 7:15 ` Haggai Eran [not found] ` <20160801155348.GB23224-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> 2016-08-02 6:48 ` Haggai Eran 2016-08-02 6:48 ` Haggai Eran 2016-08-02 6:48 ` Haggai Eran [not found] ` <1470034653-9097-1-git-send-email-haggaie-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org> 2016-08-01 6:57 ` [RFC 7/7] NVMe: CMB on DMA-BUF Haggai Eran 2016-08-01 6:57 ` Haggai Eran 2016-08-01 6:57 ` Haggai Eran 2016-08-01 15:52 ` Christoph Hellwig 2016-08-01 15:52 ` Christoph Hellwig [not found] ` <20160801155206.GA23224-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> 2016-08-02 7:10 ` Haggai Eran 2016-08-02 7:10 ` Haggai Eran 2016-08-02 7:10 ` Haggai Eran [not found] ` <1470121814.20129.8.camel-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org> 2016-08-04 11:56 ` hch-wEGCiKHe2LqWVfeAwA7xHQ 2016-08-04 11:56 ` hch 2016-08-04 11:56 ` hch 2016-08-07 5:24 ` Haggai Eran 2016-08-07 5:24 ` Haggai Eran 2016-08-03 10:02 ` Sagi Grimberg 2016-08-03 10:02 ` Sagi Grimberg 2016-08-03 10:02 ` Sagi Grimberg
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1470034653-9097-6-git-send-email-haggaie@mellanox.com \ --to=haggaie@mellanox.com \ --cc=artemyko@mellanox.com \ --cc=j.glisse@gmail.com \ --cc=leonro@mellanox.com \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux-rdma@vger.kernel.org \ --cc=liranl@mellanox.com \ --cc=stephen.bates@microsemi.com \ --cc=yishaih@mellanox.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.