Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp260292pxb; Tue, 28 Sep 2021 21:24:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfk9wiOLxjiR6Qcp/+UDBDDAmqtJ7M/VyZCovGUSJSOJ604gKvDXegyqosVomD/Jt1hVZi X-Received: by 2002:a50:e188:: with SMTP id k8mr12525878edl.119.1632889492055; Tue, 28 Sep 2021 21:24:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632889492; cv=none; d=google.com; s=arc-20160816; b=fUMvoszlEbL/wB9FuBRkL+PA/qK8t0Z0RyPx6xDgIYELHfi/ZdLrqqFJD8yxL37jpy onOCkR9Onl5brhN5nBMqKH8P4QzmXe5b9M8CvipHsFCN9pyXyCHbegDA1tk4VTjbuI4a 24wh+AoN6SN94xKS+ucCyJrBx29sC4jzc0WoCFNBPhbPNU0+rHm1cCcihLTLFJg2PZ3N OUYP0mRLyv46AHb8kLdhbcNqdEJBmG+xdrpfsGFF4Ev1GsYQDoAj+jasREZBhlN71ZGF P/Ahj16xEABOXraTQTa3/gppTM0EGT0HzX1Fwoqdc8uJS+eXCC2EJ3qxsnc2A5MlZW8Y nBsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wGElA4q7plQa8+h675MjByrmxCgr2foTglcxGJwe7eQ=; b=CKXDrsssS/kfBX/vU7W6KZnHa9AcsK39NFWHzQnfpl6MzOJ7nytn690/z6Tmcv6t54 ddWr1OP0bfytQnQtrCieNTu522CwH/L4IKgu9ynZdumsq2X/x027H83Z98IkrRW/Sk+o HjWSOZYjmzh2aFIcCvkKg98B5cf6INo2hIqFcGnUMR3y0rVwC3k7M0kcdPbKCf5Zo8xa TMQKGS4eBg30klZSw3f8Q+UTERbJpuLJ/wl+QS3tWd8RbNBcJcbwZ4Tk1TNnTPtUcrd1 BZNp5DWS6BiaU79dZHjfK0sBE8z+bDT+eKNspfLo765fCIgtvVQhsJUUTUsldQfCkrG2 R+1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@igel-co-jp.20210112.gappssmtp.com header.s=20210112 header.b=0Xxtxdxu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 1si1239038ejb.76.2021.09.28.21.24.19; Tue, 28 Sep 2021 21:24:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@igel-co-jp.20210112.gappssmtp.com header.s=20210112 header.b=0Xxtxdxu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243975AbhI2EVl (ORCPT + 99 others); Wed, 29 Sep 2021 00:21:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243996AbhI2EVQ (ORCPT ); Wed, 29 Sep 2021 00:21:16 -0400 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0D28C061745 for ; Tue, 28 Sep 2021 21:19:33 -0700 (PDT) Received: by mail-ot1-x32f.google.com with SMTP id x33-20020a9d37a4000000b0054733a85462so1277883otb.10 for ; Tue, 28 Sep 2021 21:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=igel-co-jp.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wGElA4q7plQa8+h675MjByrmxCgr2foTglcxGJwe7eQ=; b=0XxtxdxuxQsaGrYghSepZmEg+mymN7mpDodcuer1ZfBwLDWdMD6Pjr69uI89F3um/4 7CJ6XBqNgPlmiDn+FI+rG1zutNpgRyuU7blXeuqQPEfkeRojjbHvYChgY9aR7zdN5JNM gMvnoxk+mcSqrinmr1183bzXHlGGCFiCOzo1HSmuYAHq69Xd9vSlIPYnZs/66gVwAHBM VZFsnfKqx0jK9QdbML9HhOzaVOHbjQiVr1RGTRMox7Ngzhv84M98P2Wl4ginPQM+QwQ5 4zmFID1o+X1fKzOBWmLNB4MvW0Uj31v/0pnfM2u22sqZ55PdC1+/NGxw4gHpbFgXx+UA rosg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wGElA4q7plQa8+h675MjByrmxCgr2foTglcxGJwe7eQ=; b=vpi+u4y+BE8Y9J3+K4ZujujGElGVHGQ0XTK3M4D8E3f3bonkNbfn7IP5/ToxkQ2loj aiX/D/7ZuVmIgleYQUEugOlAOznuuQQtyr0S/GY7dxZi5N2twawDJ6/iRyCOnUHaP91u MhqqDeyakvKHZCnPraCadvo30M/JcqZdfe59+wppEcZuWfOUlq+d0LVJXXJROI060jqj nYVZDZ1PB9jupf7qjAWsM7ZdfwTxUZgjOOBNzE8D4fzs8bdBaFQi+LPu5EwxjUytrrCL fzERHktYiE6vE3XuTc7vtyiJq8xMkanaa88WDCZwgMyKVeFArwPPdtz/TcPZO2Wgtohx Qtvg== X-Gm-Message-State: AOAM533EEnN5SsSZNLW7I4Tibx3VkPAuafz+pZhnRVvFX/pWDtPUYRcV AHJAvnsyVbO4NZcHncL1fLBlJA== X-Received: by 2002:a9d:7116:: with SMTP id n22mr8531664otj.56.1632889173299; Tue, 28 Sep 2021 21:19:33 -0700 (PDT) Received: from tyrell.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id p2sm240861ooe.34.2021.09.28.21.19.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Sep 2021 21:19:32 -0700 (PDT) From: Shunsuke Mie To: Zhu Yanjun Cc: Shunsuke Mie , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Daniel Vetter , Doug Ledford , Jason Gunthorpe , Jianxin Xiong , Leon Romanovsky , Maor Gottlieb , Sean Hefty , Sumit Semwal , dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, dhobsong@igel.co.jp, taki@igel.co.jp, etom@igel.co.jp Subject: [RFC PATCH v2 2/2] RDMA/rxe: Add dma-buf support Date: Wed, 29 Sep 2021 13:19:05 +0900 Message-Id: <20210929041905.126454-3-mie@igel.co.jp> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210929041905.126454-1-mie@igel.co.jp> References: <20210929041905.126454-1-mie@igel.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement a ib device operation ‘reg_user_mr_dmabuf’. Generate a rxe_map from the memory space linked the passed dma-buf. Signed-off-by: Shunsuke Mie --- drivers/infiniband/sw/rxe/rxe_loc.h | 2 + drivers/infiniband/sw/rxe/rxe_mr.c | 118 ++++++++++++++++++++++++++ drivers/infiniband/sw/rxe/rxe_verbs.c | 34 ++++++++ drivers/infiniband/sw/rxe/rxe_verbs.h | 2 + 4 files changed, 156 insertions(+) diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h index 1ca43b859d80..8bc19ea1a376 100644 --- a/drivers/infiniband/sw/rxe/rxe_loc.h +++ b/drivers/infiniband/sw/rxe/rxe_loc.h @@ -75,6 +75,8 @@ u8 rxe_get_next_key(u32 last_key); void rxe_mr_init_dma(struct rxe_pd *pd, int access, struct rxe_mr *mr); int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova, int access, struct rxe_mr *mr); +int rxe_mr_dmabuf_init_user(struct rxe_pd *pd, int fd, u64 start, u64 length, + u64 iova, int access, struct rxe_mr *mr); int rxe_mr_init_fast(struct rxe_pd *pd, int max_pages, struct rxe_mr *mr); int rxe_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length, enum rxe_mr_copy_dir dir); diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c index 53271df10e47..af6ef671c3a5 100644 --- a/drivers/infiniband/sw/rxe/rxe_mr.c +++ b/drivers/infiniband/sw/rxe/rxe_mr.c @@ -4,6 +4,7 @@ * Copyright (c) 2015 System Fabric Works, Inc. All rights reserved. */ +#include #include "rxe.h" #include "rxe_loc.h" @@ -245,6 +246,120 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova, return err; } +static int rxe_map_dmabuf_mr(struct rxe_mr *mr, + struct ib_umem_dmabuf *umem_dmabuf) +{ + struct rxe_map_set *set; + struct rxe_phys_buf *buf = NULL; + struct rxe_map **map; + void *vaddr, *vaddr_end; + int num_buf = 0; + int err; + size_t remain; + + mr->dmabuf_map = kzalloc(sizeof &mr->dmabuf_map, GFP_KERNEL); + if (!mr->dmabuf_map) { + err = -ENOMEM; + goto err_out; + } + + err = dma_buf_vmap(umem_dmabuf->dmabuf, mr->dmabuf_map); + if (err) + goto err_free_dmabuf_map; + + set = mr->cur_map_set; + set->page_shift = PAGE_SHIFT; + set->page_mask = PAGE_SIZE - 1; + + map = set->map; + buf = map[0]->buf; + + vaddr = mr->dmabuf_map->vaddr; + vaddr_end = vaddr + umem_dmabuf->dmabuf->size; + remain = umem_dmabuf->dmabuf->size; + + for (; remain; vaddr += PAGE_SIZE) { + if (num_buf >= RXE_BUF_PER_MAP) { + map++; + buf = map[0]->buf; + num_buf = 0; + } + + buf->addr = (uintptr_t)vaddr; + if (remain >= PAGE_SIZE) + buf->size = PAGE_SIZE; + else + buf->size = remain; + remain -= buf->size; + + num_buf++; + buf++; + } + + return 0; + +err_free_dmabuf_map: + kfree(mr->dmabuf_map); +err_out: + return err; +} + +static void rxe_unmap_dmabuf_mr(struct rxe_mr *mr) +{ + struct ib_umem_dmabuf *umem_dmabuf = to_ib_umem_dmabuf(mr->umem); + + dma_buf_vunmap(umem_dmabuf->dmabuf, mr->dmabuf_map); + kfree(mr->dmabuf_map); +} + +int rxe_mr_dmabuf_init_user(struct rxe_pd *pd, int fd, u64 start, u64 length, + u64 iova, int access, struct rxe_mr *mr) +{ + struct ib_umem_dmabuf *umem_dmabuf; + struct rxe_map_set *set; + int err; + + umem_dmabuf = ib_umem_dmabuf_get(pd->ibpd.device, start, length, fd, + access, NULL); + if (IS_ERR(umem_dmabuf)) { + err = PTR_ERR(umem_dmabuf); + goto err_out; + } + + rxe_mr_init(access, mr); + + err = rxe_mr_alloc(mr, ib_umem_num_pages(&umem_dmabuf->umem), 0); + if (err) { + pr_warn("%s: Unable to allocate memory for map\n", __func__); + goto err_release_umem; + } + + mr->ibmr.pd = &pd->ibpd; + mr->umem = &umem_dmabuf->umem; + mr->access = access; + mr->state = RXE_MR_STATE_VALID; + mr->type = IB_MR_TYPE_USER; + + set = mr->cur_map_set; + set->length = length; + set->iova = iova; + set->va = start; + set->offset = ib_umem_offset(mr->umem); + + err = rxe_map_dmabuf_mr(mr, umem_dmabuf); + if (err) + goto err_free_map_set; + + return 0; + +err_free_map_set: + rxe_mr_free_map_set(mr->num_map, mr->cur_map_set); +err_release_umem: + ib_umem_release(&umem_dmabuf->umem); +err_out: + return err; +} + int rxe_mr_init_fast(struct rxe_pd *pd, int max_pages, struct rxe_mr *mr) { int err; @@ -703,6 +818,9 @@ void rxe_mr_cleanup(struct rxe_pool_entry *arg) { struct rxe_mr *mr = container_of(arg, typeof(*mr), pelem); + if (mr->umem && mr->umem->is_dmabuf) + rxe_unmap_dmabuf_mr(mr); + ib_umem_release(mr->umem); if (mr->cur_map_set) diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c index 9d0bb9aa7514..6191bb4f434d 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.c +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c @@ -916,6 +916,39 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd, return ERR_PTR(err); } +static struct ib_mr *rxe_reg_user_mr_dmabuf(struct ib_pd *ibpd, u64 start, + u64 length, u64 iova, int fd, + int access, struct ib_udata *udata) +{ + int err; + struct rxe_dev *rxe = to_rdev(ibpd->device); + struct rxe_pd *pd = to_rpd(ibpd); + struct rxe_mr *mr; + + mr = rxe_alloc(&rxe->mr_pool); + if (!mr) { + err = -ENOMEM; + goto err2; + } + + rxe_add_index(mr); + + rxe_add_ref(pd); + + err = rxe_mr_dmabuf_init_user(pd, fd, start, length, iova, access, mr); + if (err) + goto err3; + + return &mr->ibmr; + +err3: + rxe_drop_ref(pd); + rxe_drop_index(mr); + rxe_drop_ref(mr); +err2: + return ERR_PTR(err); +} + static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type, u32 max_num_sg) { @@ -1081,6 +1114,7 @@ static const struct ib_device_ops rxe_dev_ops = { .query_qp = rxe_query_qp, .query_srq = rxe_query_srq, .reg_user_mr = rxe_reg_user_mr, + .reg_user_mr_dmabuf = rxe_reg_user_mr_dmabuf, .req_notify_cq = rxe_req_notify_cq, .resize_cq = rxe_resize_cq, diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/rxe/rxe_verbs.h index c807639435eb..0aa95ab06b6e 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.h +++ b/drivers/infiniband/sw/rxe/rxe_verbs.h @@ -334,6 +334,8 @@ struct rxe_mr { struct rxe_map_set *cur_map_set; struct rxe_map_set *next_map_set; + + struct dma_buf_map *dmabuf_map; }; enum rxe_mw_state { -- 2.17.1