From mboxrd@z Thu Jan 1 00:00:00 1970 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 4E920C369D3 for ; Wed, 23 Apr 2025 08:14:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 142186B0085; Wed, 23 Apr 2025 04:14:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E7946B0088; Wed, 23 Apr 2025 04:14:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA3FB6B0089; Wed, 23 Apr 2025 04:14:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C53E26B0085 for ; Wed, 23 Apr 2025 04:14:54 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5AA2A8178D for ; Wed, 23 Apr 2025 08:14:55 +0000 (UTC) X-FDA: 83364597750.06.9F4A48D Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf13.hostedemail.com (Postfix) with ESMTP id C8A042000B for ; Wed, 23 Apr 2025 08:14:53 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qE+s9EHz; spf=pass (imf13.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=1745396093; 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=9/0KKy/pat1VwXUs3R5IfTaisirVVXb3RMPxVS9Acg0=; b=2P2IfKt0B4qryXHiSO4SCyLBrBkGr/eRQ3/SbhK4i6XS1Aa/Fnv+eLR3RmFvPQQ7VlcGi8 SA92TIcEmFmXTJzxF3HB35vRtRFbWaIzjqFFIrgs2Rjc/hFtQ0zUCLgoIKTYbxPjGd/Aos fhKJajjRoupI54i718HvJ71m0xDUD0E= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qE+s9EHz; spf=pass (imf13.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=1745396093; a=rsa-sha256; cv=none; b=BhHjP27Wj7FELkVCd487fwrYpsoyl56WozXLtTOCV+Xs7wWd7SWNR3+wbI/qjQYHcDX00M ST9bUnllONga4OHfksyjEHyTEOYCFt5zMb+gWngrwFrkb5Sz5nxn7lc9sZ2+PZrPXwWXGN YcCfLuWSN+glBjvL3Rdc2oJ+0+Dgh5w= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 2C309A4C265; Wed, 23 Apr 2025 08:09:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11E5CC4CEE2; Wed, 23 Apr 2025 08:14:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745396092; bh=Z+8b4NYee1RUbpzKZ39zN1WZWDjcticSFOudJv0T43g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qE+s9EHzPEDuLSGuHtZ28CtFY2uP1N7/71Y4qUuPA1VYvkHQi1X+QIdGvBh1kufix fyFBxbj8RS7eYnjPsDL0TULXuy3CIGPdwZinB3JLbx7zwzwCdkWGBEdJb4rhp/mmlF ZuZQZWT0dUpbmDgvKrxUcQyTBH0c17V53Mc/U4iAdtOHRaot1vxpB8jMvVzxUs7QfG UNkbegqVsrxw8/dJf9Z9OhMKsfazIMs85/DY+x5vhf90LKB8C8VfJHyBOQRu8OfoAk RpgqK8RnCT7JmT1h6krz1xV5dJzRsOL4/Www3v4q0jwuz9VZy6JbpltYmdVtDzX+T5 1cx0j+QaWq69A== 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?q?J=C3=A9r=C3=B4me=20Glisse?= , 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 v9 14/24] RDMA/umem: Separate implicit ODP initialization from explicit ODP Date: Wed, 23 Apr 2025 11:13:05 +0300 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: C8A042000B X-Stat-Signature: amddfdng61uwdo8y5j9e9p4cfq1n1ziw X-HE-Tag: 1745396093-212958 X-HE-Meta: U2FsdGVkX1/PjVl1A9iTA2xmAmLuNY6pXYnsHaoV6pOBM0XwkTG4SaAoDoX4xmslG/xw3SDct/k5EZrmrNXaKQxhIGfiOCsm3FuXRYSiFKZY526ktrFvLA31pVmo1ZYduO96zvHG4HLB+UiTh7bC9dE9KuEaWP7H4+PcwGoleHJKH6rGFbmL9HkhUEvmX3vorQxB/ilexLlxIV+Nnbgwh+g32C5Y6FoxiVGh9E26rJf+4PAdf5tpzVTdowDo128LH7uJ8F4d98EH33UjVFNDmyUsSlHz7Dz7Xh0mJHXILKy7+pwGUfazuJY5usis1FgxQvRug3skCRxAAaBHS+EMMJCFu+T/gEUVxlK+WRKwWuBo1K24XnDnaizYkxLXGMW8dxvZ259+5ppcI6rfRCMR043ug/AFDKQQWxviCfJ9SU7QkTQxaS81MchYUjZxRwLfqr1kskiGXykfCpX4nUXWtOPr537+c7IlQdo7OV1uQJ8omue+V7SbnvFPRv3Oq9WAdDtBdcwjD9gkBMJlvhsf3Rru3qstWj7oEzU+UsO3XqXXB/tIXwA7nvvPH3qQKtX9Y3RAE0A/d+XzOqJ0NdTJdZ9rR1ZH3dv/QdZLIBGdF2Yt6e5YNS5GMoiP+EQT8mSVJ/EIR+CEYSuJaRbkz+Fwh4lxNMMwYsFyxwbSVwg2gQlJp1bc0m8gus5s4VZ1gluC/JclmNg7/Ht7VtJscrogyZn1z14azGBDHVpN2f6vkHYMmV+UuUZQJfXVrYvxha2c8DvBAwHoNMsGi7fFdulziiNshpqakTuR8wg/QoNkEcfQ0dZ77O7dk3eDyHRPHSqCcqWLKpJ5f5ZgnrSW+Cueh9q/OB1vP5vaqRxNNtsnonv0aLcaDWY+KG+LbbFnEWHxGKOirbwOOSxfg9OOelR2/IUGurtfO5JTbIA8WSbc7PIRo8lZ6fTDm1laIAZnwpErPaKndnLTja9mVio5rr4 mz87F+RU gujB23ojQ5O4gbny0Ek+Jpr3HYn4aSyUZlk2rDCwe4Ts8y4UL427zehgCc+fcrO4TZwsNQft997bKM35k86a+FFIxOfDmTjTDTLk/lDm/ouR+8BLNmErvk3GMuQYFPQ8fRHFXryOz7NMwbyuTWUQLXRLhuDVacJ5IiuzmoP6OaadSjIes9InchKBEQPcABvCE2SZ0/8+ZdNiRox+LMoH6eS5fYToVW90TAK+kf2vRkltde9k= 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. Tested-by: Jens Axboe 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); } -- 2.49.0