From patchwork Tue Mar 5 11:18:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13582156 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 91B50C54798 for ; Tue, 5 Mar 2024 11:19:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C351B6B00C6; Tue, 5 Mar 2024 06:19:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BBF096B00C9; Tue, 5 Mar 2024 06:19:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A10CD6B00CA; Tue, 5 Mar 2024 06:19:25 -0500 (EST) 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 86F816B00C6 for ; Tue, 5 Mar 2024 06:19:25 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 64006160E0F for ; Tue, 5 Mar 2024 11:19:25 +0000 (UTC) X-FDA: 81862739490.07.F100BA8 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf22.hostedemail.com (Postfix) with ESMTP id DB6EEC001D for ; Tue, 5 Mar 2024 11:19:23 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=caYziKGN; spf=pass (imf22.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709637564; 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=zYSEuAz/VcQQ9oYOdYsxLecJdgLxoOHzBKYScKbWY7E=; b=HZ/zHT997uz1dkofe/9v9S82jZBT6ayUBET3n9zsgih3fS+eke4DWEVq4J5xzry4P8SxKf PV1Efxnjt6fwIvmm0xcgypL9+3iz9O+Afy1AnT/NYZi4YnF6dMWu93CqYS1idejswfftPB 7vjQPB0f/dOvWZ0lOr2NupG6sPPdb2E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709637564; a=rsa-sha256; cv=none; b=dHiU7j0pr7mYAQ/ecvNpFlhxzXYwrwJSXNax5tw/KPSklyy2H/XjYDYHHMDaD6SU2iWJmz c5J3br/ji8PhPktFLYwHtYH9I0ReEBLqpAOmPgvYUpcW5w/Zrng7c4ZXMdnEWKVrZh6X+J NsB2AR0OyzRyhn2aXRjOqh7zfjZb2k0= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=caYziKGN; spf=pass (imf22.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id E9AC561386; Tue, 5 Mar 2024 11:19:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFF43C433F1; Tue, 5 Mar 2024 11:19:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709637562; bh=E8ahaIx2eHfPJk0G81HhbupoEvLGKO0ealmbIxFQ2TY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=caYziKGN4nQ6kN+9eq9OdBuTlgubm0Pb0jxPUg1nvKbDYZ7pFGIzeYrAmlE6IxeVv 746C+LqlVHPQ4dDcVQlVgnA2EHmFaCDoMqB8C5Q3zAXCesOehVRaHHoJvjmHc8io+k obH2BT5XHaaCbjd0RRi0CnpJ0GsTLZmOM8Vs7UUadTlXpFB9Su+dS65MTkhFtRA1TV uwDMsDHNaOVKiuMmBctORC3dngSDNkvdEz9cizg0F/CI1eZqzIjMskfyTBmd3Z/pDN Z1OLKXLVUURP5juEVvIRb6GwritonO9eAzr+ppm65LjXs9YffyvBUxqeu9hjdFCa+0 wMe/HvMTuqPEQ== From: Leon Romanovsky To: Christoph Hellwig , Robin Murphy , Marek Szyprowski , Joerg Roedel , Will Deacon , Jason Gunthorpe , Chaitanya Kulkarni Cc: Leon Romanovsky , Jonathan Corbet , Jens Axboe , Keith Busch , Sagi Grimberg , 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, kvm@vger.kernel.org, linux-mm@kvack.org, Bart Van Assche , Damien Le Moal , Amir Goldstein , "josef@toxicpanda.com" , "Martin K. Petersen" , "daniel@iogearbox.net" , Dan Williams , "jack@suse.com" , Zhu Yanjun Subject: [RFC RESEND 07/16] RDMA/umem: Preallocate and cache IOVA for UMEM ODP Date: Tue, 5 Mar 2024 13:18:38 +0200 Message-ID: <47cc27fbaf9f4bd19edbcaac380bdd9684c5d12f.1709635535.git.leon@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: DB6EEC001D X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 5szqj67ciwostpj99d6aw9o6aq6eicdt X-HE-Tag: 1709637563-176296 X-HE-Meta: U2FsdGVkX1+TS0u3gIECp5kR7OoiL5Yf+AKkV0zbQEklse+4tmEd+JIYugHEw7NWwncEeL+lDLkB1MyIflCDEB6EZA8artbjXVibbDqANT4undjMtOeXthdtsBjBEiHMlXbCB5SbieN3D+nTPLPIuDuGVRvAxTQmQb5e8y2c4iKQM1Vp6bj4HSC5S0q9xwtTDl39AaTUhWQ4LlN7XcsEW17GDo41Bs5nYSE1hA3Z1WfWN13NBYXMqAV51skieQ/GJZQY6HwRHKi48UeN2PNFKLFoJOikS2QkrvzCPekz+Z1yX8a08UwT4x4TuOS0yyG+90rNzeR97qIo2ohU2Mz/Jg76UubxnzAm8NPz0pjHPWtVkLoH84oSg0Ssb6emUJ33N4AtkG42Vhvz7wnxtc/76kEFuQuIYdPZGQzhxj+XrFvGImQFwjFUgDfpXf0PsNoe3zKiBKChnBvDHSzmT5vpiC4QMj1OI895XYvtGB5FuDreWV5zpozaMCiHa421lggvcbv15Z2c0dnE+wkSesCEGRNuIa0ocAmlXzPDINjGoqs/1ttLhCSSNqCd5Rk9qhXjjzBh3WKR8V8tIkWAFXMHUR+21deBIka/ywRr8Cb5ZGe35qtFz8MnYhZku24UycVZ3hhZshwtWUwSPsCl4NmZYbEcPt1rJxr3x3QJ2JrETbFqjMm8o2uPDgsBK+bpYBGaF9YKntTyjOzIVNQXOz+ufF4VIPg8rNEGYDnmYjoM4dMJPHcDM5rHjPMrEHB/tMLhaXeA0C2xwKVwuvyf+AD8Kuivv7TuEcK5ttCvoQLwMDfMWYaDCxLSarLPmfS/ieP7AWDVXiNIQqDZ06G4q9hMoItMCJPmV5OW1/IWg7EFU0m/0URAfYXF0YbaNS69Tik9Q83Zw+c3gCRrTUhQQSzKlJvw+vteSlOrb5y4WOUDw2hw7ftHWnOOilLLbg7EM3yXxsfh8ICGHQTS1F+VdcI 2omCOPb5 +jRUs 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 As a preparation to provide two step interface to map pages, preallocate IOVA when UMEM is initialized. Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/umem_odp.c | 16 +++++++++++++++- include/rdma/ib_umem_odp.h | 1 + include/rdma/ib_verbs.h | 18 ++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c index e9fa22d31c23..f69d1233dc82 100644 --- a/drivers/infiniband/core/umem_odp.c +++ b/drivers/infiniband/core/umem_odp.c @@ -50,6 +50,7 @@ static inline 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; int ret; umem_odp->umem.is_odp = 1; @@ -87,15 +88,25 @@ static inline int ib_init_umem_odp(struct ib_umem_odp *umem_odp, goto out_pfn_list; } + umem_odp->iova.dev = dev->dma_device; + umem_odp->iova.size = end - start; + umem_odp->iova.dir = DMA_BIDIRECTIONAL; + ret = ib_dma_alloc_iova(dev, &umem_odp->iova); + if (ret) + goto out_dma_list; + + ret = mmu_interval_notifier_insert(&umem_odp->notifier, umem_odp->umem.owning_mm, start, end - start, ops); if (ret) - goto out_dma_list; + goto out_free_iova; } return 0; +out_free_iova: + ib_dma_free_iova(dev, &umem_odp->iova); out_dma_list: kvfree(umem_odp->dma_list); out_pfn_list: @@ -262,6 +273,8 @@ EXPORT_SYMBOL(ib_umem_odp_get); void ib_umem_odp_release(struct ib_umem_odp *umem_odp) { + struct ib_device *dev = umem_odp->umem.ibdev; + /* * Ensure that no more pages are mapped in the umem. * @@ -274,6 +287,7 @@ void ib_umem_odp_release(struct ib_umem_odp *umem_odp) ib_umem_end(umem_odp)); mutex_unlock(&umem_odp->umem_mutex); mmu_interval_notifier_remove(&umem_odp->notifier); + ib_dma_free_iova(dev, &umem_odp->iova); kvfree(umem_odp->dma_list); kvfree(umem_odp->pfn_list); } diff --git a/include/rdma/ib_umem_odp.h b/include/rdma/ib_umem_odp.h index 0844c1d05ac6..bb2d7f2a5b04 100644 --- a/include/rdma/ib_umem_odp.h +++ b/include/rdma/ib_umem_odp.h @@ -23,6 +23,7 @@ struct ib_umem_odp { * See ODP_READ_ALLOWED_BIT and ODP_WRITE_ALLOWED_BIT. */ dma_addr_t *dma_list; + struct dma_iova_attrs iova; /* * The umem_mutex protects the page_list and dma_list fields of an ODP * umem, allowing only a single thread to map/unmap pages. The mutex diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index b7b6b58dd348..e71fa19187cc 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -4077,6 +4077,24 @@ static inline int ib_dma_mapping_error(struct ib_device *dev, u64 dma_addr) return dma_mapping_error(dev->dma_device, dma_addr); } +static inline int ib_dma_alloc_iova(struct ib_device *dev, + struct dma_iova_attrs *iova) +{ + if (ib_uses_virt_dma(dev)) + return 0; + + return dma_alloc_iova(iova); +} + +static inline void ib_dma_free_iova(struct ib_device *dev, + struct dma_iova_attrs *iova) +{ + if (ib_uses_virt_dma(dev)) + return; + + dma_free_iova(iova); +} + /** * ib_dma_map_single - Map a kernel virtual address to DMA address * @dev: The device for which the dma_addr is to be created