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 258BDC47077 for ; Wed, 27 Dec 2023 08:02:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 858C18D0008; Wed, 27 Dec 2023 03:02:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 792A78D0001; Wed, 27 Dec 2023 03:02:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 597728D0008; Wed, 27 Dec 2023 03:02:45 -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 405EA8D0001 for ; Wed, 27 Dec 2023 03:02:45 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 167411406DB for ; Wed, 27 Dec 2023 08:02:45 +0000 (UTC) X-FDA: 81611856690.20.719B8B8 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by imf05.hostedemail.com (Postfix) with ESMTP id 0130110000F for ; Wed, 27 Dec 2023 08:02:42 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=TMYLaSBB; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf05.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.55.52.43 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=1703664163; 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=WoOlj0+FN2u6l8eE8sI64entA6PFFPqd725ekkUPvt0=; b=YFNi1w3YRszc/94/Iwbdd403edmN4INLkCFGCoUTxuWFUTV0ZEjT7pjc6jmwSsQ5AABufV K2l715qa6VaZt+ad9AR1pIcxXYLnljLujEdvbr/ept692w/btt/fFLw3ew9UlFpLJPo6cV 5XQwVw9Y0UsuqikpsK7B9EKSh0VQGQY= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=TMYLaSBB; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf05.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703664163; a=rsa-sha256; cv=none; b=udDJxDMXK+0u8J5+XkQ+6f52pfwzQM6OEnw/7D885YOEsauqB2a65SzMmk+3mDPD1eC37o 307x/uaWNXbT2Wjrn5xV06qPX5wrUZs9CXYh9ffxLX4ovvauoxv/UyqyCfpL08leGtvOFE tyI7aJXntZJN/GuFE+fAn5ufY6vy9NY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703664163; x=1735200163; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=srh+pDeiF4x93Sp9cmg48dB8ma2fshhkeNl1Nqm5xC4=; b=TMYLaSBBMLwxhXPorF5qwsnhczhByku/EuDJpnTKEbGrj0WS0CK0H89f vKHHJ98jsCJ+YF8/DwL8HgcAiG8ZqmUs/fW96MMO/rg3ighrHc+9ElQpm AP4+Esfl7TdKxvs0U8F99eSbb99pZwMF9Wrji/KrWE/AypubkspfqFrxi tj1Rk78v0vzilX4tIXWXuQZpNUIhnSbp7vC3TriPthGN7JNeQoXCxypxe HBgVf+t0fMnLMOeLSo1TjaZhXfunnLXgLGauHR4tqeqznMrNNrB866kyX o5vyKqF1xsKurYnwpkGTDaahcvOo7XaGK9wde++EqvdyeYoAvt7USNY/n Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10935"; a="482604313" X-IronPort-AV: E=Sophos;i="6.04,308,1695711600"; d="scan'208";a="482604313" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Dec 2023 00:02:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10935"; a="781668191" X-IronPort-AV: E=Sophos;i="6.04,308,1695711600"; d="scan'208";a="781668191" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Dec 2023 00:02:36 -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 v9 4/6] udmabuf: Convert udmabuf driver to use folios (v2) Date: Tue, 26 Dec 2023 23:38:20 -0800 Message-Id: <20231227073822.390518-5-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231227073822.390518-1-vivek.kasireddy@intel.com> References: <20231227073822.390518-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0130110000F X-Stat-Signature: 746o94hyqp4ecjbitisouqok6si9mf6t X-HE-Tag: 1703664162-732392 X-HE-Meta: U2FsdGVkX1+R76TntkyR/S+ytcpj+fbwcIF6QC7v9QsJQBW73zZKE5UNoBchR1rJI83DjvR41yoTIwJq9O/humHd6t7ilYt7RpZEuMgHAxwonYH8hkgFPTfW67EhQBtLmxEr/Gl/dJeaRcaSAgcZdSFPxHeAV7aIRuPI3b33GoFpHn8HnSlFZv1rKEXUJZOGnQWlsTWzcGZ4TcoSqQzXH9C+mU5azT1E1Vr2HxXzUrCLgcenygZ/eFnaQyEspD1mZ9YyFelberE/DCnycot64N0pn6PQMEbUajKVXU0Km0vBK78gCcQf+0oo9dZUuQg5cPIuwpYge41bI36ZUDwYkiEftGCQqOtQOhLZ3K4ZKYDR+GeUze8J8+fFTEtc1y0Imv/DKBSBmjn4U28uGuGvTBzHCwp9DusFeUm0gzyQ/A0vxJmdHFmUIIU1ixjHcLPcRipQJtBv2hr2hLoVjTmI//hu49apzQQLOD4fliDPeLZ8z2QckA4YBQuCyNOQkIQUockO3cA8V1KrVOYlx5SYz/D8tywkRImfTTnltKXBcp6rmFwl759IPLDjZqO1HVGt+KqWcy3RFSgl8qydLOdsj9ZxlgjPrtXPHMF9Xd6tAMFXyDm8g7Iq4JG7fR20ZwVLEHewNNuSS+R7OLjxj3n4Dqx8uZEu3Rwn6CUNKQalvQSdVM7KXIyBRTjsEIupLmQsQ0J++oKhhBsXMk4gJGPNn66XBVXu811ycdhZdwx3Aqfs/vs6kv28x3aCwaVThDP2sJm7I+fpqcvjNa3uTXqfm2bx1oMC/8elAZB2We/0IFZojoksgDZoly1RdldtNSzGv5d0jducUSTept5yb45z69wmHM8Mb7DmktDkc8DdDX/lCsrfFdK/fAqxDpqyMGDPVT9FbQ/XkLlJIqfKEq436QL6jNBavL9ottUBq4N9EzfeeOYfgeIaU4Xxj5WfSULyM6IVkQkyiwjy+uf21MH +daryvcl 4NpRgCog6xUAcqUf3kZ3opOrQOe7vkziniPT8HQXEIYwJ5IcF3J4rG8OOYLSBM+U/C1LUZNQ1Iwg9qh7NxY0Xd6nBGsRWOEvYla7f6lv0YxHcIr/XXexPIJoEhbGen5Of12IHqcMw21Xon11RbThRJlEAWahAcHeOVnm0ropdxKtSkuVuka+nfZD5A5OsJlVRD3F7GVyfAFJfjti69ug2Xiw3rWNMbkb/ey2994OubgyjK3/ndWcxtqBwf0bHcs0mAAoVSZJol3pI1zfmHEgw7XX8hD/4ga4v++S3TCSShKMmJG+djPdLAfn+2g== 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: This is mainly a preparatory patch to use memfd_pin_folios() API for pinning folios. Using folios instead of pages makes sense as the udmabuf driver needs to handle both shmem and hugetlb cases. However, the function vmap_udmabuf() still needs a list of pages; so, we collect all the head pages into a local array in this case. Other changes in this patch include the addition of helpers for checking the memfd seals and exporting dmabuf. Moving code from udmabuf_create() into these helpers improves readability given that udmabuf_create() is a bit long. v2: (Matthew) - Use folio_pfn() on the folio instead of page_to_pfn() on head page - Don't split the arguments to shmem_read_folio() on multiple lines 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 | 140 ++++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 57 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index 274defd3fa3e..a8f3af61f7f2 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -26,7 +26,7 @@ MODULE_PARM_DESC(size_limit_mb, "Max size of a dmabuf, in megabytes. Default is struct udmabuf { pgoff_t pagecount; - struct page **pages; + struct folio **folios; struct sg_table *sg; struct miscdevice *device; pgoff_t *offsets; @@ -42,7 +42,7 @@ static vm_fault_t udmabuf_vm_fault(struct vm_fault *vmf) if (pgoff >= ubuf->pagecount) return VM_FAULT_SIGBUS; - pfn = page_to_pfn(ubuf->pages[pgoff]); + pfn = folio_pfn(ubuf->folios[pgoff]); pfn += ubuf->offsets[pgoff] >> PAGE_SHIFT; return vmf_insert_pfn(vma, vmf->address, pfn); @@ -68,11 +68,21 @@ static int mmap_udmabuf(struct dma_buf *buf, struct vm_area_struct *vma) static int vmap_udmabuf(struct dma_buf *buf, struct iosys_map *map) { struct udmabuf *ubuf = buf->priv; + struct page **pages; void *vaddr; + pgoff_t pg; dma_resv_assert_held(buf->resv); - vaddr = vm_map_ram(ubuf->pages, ubuf->pagecount, -1); + pages = kmalloc_array(ubuf->pagecount, sizeof(*pages), GFP_KERNEL); + if (!pages) + return -ENOMEM; + + for (pg = 0; pg < ubuf->pagecount; pg++) + pages[pg] = &ubuf->folios[pg]->page; + + vaddr = vm_map_ram(pages, ubuf->pagecount, -1); + kfree(pages); if (!vaddr) return -EINVAL; @@ -107,7 +117,8 @@ static struct sg_table *get_sg_table(struct device *dev, struct dma_buf *buf, goto err_alloc; for_each_sg(sg->sgl, sgl, ubuf->pagecount, i) - sg_set_page(sgl, ubuf->pages[i], PAGE_SIZE, ubuf->offsets[i]); + sg_set_folio(sgl, ubuf->folios[i], PAGE_SIZE, + ubuf->offsets[i]); ret = dma_map_sgtable(dev, sg, direction, 0); if (ret < 0) @@ -152,9 +163,9 @@ static void release_udmabuf(struct dma_buf *buf) put_sg_table(dev, ubuf->sg, DMA_BIDIRECTIONAL); for (pg = 0; pg < ubuf->pagecount; pg++) - put_page(ubuf->pages[pg]); + folio_put(ubuf->folios[pg]); kfree(ubuf->offsets); - kfree(ubuf->pages); + kfree(ubuf->folios); kfree(ubuf); } @@ -215,36 +226,33 @@ static int handle_hugetlb_pages(struct udmabuf *ubuf, struct 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 page *hpage = NULL; - struct folio *folio; + struct folio *folio = NULL; pgoff_t pgidx; mapidx <<= huge_page_order(hpstate); for (pgidx = 0; pgidx < pgcnt; pgidx++) { - if (!hpage) { + if (!folio) { folio = __filemap_get_folio(memfd->f_mapping, mapidx, FGP_ACCESSED, 0); if (IS_ERR(folio)) return PTR_ERR(folio); - - hpage = &folio->page; } - get_page(hpage); - ubuf->pages[*pgbuf] = hpage; + folio_get(folio); + ubuf->folios[*pgbuf] = folio; ubuf->offsets[*pgbuf] = subpgoff << PAGE_SHIFT; (*pgbuf)++; if (++subpgoff == maxsubpgs) { - put_page(hpage); - hpage = NULL; + folio_put(folio); + folio = NULL; subpgoff = 0; mapidx += pages_per_huge_page(hpstate); } } - if (hpage) - put_page(hpage); + if (folio) + folio_put(folio); return 0; } @@ -254,31 +262,69 @@ static int handle_shmem_pages(struct udmabuf *ubuf, struct file *memfd, pgoff_t *pgbuf) { pgoff_t pgidx, pgoff = offset >> PAGE_SHIFT; - struct page *page; + struct folio *folio = NULL; for (pgidx = 0; pgidx < pgcnt; pgidx++) { - page = shmem_read_mapping_page(memfd->f_mapping, - pgoff + pgidx); - if (IS_ERR(page)) - return PTR_ERR(page); + folio = shmem_read_folio(memfd->f_mapping, pgoff + pgidx); + if (IS_ERR(folio)) + return PTR_ERR(folio); - ubuf->pages[*pgbuf] = page; + ubuf->folios[*pgbuf] = folio; (*pgbuf)++; } return 0; } +static int check_memfd_seals(struct file *memfd) +{ + int seals; + + if (!memfd) + return -EBADFD; + + if (!shmem_file(memfd) && !is_file_hugepages(memfd)) + return -EBADFD; + + seals = memfd_fcntl(memfd, F_GET_SEALS, 0); + if (seals == -EINVAL) + return -EBADFD; + + if ((seals & SEALS_WANTED) != SEALS_WANTED || + (seals & SEALS_DENIED) != 0) + return -EINVAL; + + return 0; +} + +static int export_udmabuf(struct udmabuf *ubuf, + struct miscdevice *device, + u32 flags) +{ + DEFINE_DMA_BUF_EXPORT_INFO(exp_info); + struct dma_buf *buf; + + ubuf->device = device; + exp_info.ops = &udmabuf_ops; + exp_info.size = ubuf->pagecount << PAGE_SHIFT; + exp_info.priv = ubuf; + exp_info.flags = O_RDWR; + + buf = dma_buf_export(&exp_info); + if (IS_ERR(buf)) + return PTR_ERR(buf); + + return dma_buf_fd(buf, flags); +} + static long udmabuf_create(struct miscdevice *device, struct udmabuf_create_list *head, struct udmabuf_create_item *list) { - DEFINE_DMA_BUF_EXPORT_INFO(exp_info); + pgoff_t pgcnt, pgbuf = 0, pglimit; struct file *memfd = NULL; struct udmabuf *ubuf; - struct dma_buf *buf; - pgoff_t pgcnt, pgbuf = 0, pglimit; - int seals, ret = -EINVAL; + int ret = -EINVAL; u32 i, flags; ubuf = kzalloc(sizeof(*ubuf), GFP_KERNEL); @@ -299,9 +345,9 @@ static long udmabuf_create(struct miscdevice *device, if (!ubuf->pagecount) goto err; - ubuf->pages = kmalloc_array(ubuf->pagecount, sizeof(*ubuf->pages), + ubuf->folios = kmalloc_array(ubuf->pagecount, sizeof(*ubuf->folios), GFP_KERNEL); - if (!ubuf->pages) { + if (!ubuf->folios) { ret = -ENOMEM; goto err; } @@ -314,18 +360,9 @@ static long udmabuf_create(struct miscdevice *device, pgbuf = 0; for (i = 0; i < head->count; i++) { - ret = -EBADFD; memfd = fget(list[i].memfd); - if (!memfd) - goto err; - if (!shmem_file(memfd) && !is_file_hugepages(memfd)) - goto err; - seals = memfd_fcntl(memfd, F_GET_SEALS, 0); - if (seals == -EINVAL) - goto err; - ret = -EINVAL; - if ((seals & SEALS_WANTED) != SEALS_WANTED || - (seals & SEALS_DENIED) != 0) + ret = check_memfd_seals(memfd); + if (ret < 0) goto err; pgcnt = list[i].size >> PAGE_SHIFT; @@ -341,33 +378,22 @@ static long udmabuf_create(struct miscdevice *device, goto err; fput(memfd); - memfd = NULL; } - exp_info.ops = &udmabuf_ops; - exp_info.size = ubuf->pagecount << PAGE_SHIFT; - exp_info.priv = ubuf; - exp_info.flags = O_RDWR; - - ubuf->device = device; - buf = dma_buf_export(&exp_info); - if (IS_ERR(buf)) { - ret = PTR_ERR(buf); + flags = head->flags & UDMABUF_FLAGS_CLOEXEC ? O_CLOEXEC : 0; + ret = export_udmabuf(ubuf, device, flags); + if (ret < 0) goto err; - } - flags = 0; - if (head->flags & UDMABUF_FLAGS_CLOEXEC) - flags |= O_CLOEXEC; - return dma_buf_fd(buf, flags); + return ret; err: while (pgbuf > 0) - put_page(ubuf->pages[--pgbuf]); + folio_put(ubuf->folios[--pgbuf]); if (memfd) fput(memfd); kfree(ubuf->offsets); - kfree(ubuf->pages); + kfree(ubuf->folios); kfree(ubuf); return ret; } -- 2.39.2