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 06CE5CD1299 for ; Thu, 11 Apr 2024 07:26:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 791576B0098; Thu, 11 Apr 2024 03:26:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F6C26B0099; Thu, 11 Apr 2024 03:26:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 51BDE6B009A; Thu, 11 Apr 2024 03:26:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2453C6B0098 for ; Thu, 11 Apr 2024 03:26:29 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C9DD1160792 for ; Thu, 11 Apr 2024 07:26:28 +0000 (UTC) X-FDA: 81996418056.16.5C4E0A0 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by imf11.hostedemail.com (Postfix) with ESMTP id 9A34940009 for ; Thu, 11 Apr 2024 07:26:26 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=lnHrX9x9; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf11.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.18 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712820386; 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=ZzslkP4FXSVcnARgjBpiasDIiO0zowADisAecquvRNE=; b=eAIJP4udXH+jTla18iWkRFwV9osBDKRbvFFnp9Mciskixs+JRCIdK5i3VHtfmSxlBV4iV7 BrSZNqXTwD//CwvNEJ2keqzd/ka1quYeEdmMUaRlLBSqZ54OaPCarDBjWrPOBW5fVcbS4S FjHA3AHu3cuG5vOtOb+8wA6fTstGXmM= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=lnHrX9x9; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf11.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.18 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712820386; a=rsa-sha256; cv=none; b=AkD1XpQ2CnqGWNVHbL5u8J3JcSpPYBvw9/D2HQKu51oelaDgzNY0vUTXwcxU/4M6h46pfl 4q+DyNlGoVD6Z/FYiWdpD5+Xuy509zsNAOt1gR99t2ymk+9s5SEr+6KmV+jl9AhJ0kezjq yvAy9Hpb/sKIbbeMdI72NH4vMXWIhO4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712820386; x=1744356386; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rYDIAk/+JNBpe6qVQ2riIjSCYbGcP96O0fQsqo8pcLI=; b=lnHrX9x9KdBhIRbZf0jGBYV15LdUSwYl9CykV4yOS4WPJA+POGvJlMlO F64XgKmYDr7lF/DSELXjMzU0QlWUE1bBmrLoWXj5hwTdHDE+GWOZnl6Fu lwGAxDeaORPLMEX7LEDWYJubNmaV8fLd13U98hevdEyeW01hUImRjPxU4 XEfaIq6b3O7UmntCaYxrEBsTBZo1GgqUXTyRQEfvVyefrA9PRArbXFEfW adTKZMRJFfj580Nb/L/Ug/6MmnjkgJd2epiNZ1/+I+qRRuBJrJ+8/KBGT hkULyG7BwnN/d2GYCK11PgXAyKrv6OI6FJWZtqBki8YyLevMcQq93oXwu g==; X-CSE-ConnectionGUID: kjdwPQa2QAyPimOhQp3B0w== X-CSE-MsgGUID: m0xEzojdTUyz18u00ZBlJg== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8074387" X-IronPort-AV: E=Sophos;i="6.07,192,1708416000"; d="scan'208";a="8074387" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2024 00:26:04 -0700 X-CSE-ConnectionGUID: QO9LNaNXSOe74PNJbN8IsQ== X-CSE-MsgGUID: pHZAg8fmS4iAnhUQiowFoQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,192,1708416000"; d="scan'208";a="20848552" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2024 00:26:04 -0700 From: Vivek Kasireddy To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Vivek Kasireddy , David Hildenbrand , Matthew Wilcox , Daniel Vetter , Hugh Dickins , Peter Xu , Jason Gunthorpe , Gerd Hoffmann , Dongwon Kim , Junxiao Chang Subject: [PATCH v14 7/8] udmabuf: Pin the pages using memfd_pin_folios() API Date: Wed, 10 Apr 2024 23:59:43 -0700 Message-ID: <20240411070157.3318425-8-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240411070157.3318425-1-vivek.kasireddy@intel.com> References: <20240411070157.3318425-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 9A34940009 X-Stat-Signature: 8cdthrwwuw9kryeioga46cq5hgbw1xmx X-Rspam-User: X-HE-Tag: 1712820386-372577 X-HE-Meta: U2FsdGVkX182uvdbhr8ii4z0voyfjj8uguUfSkiPSC40Ki2HVu0ksjHswONHfMlfU4Qu0ItmJV5wgNve7Cy06jTiIMLRWbDNk5RyZNep6DOdk/czQyVnll7PnvKPuP8IR9FlAXHiD4m5gu1Bdv8weh4z+D5g+5QRIDIZqg2xy8x4vkG8xGbnN9UA2uqaTbfkIVi4yjAKzT1fOaJuGjNBFvsVoO4p1VuTT9tjv4BQ2ALUxd445ilpDTsj31H6BxzFnLV3aRjYWaLYYUVdPc1SJg1TP0ZvT6xAKfJGUKlbOWIRaJbQb1mjpGk1YnaUyzvmv9umPubBTnD3XNUHvpfz3q1qeE8pkc1SlgsAbXNodE3adx3s+uUzTlxVS8HLQSmYDp/jztfs+1+aiKzd0NLCTsiEnpZ5f6QVBRlAyhyb0dfV8LFxrz/gB90/oWrp6cpMS+s8ss22l9mt0ITURNLDhHDWeFna1UgfDNoGUhZH7Joy9EDo2nxORAnkQb8YCgCSzHRxT8nz4qYXgABd6Gd1j0Xr3w0tGh0QPvEaxQiNn//PAShmDINZR5ceZuMBCuo4CDVr4kkLYxhUHo7i7zLXzP/xp4Sd+kn0zgLcq4qgmZ+Y1XgQYxtp9UCjSGG4kctyDS5Gzs3eGFLRimBHrvY638sSEAX5vaJqt1KhPxaAcVJvFOc7gx2yHOi1Y2lzT3L5uCF9SPJ7rpFPL6PDQIdvalVTXRUViMa7yjG1hIn22YL8b2BXmNQsUHUmNBHunCbjZu3igVYo8P3m92nr0C2QuVKYkBPGjELKVMJuiBQWKVEEBhaiPRG9L62b2rKSg62wgb+/lNWpELYpAMU2VrQm4v5J9e31GDH96MlBvsomjfjfrcJkUtzigjf4L4gL8Q+7TIo6oVF7LWluRsR4SaARLlVG7ZSHv8NiPe+K+L6E6PJdCnNwGZI88eLOmvBLHYeM8DHK/3HEwk1JgeQJP8i oK5RzDX+ eC/r2KOEoMAlUXqXQ9ajgvKD/+CPtQjYeu/aeGcBf61xMYIYkVxDsF9DKRaHPbKNybs3c08Z+1KsfGn82E50ejsuk4tYBI/6W4HSAg32UUN3qpkgx30q0JeEk5E+z8C6bnOU34Dy6S+EEPf3/IaigDTJIBEdo1cpTr3cyGWxWeOD98WFNg6nG5+Q/Q9lDeU5RWJZhGh870x0t04/4HimbwoyAOeMMb0XKr+vGhwd/UZRLU8/WW+LVC9YHRnmUTDnokVs/XoxmhNXPzh/8Xg5T1ycpRiEPJgy1xEPtniiz8Aisqi4MAh4nBo+ePrHVHsRIv4/tdgWCcjvMC1XPyV4V78u3Lw== 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. Cc: David Hildenbrand Cc: Matthew Wilcox Cc: Daniel Vetter 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 | 153 +++++++++++++++++++------------------- 1 file changed, 78 insertions(+), 75 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index a8f3af61f7f2..afa8bfd2a2a9 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -30,6 +30,12 @@ struct udmabuf { struct sg_table *sg; struct miscdevice *device; pgoff_t *offsets; + struct list_head unpin_list; +}; + +struct udmabuf_folio { + struct folio *folio; + struct list_head list; }; static vm_fault_t udmabuf_vm_fault(struct vm_fault *vmf) @@ -153,17 +159,43 @@ static void unmap_udmabuf(struct dma_buf_attachment *at, return put_sg_table(at->dev, sg, direction); } +static void unpin_all_folios(struct list_head *unpin_list) +{ + struct udmabuf_folio *ubuf_folio; + + while (!list_empty(unpin_list)) { + ubuf_folio = list_first_entry(unpin_list, + struct udmabuf_folio, list); + unpin_folio(ubuf_folio->folio); + + list_del(&ubuf_folio->list); + kfree(ubuf_folio); + } +} + +static int add_to_unpin_list(struct list_head *unpin_list, + struct folio *folio) +{ + struct udmabuf_folio *ubuf_folio; + + ubuf_folio = kzalloc(sizeof(*ubuf_folio), GFP_KERNEL); + if (!ubuf_folio) + return -ENOMEM; + + ubuf_folio->folio = folio; + list_add_tail(&ubuf_folio->list, unpin_list); + return 0; +} + 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->unpin_list); kfree(ubuf->offsets); kfree(ubuf->folios); kfree(ubuf); @@ -218,64 +250,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,16 +295,19 @@ 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) return -ENOMEM; + INIT_LIST_HEAD(&ubuf->unpin_list); pglimit = (size_limit_mb * 1024 * 1024) >> PAGE_SHIFT; for (i = 0; i < head->count; i++) { if (!IS_ALIGNED(list[i].offset, PAGE_SIZE)) @@ -366,17 +343,44 @@ 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; + + if (j == 0 || ubuf->folios[pgbuf-1] != folios[k]) { + ret = add_to_unpin_list(&ubuf->unpin_list, + folios[k]); + if (ret < 0) { + kfree(folios); + goto err; + } + } + + pgbuf++; + if (++pgoff == folio_nr_pages(folios[k])) { + pgoff = 0; + if (++k == nr_folios) + break; + } + } + + kfree(folios); fput(memfd); } @@ -388,10 +392,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->unpin_list); kfree(ubuf->offsets); kfree(ubuf->folios); kfree(ubuf); -- 2.43.0