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 B42A7C38147 for ; Sat, 16 Dec 2023 06:29:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1363C6B00C2; Sat, 16 Dec 2023 01:29:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 023A76B00C1; Sat, 16 Dec 2023 01:29:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D63136B00C0; Sat, 16 Dec 2023 01:29:03 -0500 (EST) 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 BAFF76B00AA for ; Sat, 16 Dec 2023 01:29:03 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 8EB47A064C for ; Sat, 16 Dec 2023 06:29:03 +0000 (UTC) X-FDA: 81571703766.27.5C1F679 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by imf11.hostedemail.com (Postfix) with ESMTP id C72DC40009 for ; Sat, 16 Dec 2023 06:29:01 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=LhbP9UJ7; spf=pass (imf11.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702708142; 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=wm0uWWOliBqGDsOJOOgqJXJjk8V5r0h+apclQel9KLM=; b=i/laZ+nXfpHm6y3OLbqsZvpiWV3DLe7BfZFDj4ZfI3Oc7enAogICJvd2SKCfkT/VUmDPe3 EqBA3zHeozYvDp1C/Ww0Lw2+UGP5ChQpy4BZxS3CJT6DQaEh6DGgIL4NOqAl2SZ3G0bXgT 82ZlAhnWoQvjCXwaSyETdY/qhK581gs= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=LhbP9UJ7; spf=pass (imf11.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702708142; a=rsa-sha256; cv=none; b=6XJS5nDglcPc4azMWD4UfX+NxbBEG4tY8XQ6S2VqPENSAc7C/kS7kVwUeX/RTQqcdLa8Wv FeqAhUnvi++KkHYOKO9Z7ZTnVkHUgJAXoMRKPtmeefVN7/NmS5WR5lc7Uq2JMlrruhBoWD QSQwWphdv9FT2YXozY/mhBIDm6aETtg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702708142; x=1734244142; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KZifQoWRpsSYXJ0ERWQORaReoIuSKvbcn4vSOcCzi/s=; b=LhbP9UJ7biD1m2XdncLDO8858wG0BeHbm9x9+V5W3cakHUqQS3YnMXiN jMwcyqrKP08QFXKgN3gp3jTV/Aq5PtLBpnB1ZTnzpGBJQZYipjcas7bhP v94Cbt5mNGKnI3aa+0rrbW2wlAeT2ENSTeB7+BXpb7tuHH+oRxbekZfd7 edBgkcYKb/S4ONLX4HHmjbJA+yPRoeFbEMnoDk6Z33cG4KugLv5JIfqH7 iUZf3i93R665n3c14dqiUXhj43TFmP9/dtJagVYGn3IwxvR7Pny45NCH5 1lsSfrNhM6bn+9mescWqn83ZhfEzIr0nGgeYzcYiq5NAXeDNwIqX8tlGP g==; X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="2186047" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="2186047" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="751178916" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="751178916" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:56 -0800 From: Vivek Kasireddy To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Vivek Kasireddy , David Hildenbrand , Matthew Wilcox , Daniel Vetter , Mike Kravetz , Hugh Dickins , Peter Xu , Jason Gunthorpe , Gerd Hoffmann , Dongwon Kim , Junxiao Chang Subject: [PATCH v8 5/6] udmabuf: Pin the pages using memfd_pin_folios() API (v6) Date: Fri, 15 Dec 2023 22:05:35 -0800 Message-Id: <20231216060536.3716466-6-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231216060536.3716466-1-vivek.kasireddy@intel.com> References: <20231216060536.3716466-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C72DC40009 X-Rspam-User: X-Stat-Signature: as3br8a9qzfphpo5symtaqf1fnnbxiyf X-Rspamd-Server: rspam01 X-HE-Tag: 1702708141-26552 X-HE-Meta: U2FsdGVkX19mj0hP9l0fwQTaqZWuxWR9Qq1+an5FowXqeyMF5Ti5PK7QtgVvK1FQNiqXMEOW7SP+Nav/MX9CD0XfizPFV0unv5MugNBnw2Lc8G6AN4d95n/s4h0EIBfjPFJU2ygb+1FhInJt1z6VHIJmw1ZVXMjvDqb5MivP2HS7c+3+Gk3qWOQ1AJi9qldyO3vEw+deLyMpgzGpQs9CGGBV8QeqKpSLjGMP0EUH3b6O1QUpVIcF+BOAoEo3DQ35i96Y3zcHDRTlQsnLMIzOqJmqv3xH/FruPuexv2ewvQoFk3sWIlViYwx6TuornrV5vJOdtATbhcaFscUtpruNyi9QTkiJB6h0+FA2PyGuCEa2SBIKk97nIp+bZnyZbFLl7o7kiZmM2u+K0q/wdfMrSKpgojPmKMc1hu6zece8YYflU+Wd2/krIzjKVtYVrpaSl7+WXaPPvKDmHPFO9lr1v2UG31uAU5spOYg0OpLoMbmAWmHQU23XpStjS5+KWF/6skv0m25DC/WApmZvfnQKNiHfBtBXX167ax2+kXzSs2hOJ8Mpsvxq9xjRrCAfgc+D8/jKgP9S+RmFsnhRgnFcQ7j31M0mK+gP3mt9jO4VmFpnA2lkEB4IC8wl2jsxx0OpWT7qeFZlTw3BE9I8M6pasaleK2d1Z2cTqlGmxQtKDF/sQ/9NHvvAZ0NobvPT+OkbpuEA5wIe02hinFqPjyHS/cFdKFuCXbWRG2Z84JckK+YKrwX+ARkxYPthqBg7hNgB1QB9Pf4eQUhNcju0g0SSKGxxfOdYfUUhqCWnTjZpLPPhNCq9TCkxIBJlJb7qFUbBQWuxRIysEPjPCe/n7CtpVJ1In6b3oANYB+Mv8uaK+MnycNhltAZ6goHXgxexLlLVR6R6kC/4+XnXsDFkug6ePAkMyxnBddUgDhZJ5N/Wss5fflvBjrz0Qw== 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: Using memfd_pin_folios() will ensure that the pages are pinned correctly using FOLL_PIN. And, this also ensures that we don't accidentally break features such as memory hotunplug as it would not allow pinning pages in the movable zone. Using this new API also simplifies the code as we no longer have to deal with extracting individual pages from their mappings or handle shmem and hugetlb cases separately. v2: - Adjust to the change in signature of pin_user_pages_fd() by passing in file * instead of fd. v3: - Limit the changes in this patch only to those that are required for using pin_user_pages_fd() - Slightly improve the commit message v4: - Adjust to the change in name of the API (memfd_pin_user_pages) v5: - Adjust to the changes in memfd_pin_folios which now populates a list of folios and offsets v6: - Don't unnecessarily use folio_page() (Matthew) - Pass [start, end] and max_folios to memfd_pin_folios() - Create another temporary array to hold the folios returned by memfd_pin_folios() as we populate ubuf->folios. - Unpin the folios only once as memfd_pin_folios pins them once Cc: David Hildenbrand Cc: Matthew Wilcox Cc: Daniel Vetter Cc: Mike Kravetz Cc: Hugh Dickins Cc: Peter Xu Cc: Jason Gunthorpe Cc: Gerd Hoffmann Cc: Dongwon Kim Cc: Junxiao Chang Signed-off-by: Vivek Kasireddy --- drivers/dma-buf/udmabuf.c | 124 +++++++++++++++----------------------- 1 file changed, 49 insertions(+), 75 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index a8f3af61f7f2..088f3a64e94c 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -153,17 +153,30 @@ static void unmap_udmabuf(struct dma_buf_attachment *at, return put_sg_table(at->dev, sg, direction); } +static void unpin_all_folios(struct udmabuf *ubuf, pgoff_t pgbuf) +{ + unsigned int i = 0, j; + + while (i < pgbuf) { + for (j = i + 1; j < pgbuf; j++) { + if (ubuf->folios[i] != ubuf->folios[j]) + break; + } + + unpin_user_page(&ubuf->folios[i]->page); + i = j; + } +} + static void release_udmabuf(struct dma_buf *buf) { struct udmabuf *ubuf = buf->priv; struct device *dev = ubuf->device->this_device; - pgoff_t pg; if (ubuf->sg) put_sg_table(dev, ubuf->sg, DMA_BIDIRECTIONAL); - for (pg = 0; pg < ubuf->pagecount; pg++) - folio_put(ubuf->folios[pg]); + unpin_all_folios(ubuf, ubuf->pagecount); kfree(ubuf->offsets); kfree(ubuf->folios); kfree(ubuf); @@ -218,64 +231,6 @@ static const struct dma_buf_ops udmabuf_ops = { #define SEALS_WANTED (F_SEAL_SHRINK) #define SEALS_DENIED (F_SEAL_WRITE) -static int handle_hugetlb_pages(struct udmabuf *ubuf, struct file *memfd, - pgoff_t offset, pgoff_t pgcnt, - pgoff_t *pgbuf) -{ - struct hstate *hpstate = hstate_file(memfd); - pgoff_t mapidx = offset >> huge_page_shift(hpstate); - pgoff_t subpgoff = (offset & ~huge_page_mask(hpstate)) >> PAGE_SHIFT; - pgoff_t maxsubpgs = huge_page_size(hpstate) >> PAGE_SHIFT; - struct folio *folio = NULL; - pgoff_t pgidx; - - mapidx <<= huge_page_order(hpstate); - for (pgidx = 0; pgidx < pgcnt; pgidx++) { - if (!folio) { - folio = __filemap_get_folio(memfd->f_mapping, - mapidx, - FGP_ACCESSED, 0); - if (IS_ERR(folio)) - return PTR_ERR(folio); - } - - folio_get(folio); - ubuf->folios[*pgbuf] = folio; - ubuf->offsets[*pgbuf] = subpgoff << PAGE_SHIFT; - (*pgbuf)++; - if (++subpgoff == maxsubpgs) { - folio_put(folio); - folio = NULL; - subpgoff = 0; - mapidx += pages_per_huge_page(hpstate); - } - } - - if (folio) - folio_put(folio); - - return 0; -} - -static int handle_shmem_pages(struct udmabuf *ubuf, struct file *memfd, - pgoff_t offset, pgoff_t pgcnt, - pgoff_t *pgbuf) -{ - pgoff_t pgidx, pgoff = offset >> PAGE_SHIFT; - struct folio *folio = NULL; - - for (pgidx = 0; pgidx < pgcnt; pgidx++) { - folio = shmem_read_folio(memfd->f_mapping, pgoff + pgidx); - if (IS_ERR(folio)) - return PTR_ERR(folio); - - ubuf->folios[*pgbuf] = folio; - (*pgbuf)++; - } - - return 0; -} - static int check_memfd_seals(struct file *memfd) { int seals; @@ -321,11 +276,13 @@ static long udmabuf_create(struct miscdevice *device, struct udmabuf_create_list *head, struct udmabuf_create_item *list) { - pgoff_t pgcnt, pgbuf = 0, pglimit; + pgoff_t pgoff, pgcnt, pglimit, pgbuf = 0; + long nr_folios, ret = -EINVAL; struct file *memfd = NULL; + struct folio **folios; struct udmabuf *ubuf; - int ret = -EINVAL; - u32 i, flags; + u32 i, j, k, flags; + loff_t end; ubuf = kzalloc(sizeof(*ubuf), GFP_KERNEL); if (!ubuf) @@ -366,17 +323,35 @@ static long udmabuf_create(struct miscdevice *device, goto err; pgcnt = list[i].size >> PAGE_SHIFT; - if (is_file_hugepages(memfd)) - ret = handle_hugetlb_pages(ubuf, memfd, - list[i].offset, - pgcnt, &pgbuf); - else - ret = handle_shmem_pages(ubuf, memfd, - list[i].offset, - pgcnt, &pgbuf); - if (ret < 0) + folios = kmalloc_array(pgcnt, sizeof(*folios), GFP_KERNEL); + if (!folios) { + ret = -ENOMEM; goto err; + } + end = list[i].offset + (pgcnt << PAGE_SHIFT) - 1; + ret = memfd_pin_folios(memfd, list[i].offset, end, + folios, pgcnt, &pgoff); + if (ret < 0) { + kfree(folios); + goto err; + } + + nr_folios = ret; + pgoff >>= PAGE_SHIFT; + for (j = 0, k = 0; j < pgcnt; j++) { + ubuf->folios[pgbuf] = folios[k]; + ubuf->offsets[pgbuf] = pgoff << PAGE_SHIFT; + pgbuf++; + + if (++pgoff == folio_nr_pages(folios[k])) { + pgoff = 0; + if (++k == nr_folios) + break; + } + } + + kfree(folios); fput(memfd); } @@ -388,10 +363,9 @@ static long udmabuf_create(struct miscdevice *device, return ret; err: - while (pgbuf > 0) - folio_put(ubuf->folios[--pgbuf]); if (memfd) fput(memfd); + unpin_all_folios(ubuf, pgbuf); kfree(ubuf->offsets); kfree(ubuf->folios); kfree(ubuf); -- 2.39.2