From patchwork Wed Feb 5 14:40:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13961196 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA008C02194 for ; Wed, 5 Feb 2025 14:42:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D513280015; Wed, 5 Feb 2025 09:42:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 283E1280013; Wed, 5 Feb 2025 09:42:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E060280015; Wed, 5 Feb 2025 09:42:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id DECBA280013 for ; Wed, 5 Feb 2025 09:42:07 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9E889C0D22 for ; Wed, 5 Feb 2025 14:42:07 +0000 (UTC) X-FDA: 83086155894.03.1DA3F87 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf19.hostedemail.com (Postfix) with ESMTP id 0765A1A0006 for ; Wed, 5 Feb 2025 14:42:05 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=W2YNA18v; spf=pass (imf19.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738766526; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8jc4NUQPjjS4VfvHj2jV5GAgx18ShSuYw6TOIM4M5Bc=; b=IlP5TAOV2rsKR3fIw0e+eDNRSj+OwN8Flu9/XC+1Vu038dBl/mNdwFtj8YmIOaDQSr06Yk /id6+anp/46OPacs7vLDGNq6PP0c3FaajRE0j/XQAn2DnVIzoNDMhfjnj4UkiEV43/jKHI EqoFo87VsE2QSmUAkz2hvwaQYfU25lE= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=W2YNA18v; spf=pass (imf19.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738766526; a=rsa-sha256; cv=none; b=c1a9bRi5uF320jkJHLKUJxnDIyZ64WkhacmeSx/iSs52d5ELN0GZgtQzmZ9qRc0efFeyAa eiBsgUYXSJAnJKT5qTFU/pHbDR43Rq3uLk0ipgA5iRrBaBJnkaA1HYImSIxqnJfWTkofS3 7WBsGgjENLX8knpejzU38qDfSbofcXE= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 6C4A9A436C4; Wed, 5 Feb 2025 14:40:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6BEBAC4CED1; Wed, 5 Feb 2025 14:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738766525; bh=7aNBsgnJ1xpYJupIDdeW59JsJ73w9EGqwdcut5LVDS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W2YNA18v52GskOrMKLkrTwzfQn8Km0PjGIUu87kMojGGjoog/10G95TBZ6vnkCJOA YBN2VL9nccEhcQB+VjXd8HFCxCAmenqSYB1f1SLAze41y9IxYfGcUyvzovhFkucE4f p08Hgr2aFu7TPrkMKUHPLcHRhBWfTuIFNxLXuqn9BzHXEN+JSM2GV9t331JEbLcVO1 GSPh9+fHX0PFZ54Xj0VKJbbudJl6ZriCoRRfT0mEAv2qtfV12c5C2YyCHBJpXp/Avp 6rDEaptuPvVVvZW3SFE4g/gPs6SQsVGFwUV+bcIiAAsYiTd1k+zUacXb4F76FSGdZJ rbwrAoMwir3bw== From: Leon Romanovsky To: Christoph Hellwig , Jason Gunthorpe , Robin Murphy Cc: Leon Romanovsky , Jens Axboe , Joerg Roedel , Will Deacon , Sagi Grimberg , Keith Busch , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , Marek Szyprowski , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , Andrew Morton , Jonathan Corbet , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-rdma@vger.kernel.org, iommu@lists.linux.dev, linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, Randy Dunlap Subject: [PATCH v7 14/17] RDMA/umem: Separate implicit ODP initialization from explicit ODP Date: Wed, 5 Feb 2025 16:40:34 +0200 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 0765A1A0006 X-Stat-Signature: w773piwwwfo91drthuqkb68o4641k6i4 X-Rspam-User: X-HE-Tag: 1738766525-200982 X-HE-Meta: U2FsdGVkX19btUFSku7Uoig+P+EkcorrR2tVds4EeKQCd584P4bYKiubALmc3YctYM1qxX3sUSdesCjAUXOTkhURvG83FRGu+PFEhOB/2aY+ZKs57xBIOsf/YzSxi6j0FWVXSf72xi9wvAUsaQ2yfAPlI3odopb6uffNH276X58h0dtjbu3eeuUiCdCuohVd2ePisCYGLst0ESFm0yy42p03fhsXwGp6vys0gQq7p+TQ4/KOaBb9FmSEJarWPJeF/GkKneT0qvQGKBpPaCcsWm6tOxY84VtstY+Gbf/WRfvxmyiBRuYyMggXjLyPMF92vMxfb6RaHkZr3aQrLjVv49zKD+N1WZx31X9SMDM5FZ1HL1jw9wfFkdycjadS7E0buv6MsWntxE08d7N+tpOM3MqvwIOoAwngLPzJnvnV8JQ5OBArOj+bQrgWOMwoCnf3w24Wf/MIH+uzrcQk5KeJRq0G2JP2/CifJJepz6ePB5JeDjIH0BSUvGLmfLXhQo0tVsVEMUp4M6yjrS372BnABQ2BembP/F5B2jH28uzKzZIgcTwuI5WRT/96S7thaEi76OFyZYtUpndCJGAVwkBE5HbitZ2m0zyAb2PQ56Bnj6EVoXpsaWWGvEWEHYhuo1MwTBiJOyduehCysLESTK7PkCS1o6EVkzDeLWfWl1VVaKWLnrLrWLKpzFTUOU3u5WmMJb8I4Qbza8l1GMHNdjy5NOq8iQO0icfsSqXdowQV+cAUXfpDLqeZYGJUXdGzq/TGRjTKQMGlMME64ZQAPL39NqiWhoBIr7/6yU6T9CbQ7opzmLKESBjSn3Z7Ux/5oK290P6YDBwQ03Cc3cKa64A2ZN/uqGRrrd0IJAHvBjFG2GhBX3cryoaxI10SBrOlUM9aBZWl2S1ob01KP/JZlGweMXDG5Qtg5pBpdw3H7S+PwlmDPTnfCE0dqVFaeasyHW5Dxai/dfaDZwKofd/DdNt 4ncOAp11 bavxPlVZGxYQpGqDNjSYZlxHWLLj700sTTc+t8n4d/gUVB4K430ccN/FdiiCOebDhVQfP+pEb4OxS+6jaj2xiEI3y/PFKTIecOX5Ot/p+Wz03GnzlnjBAMFhl/lUFxdxmTRoWUVkynfgiWzi3XSK96mQc8l0dUwS5WZywwIgwMq6fZLFBAVWYqKM0WlEqaW60U7+z X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Leon Romanovsky Create separate functions for the implicit ODP initialization which is different from the explicit ODP initialization. Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/umem_odp.c | 91 +++++++++++++++--------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c index 30cd8f353476..51d518989914 100644 --- a/drivers/infiniband/core/umem_odp.c +++ b/drivers/infiniband/core/umem_odp.c @@ -48,41 +48,44 @@ #include "uverbs.h" -static inline int ib_init_umem_odp(struct ib_umem_odp *umem_odp, - const struct mmu_interval_notifier_ops *ops) +static void ib_init_umem_implicit_odp(struct ib_umem_odp *umem_odp) +{ + umem_odp->is_implicit_odp = 1; + umem_odp->umem.is_odp = 1; + mutex_init(&umem_odp->umem_mutex); +} + +static int ib_init_umem_odp(struct ib_umem_odp *umem_odp, + const struct mmu_interval_notifier_ops *ops) { struct ib_device *dev = umem_odp->umem.ibdev; + size_t page_size = 1UL << umem_odp->page_shift; + unsigned long start; + unsigned long end; int ret; umem_odp->umem.is_odp = 1; mutex_init(&umem_odp->umem_mutex); - if (!umem_odp->is_implicit_odp) { - size_t page_size = 1UL << umem_odp->page_shift; - unsigned long start; - unsigned long end; - - start = ALIGN_DOWN(umem_odp->umem.address, page_size); - if (check_add_overflow(umem_odp->umem.address, - (unsigned long)umem_odp->umem.length, - &end)) - return -EOVERFLOW; - end = ALIGN(end, page_size); - if (unlikely(end < page_size)) - return -EOVERFLOW; - - ret = hmm_dma_map_alloc(dev->dma_device, &umem_odp->map, - (end - start) >> PAGE_SHIFT, - 1 << umem_odp->page_shift); - if (ret) - return ret; - - ret = mmu_interval_notifier_insert(&umem_odp->notifier, - umem_odp->umem.owning_mm, - start, end - start, ops); - if (ret) - goto out_free_map; - } + start = ALIGN_DOWN(umem_odp->umem.address, page_size); + if (check_add_overflow(umem_odp->umem.address, + (unsigned long)umem_odp->umem.length, &end)) + return -EOVERFLOW; + end = ALIGN(end, page_size); + if (unlikely(end < page_size)) + return -EOVERFLOW; + + ret = hmm_dma_map_alloc(dev->dma_device, &umem_odp->map, + (end - start) >> PAGE_SHIFT, + 1 << umem_odp->page_shift); + if (ret) + return ret; + + ret = mmu_interval_notifier_insert(&umem_odp->notifier, + umem_odp->umem.owning_mm, start, + end - start, ops); + if (ret) + goto out_free_map; return 0; @@ -106,7 +109,6 @@ struct ib_umem_odp *ib_umem_odp_alloc_implicit(struct ib_device *device, { struct ib_umem *umem; struct ib_umem_odp *umem_odp; - int ret; if (access & IB_ACCESS_HUGETLB) return ERR_PTR(-EINVAL); @@ -118,16 +120,10 @@ struct ib_umem_odp *ib_umem_odp_alloc_implicit(struct ib_device *device, umem->ibdev = device; umem->writable = ib_access_writable(access); umem->owning_mm = current->mm; - umem_odp->is_implicit_odp = 1; umem_odp->page_shift = PAGE_SHIFT; umem_odp->tgid = get_task_pid(current->group_leader, PIDTYPE_PID); - ret = ib_init_umem_odp(umem_odp, NULL); - if (ret) { - put_pid(umem_odp->tgid); - kfree(umem_odp); - return ERR_PTR(ret); - } + ib_init_umem_implicit_odp(umem_odp); return umem_odp; } EXPORT_SYMBOL(ib_umem_odp_alloc_implicit); @@ -248,7 +244,7 @@ struct ib_umem_odp *ib_umem_odp_get(struct ib_device *device, } EXPORT_SYMBOL(ib_umem_odp_get); -void ib_umem_odp_release(struct ib_umem_odp *umem_odp) +static void ib_umem_odp_free(struct ib_umem_odp *umem_odp) { struct ib_device *dev = umem_odp->umem.ibdev; @@ -258,14 +254,19 @@ void ib_umem_odp_release(struct ib_umem_odp *umem_odp) * It is the driver's responsibility to ensure, before calling us, * that the hardware will not attempt to access the MR any more. */ - if (!umem_odp->is_implicit_odp) { - mutex_lock(&umem_odp->umem_mutex); - ib_umem_odp_unmap_dma_pages(umem_odp, ib_umem_start(umem_odp), - ib_umem_end(umem_odp)); - mutex_unlock(&umem_odp->umem_mutex); - mmu_interval_notifier_remove(&umem_odp->notifier); - hmm_dma_map_free(dev->dma_device, &umem_odp->map); - } + mutex_lock(&umem_odp->umem_mutex); + ib_umem_odp_unmap_dma_pages(umem_odp, ib_umem_start(umem_odp), + ib_umem_end(umem_odp)); + mutex_unlock(&umem_odp->umem_mutex); + mmu_interval_notifier_remove(&umem_odp->notifier); + hmm_dma_map_free(dev->dma_device, &umem_odp->map); +} + +void ib_umem_odp_release(struct ib_umem_odp *umem_odp) +{ + if (!umem_odp->is_implicit_odp) + ib_umem_odp_free(umem_odp); + put_pid(umem_odp->tgid); kfree(umem_odp); }