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 A2C08C369D3 for ; Mon, 28 Apr 2025 09:23:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B0956B0031; Mon, 28 Apr 2025 05:23:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 938356B0032; Mon, 28 Apr 2025 05:23:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7620B6B007B; Mon, 28 Apr 2025 05:23:42 -0400 (EDT) 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 500C06B0031 for ; Mon, 28 Apr 2025 05:23:42 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7E0DD811B2 for ; Mon, 28 Apr 2025 09:23:43 +0000 (UTC) X-FDA: 83382915126.12.17E6159 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf10.hostedemail.com (Postfix) with ESMTP id D7040C0005 for ; Mon, 28 Apr 2025 09:23:41 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CshCyLDL; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf10.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745832221; a=rsa-sha256; cv=none; b=GksV++wkpAVq7wgm0PEBupcoJUdaqqiLpec6gIQCBEsqFUsIaRnl3Ys+kLRiL2UfV+Er5Z uBgdk1FII1GBRtYb8ddj5UCEiIByHo+KOLvEmzTsBxo6ik86MtHVL+4YpSqjRrMFaAOXOh n36wkLLxdbRgMhrbywfAqpDIt3pom/c= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CshCyLDL; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf10.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 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=1745832221; 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=Cyc4RYTwVJEqgWxolpJdIuHQ+TlMmZIPFM7/6TDA3qo=; b=2FVcu9iaPWF/ABpaQuGcoFR0/YG0YGXBMwN++CrUps5DHK1w8l3yOHVQSgr8BRgIKgGC3F Ze60wJFZv/kw/H99qyQIzC3uVhtdrlzD4OFxoST9DQ2KchtdeBf1H4Ql4OBonxfaEcg6jN LTfZsRMwBpc8pIRIuQoqGq4cL4bM5+s= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 55508A4AACF; Mon, 28 Apr 2025 09:18:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36441C4CEE9; Mon, 28 Apr 2025 09:23:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745832220; bh=xVzZEuYjMgXmdxhdT4tLYQ61KOWUbydpHLJY/2wJX2k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CshCyLDL08MB+t5tQ+3u1RLskoUp659Qjdk5H7jw4k/r+x2C++hcJ5Vt1nSb7ZO3U +SSas4L/armZLzifrw9jcpJfzWNrx38YknuiOMHG2P7Zaa7ra2svEohZSHVlr02x8z aZ3bsSdD2+vG4d2Q/SxaaGipOlDQpzU2ODxs8RtimyHJ/JQ2jByTEay9Eub68Ty+w8 4G0V4sO5gNilpnD5KlnuHNDM1FP+erHsxpnhStL+m0vSsyOGDSfZwFUwoyfPajmUiN 3Kocq6tQXP4YylGjbq9dMSNjZrDz9YgG9kg8u2LUEh8kAOMonrxc4GWJ97WOhrA710 UchdfEMlCo6mg== 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 , Jason Gunthorpe Subject: [PATCH v10 14/24] RDMA/umem: Separate implicit ODP initialization from explicit ODP Date: Mon, 28 Apr 2025 12:22:20 +0300 Message-ID: <25efd635951d87817f72220c8b38757b3e1a555a.1745831017.git.leon@kernel.org> 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-Queue-Id: D7040C0005 X-Rspamd-Server: rspam04 X-Stat-Signature: 8wmsnmq69jhms7pwfasenyh7sf8qgejo X-HE-Tag: 1745832221-882802 X-HE-Meta: U2FsdGVkX19ITYd4JVM+ZC2Vztcjli0MT3MLR/GoeCduaFa7Sy+g2X6cozunSNmROLt5pBnBeX97BYcevoCkvs5mGgMA+gXvDbosg9Kj6lO7CZZIIUrqxUhRhaLbefulESq582NXO/BkrqYLq7pTwk3oDSxIG5wtT9wPJ1fLzd+jbpY3knP3zT8bcQBFXxpSBizO5locgpcQqlux2mTOxq7JsiNE4S4KYH/FjzVUgmZo8Ydk6HtI0IvHLa0kINf8br23RNOjkKmxLyaXvKy2kH+aD2Pnsr57HLnAyrzcttRGjOj8ucS2Is9lQ7WkGRXJB5T763Gl1AkhrErNKmSqzGNdWqXf7RMnSQ4ziAWCbbDwGDFQfblEqOc2kxXB4x6K5oaLEmH52OztMkf3sejR69LnsFEsUXfW3iKL9l4VUVosMxiRpEMCeD4QF741Ri9q494KkpZEZbr85fzyc7S9E+g76UG4YNwKsA/6ESWIdzH7AWWgxER0yXKDCRplAMRYonbIuh1IS1EEqXR5PMiqien/ndWRU1tmlb3RvqCN9/zb2fDLQE+XKS4J/vn9P3fx+L/rCnpL5iIammMA7nKDa1msDkn3jnxvCtPXSAnixNY8DThscwMD5Zu68raDOW7tpr1JWmaJKmnXLxW+5p8SD6ZCNwcctxQFqcXeck+I8V3GzTVM6dmc+gisi+BiI4vFs5Uj7urq6FF368MDFoEa4ogKXZ26O5nqKq/8wHbnatHCwukl5Fjf2sJoXHPIjTdNtVUBXgVoQrxgx8HfywEJsoErJPdjHG/oJbrHT4dY4JNV/2C6beiOA2PN30RF38NVOI1JLw1BbKQqN5YKz3I0rSMCBp70aiPQXxZDXgx7gG19oPgihxZ91zB7Q4xRWn0TBEfYGT61V7kJvEVmidobv0kS3dSUgA7hNnhV6Z7B+GkXbFFVQPF9A/JB9WgjdZ02IVfOlLExp08WV5f3tcq iN3X0zJE 5Ajw/IiZU3AyZYGrvCK0zOySKs50kQAuJVcarfZrP5RQGsfE4IiWQxrj4EM12Hh4Wmm9UjbCEXu1vn3ZYd05ZgMdLmIMw/ziLHxhp44JmeF3soC42SiiJwBayTvZ9QJEqeP4sZK7D9xfsuC4OZEF2NKCQCXDEn44CxCH3EUncsNtlgpm6XGRxJNXMTzTwbOi/JudVxdi2F4j2E/3+EWp3Fjdenwm71gxJtuviPDdFlj1bsio= 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 Reviewed-by: Jason Gunthorpe 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