From patchwork Fri Apr 18 06:47:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 14056839 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 AA4D7C369AB for ; Fri, 18 Apr 2025 06:48:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 08D702800C0; Fri, 18 Apr 2025 02:48:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F31012800BD; Fri, 18 Apr 2025 02:48:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D5ADB2800C0; Fri, 18 Apr 2025 02:48:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B02092800BD for ; Fri, 18 Apr 2025 02:48:54 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 60B1AC1385 for ; Fri, 18 Apr 2025 06:48:55 +0000 (UTC) X-FDA: 83346237030.10.0DAF117 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf01.hostedemail.com (Postfix) with ESMTP id 9606440007 for ; Fri, 18 Apr 2025 06:48:53 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="KWFj+/vO"; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of leon@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744958933; a=rsa-sha256; cv=none; b=HRZHcZNn3tBG6c5PR9rxiOg6t2HDT9GbGWCGh3E/1zLizB6j2os0osC+5JTb5eTUiVEM+a XMiALp86MT1gzYlMGxw+sScbhArq8/OrL7LiJsBPpYv7OWN7MNYRQ5DI1rbLgJ3NzdpvDo 6PWxfVtkyjXlCIu4eDX/xtVYNHoDTlk= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="KWFj+/vO"; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of leon@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744958933; 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=okhEhzVE56CtTj3ltAsQ9MV3IN/JTmI5d31cz4Y4z7I=; b=bFjoAS5f5dN4fhNih2EcLzbqssLWP+akVjRQ26bGz4dwzskeko5xZA6BDOMIw5JGOElzP5 3g8UNTGY1CI0Lx/4lyHM7ns/gaW0tJhQ6shSgeIE3IpHxqgEG+95/zjOW5sq0sZdWxVDsh rvXwYZrvkEZjz1637xWkzRcUPmdPdvI= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 5D2584A59B; Fri, 18 Apr 2025 06:48:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C53FAC4CEE2; Fri, 18 Apr 2025 06:48:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744958932; bh=KevxVIzQY6F0EnJlBlznb+1ktDGR5CAEkB/J2PsBQFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KWFj+/vOInb4BkFwMVNo03SMIwXqyVPAXT7V0xlVA5hwOkHkHH3foXrZ5AXA4Fjl+ gZyrCIGq59DPy1FnFT8zGFH2SkBIyM3021p5KU1yTgIG4UacHBts3/GeCL5uImnxVh eMIaJZF5C9mhaWM8AIsDqCVgGCgHYCKZDbZ3wpHtWyv9kMNsZsuWNOh2oJMvPBBvlO dFDWKPidKHAwWNBmhq0cq6OtE/sz58FeBWtYeuyfBdlZTYHr1AEX+NyIacs2onTivE N1FZJfRm+3wD9vB12tyDCgmQ1pIJtGSzoZv8x/8rbQS0RlZNLVnNVOUtSnpUO3alK3 7GNpLbrb9Gpdg== From: Leon Romanovsky To: Marek Szyprowski , Jens Axboe , Christoph Hellwig , Keith Busch Cc: Leon Romanovsky , Jake Edge , Jonathan Corbet , Jason Gunthorpe , Zhu Yanjun , Robin Murphy , Joerg Roedel , Will Deacon , Sagi Grimberg , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , =?utf-8?b?SsOpcsO0bWUgR2xp?= =?utf-8?b?c3Nl?= , Andrew Morton , 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, Niklas Schnelle , Chuck Lever , Luis Chamberlain , Matthew Wilcox , Dan Williams , Kanchan Joshi , Chaitanya Kulkarni Subject: [PATCH v8 14/24] RDMA/umem: Separate implicit ODP initialization from explicit ODP Date: Fri, 18 Apr 2025 09:47:44 +0300 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 9606440007 X-Stat-Signature: qmegazuzrz1j5687i7h7q5n1tmhw7c9a X-HE-Tag: 1744958933-556776 X-HE-Meta: U2FsdGVkX18nXG+ssmzgOgV/Da/4LMoiYbD/78GLpYBGROWmUbUQ2qSwOrwAYQH2Xw1hgxasow4ArsczdPiFqFSKk+YecfUjWxAa6u51HOrAglFK3WrMLHFh9yzZbT8YPN4qyfk633SLCW5itHZup0yQENURsp4Zm34hgZH6Giv4IluPqHHtTKIVpWIfF8AR/8KxlxIV7+AGunFKCJ+tmYJ1AwJWEuj2ZEUXJ9Coy/+uyARC9OUof3t7VR+2TvYD3LwkxTUu5zoK7EArb59y5lZn26QgF7XjGM/8g1iBGnidcLDWx2cAcO1xrgRSXPaHAFl27+bkF7ulDrxO/jJMKwd3DBPjrWekEDkIBAL5FMWmeBdg25O7seXFNOGB9DyOhqQSJxgF9T63dn35QPST7AXlvwB33E8AoTM8wnpB+cLPnZG6n/VTyeWUWKL5Rr3uycHCFd1e+DfL6mbOBtfhf2a4kjSWNs/u2+IzX9/xGGHdNGk13Iv1EmJloJayXrmZh6W3kDLK+5knm0uMOzHhWdgRJ6WAU7YyvbGBmg51fmXSlNI7A1LCsDfm/7jkbmE3WJFXPM4hl8HaJp8RMOQ1UjRqxRj8FORJYgMajF95E6+YB6+9IKNqGcY6sQqN1GcA4yC03Zta1eo4QiJL2IZkWmMRfxau5xG3H8L+aJX9EIb6uE21mPWXotsX8rsmOdj0hCJSplGQXivUFVGUIwkoSQIRpC+nX+XY3To4AGw/HbeUOPXd+6e+WYStBdL2X8FlIdPUpQ/SZv4ahsZDo7CSF3bMOJxU4oASa55qVdKAm/MR9AlwXnRB/BtZeNnp+fNOytn/dT+bpqvgn6Bg2f4kle+ob3ccCnNkcb1kZRpurByuYkESf1Ka1MVdW1k7oKeNpE08ZRkva8wcXMH0EOI1Q+Vza/DWbPr4ZjQEGwXc6gN5hPBPP7PeIhFJqAFZ/6J5RVDptF8dVri6iGfURY3 DCE5IaNN 4AU1/czhlH0apYJHz6pZMbUjwKaHQIcec/Atjnzh+yNyyJdlmVn4fPSsep2MWkgae7ZeanGmRJqyiz2rpC4f1qirPZX+IXGgSRIUwo61PxFXnLwPl47hdl2F0pQUUCW4squeBlY1FTsN24UN1UAeZSuZ1NL+a0RM5NpYKbB1a1zxojSN/cd1GJzCp7qGPAy+WqXLr/ga/0oWgjAoKj2aHjVaP74bbp8qt+c6s2mfBjBi7E4s= 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); }