From patchwork Thu Apr 4 07:26:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kasireddy, Vivek" X-Patchwork-Id: 13617395 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 9F255CD1284 for ; Thu, 4 Apr 2024 07:54:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 80CC06B0093; Thu, 4 Apr 2024 03:54:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7BCAE6B0095; Thu, 4 Apr 2024 03:54:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 637E96B0098; Thu, 4 Apr 2024 03:54:39 -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 445A76B0093 for ; Thu, 4 Apr 2024 03:54:39 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0E610C0F53 for ; Thu, 4 Apr 2024 07:54:39 +0000 (UTC) X-FDA: 81971087478.23.44A5D02 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by imf16.hostedemail.com (Postfix) with ESMTP id DB85118000C for ; Thu, 4 Apr 2024 07:54:36 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=FQ21eimu; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf16.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.13 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=1712217277; 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=H5LZX4x0dPh49vNzSTLf7kYd0GJ+7/NAQZVV/ovBC1g=; b=lb67touL7cvdMxH8o6nqHGZFfD97vvaS9rSmBflsDu1ZHYUDaYDLLz2QIsEENrszo2kk59 +oJnmWD0TPT5kEJSriD3o16KTTPOX5sBcpDNviSYC535HzbHKPqkDwVtZuFW4vZdWZNQDO KZni4YRjshLFyI0SqWld63FI6S6M23E= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=FQ21eimu; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf16.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.13 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712217277; a=rsa-sha256; cv=none; b=lijovyW6+MbPSHlO+/ZTYREc2nIULn4+53EX5+3fECbV8xJaS19GTXN7iGWNsgvNEh9NOu vWeN8LB3e/JpEVlLj/t+hDjcaueoPWFGzQF8ag5a8IxVXbb1GMO+4OdLGG8cxY5uH6cyF3 m9TjpkcClGIw6f4WpHu0RQw6q/Gv6MA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712217277; x=1743753277; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OFY0cfHR/dm9OGHwjR/w6MaeqHarFwrIQpExmOosGtk=; b=FQ21eimuBqy3UTmOGzEA9P0cpWiUZQGIeZ0bputwmPfHnBZ7X6JTOZEc 2rAc0RlBnX5htHNe0YyRFL3r9FEBgCTVlCSuSPgiNQIMm88GMxtcitRMA e0oboMvBTGwmQVUXb32UGO3R4wTbc3W473KimEbLFXMHuI45xNJVFnJDM qWox557G+Wi3s0nbX8zkcbd8hsFhe8V5ipsJGnm7EVxryPz2oa8oIXdWb 29lLpaIA+dkyTkXY/2D5UpVAKak7DcW5Zyga0oOIX+dRnfokqWDTKy7jg ZrMcv3WVpMT2DwWMRMAKq6+y2C4ZV432MWSqRAOqyw6o7eTawdysZEsuS A==; X-CSE-ConnectionGUID: lXLVr5hNRO6UiatWtyGTqw== X-CSE-MsgGUID: q20AW11lSNyK8qN7wb0q/Q== X-IronPort-AV: E=McAfee;i="6600,9927,11033"; a="10450807" X-IronPort-AV: E=Sophos;i="6.07,178,1708416000"; d="scan'208";a="10450807" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2024 00:54:28 -0700 X-CSE-ConnectionGUID: pccvBgTbTRG+xVR8YbZcIg== X-CSE-MsgGUID: UN/AcFhtTkCd1wNsSwGGuw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,178,1708416000"; d="scan'208";a="19298771" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2024 00:54:28 -0700 From: Vivek Kasireddy To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Vivek Kasireddy , David Hildenbrand , Daniel Vetter , Mike Kravetz , Hugh Dickins , Peter Xu , Jason Gunthorpe , Gerd Hoffmann , Dongwon Kim , Junxiao Chang Subject: [PATCH v13 5/8] udmabuf: Add back support for mapping hugetlb pages Date: Thu, 4 Apr 2024 00:26:12 -0700 Message-ID: <20240404073053.3073706-6-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240404073053.3073706-1-vivek.kasireddy@intel.com> References: <20240404073053.3073706-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: DB85118000C X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: xibjffmtwndpb3h4fz94mxpqpbfrbmna X-HE-Tag: 1712217276-971051 X-HE-Meta: U2FsdGVkX1+3g2+cgUqfU8wvM3TDmx3FcphcsUKUPRuDk+Zmzn6YiE8VF4jTL8GnF/KDxN0W9F5SU1NcbrO2PqFLeQtzFKKCKmK6HKSi1thNSRAc/nuul1sYZ6PPghHsF+R1op1cPtMUz3Wnsc/JJ2vZVj9ZUwcoA8h6TQYxsW2VTuM+zbrwhmC17kH1EO7eigsb1NvzB0XagynD4h84KqEOkxWzwf5rVI+lkCtgbUhNtp3v3Y7/BDpIZYq+Uj6dDkTXovuDd9llrjwJ0fsVTAS/wNgQTCvrOh5Iw5dPOIijdR+ZhYUOGG7v7cvlHycSOiLEx70AO46J6QjJQAdLGnFwJmGrQnFa5iQM/5gHScbQzP5wzhYVmZENwLW6L5hvqsaC/zVLt4u4tAvijrM4j7IqplkzR8mWJEO7k14HWzFVV8B1TgOjoZX9OPrCUOfZkZqjRXi/QVvOgdx6xnSQpMx1YRtAs9WbVyWwxGWhdjAQtwdq8dpN/nXdq4xcs7nRREZ7eVPLYx4QEaPvz47mxrhoJeQ00jyQKtocf4GS7MSBgwIUSt1mVc+idL+LSbNEWiFdXOVt8zqS/tiaMJOAF/WasRO9Rzw1sLUq7p7El43h0TzP+q3MlxZcASixToKVkpajUxoa5luYbxhLpZFfnc74Ft3JMJyPLOsZ2iOlu9u1yRE1eBaAgaCzWs8C49VowsU+I5hAn81TTha1gNISEWqxJHnE3RdG+Xr0OS5neYG0M+4LAjeKjtzt6wwMHMnX851ERP0xNfNibXOD/RkrNLTc5ZtSPp0Uw5bLT38CS2p6ik6OeRfW2j6STvkIISW4xS8fPTqZsqLMjZ6CVBqnNJGhPaTWK2i/xgn/ILqX65puKRLg22xCMu7y8dxGBDIXPeHQBbOH44osBKJz7LvvOmV9ip0T5W2CHU7kZCOPEi/TwuxOCZpurmPl+v4JjHT5wJynMwCGw8EVD4lGvg0 zJcbkRWK c3SWq6DSTJwbKr5kW7MogKFxYBMNQ3yM2JLqDjsG8m3QBW6UiJPOxHFiMvhkUCdup8xIOCObSpOCZeYiUG8nwn7NdUe4XxiJ+ea2zrGs444a/m7Fo2P1WeH+F18athe8vTfbCR+xwUVZDvZfL8AvNPUuZwsZYqeanFv+OMXpka7KkaBqzmeQAGfS8Fb2AYJxUNPWeL2hkb0zdXPK5n30fyQguSiuQ5I7tgjeKLvflQULEGoDbQb10Qaw67ZqLnTsGxTib 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: A user or admin can configure a VMM (Qemu) Guest's memory to be backed by hugetlb pages for various reasons. However, a Guest OS would still allocate (and pin) buffers that are backed by regular 4k sized pages. In order to map these buffers and create dma-bufs for them on the Host, we first need to find the hugetlb pages where the buffer allocations are located and then determine the offsets of individual chunks (within those pages) and use this information to eventually populate a scatterlist. Testcase: default_hugepagesz=2M hugepagesz=2M hugepages=2500 options were passed to the Host kernel and Qemu was launched with these relevant options: qemu-system-x86_64 -m 4096m.... -device virtio-gpu-pci,max_outputs=1,blob=true,xres=1920,yres=1080 -display gtk,gl=on -object memory-backend-memfd,hugetlb=on,id=mem1,size=4096M -machine memory-backend=mem1 Replacing -display gtk,gl=on with -display gtk,gl=off above would exercise the mmap handler. Cc: David Hildenbrand Cc: Daniel Vetter Cc: Mike Kravetz Cc: Hugh Dickins Cc: Peter Xu Cc: Jason Gunthorpe Cc: Gerd Hoffmann Cc: Dongwon Kim Cc: Junxiao Chang Acked-by: Mike Kravetz (v2) Signed-off-by: Vivek Kasireddy --- drivers/dma-buf/udmabuf.c | 122 +++++++++++++++++++++++++++++++------- 1 file changed, 101 insertions(+), 21 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index 820c993c8659..274defd3fa3e 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -28,6 +29,7 @@ struct udmabuf { struct page **pages; struct sg_table *sg; struct miscdevice *device; + pgoff_t *offsets; }; static vm_fault_t udmabuf_vm_fault(struct vm_fault *vmf) @@ -41,6 +43,8 @@ static vm_fault_t udmabuf_vm_fault(struct vm_fault *vmf) return VM_FAULT_SIGBUS; pfn = page_to_pfn(ubuf->pages[pgoff]); + pfn += ubuf->offsets[pgoff] >> PAGE_SHIFT; + return vmf_insert_pfn(vma, vmf->address, pfn); } @@ -90,23 +94,29 @@ static struct sg_table *get_sg_table(struct device *dev, struct dma_buf *buf, { struct udmabuf *ubuf = buf->priv; struct sg_table *sg; + struct scatterlist *sgl; + unsigned int i = 0; int ret; sg = kzalloc(sizeof(*sg), GFP_KERNEL); if (!sg) return ERR_PTR(-ENOMEM); - ret = sg_alloc_table_from_pages(sg, ubuf->pages, ubuf->pagecount, - 0, ubuf->pagecount << PAGE_SHIFT, - GFP_KERNEL); + + ret = sg_alloc_table(sg, ubuf->pagecount, GFP_KERNEL); if (ret < 0) - goto err; + goto err_alloc; + + for_each_sg(sg->sgl, sgl, ubuf->pagecount, i) + sg_set_page(sgl, ubuf->pages[i], PAGE_SIZE, ubuf->offsets[i]); + ret = dma_map_sgtable(dev, sg, direction, 0); if (ret < 0) - goto err; + goto err_map; return sg; -err: +err_map: sg_free_table(sg); +err_alloc: kfree(sg); return ERR_PTR(ret); } @@ -143,6 +153,7 @@ static void release_udmabuf(struct dma_buf *buf) for (pg = 0; pg < ubuf->pagecount; pg++) put_page(ubuf->pages[pg]); + kfree(ubuf->offsets); kfree(ubuf->pages); kfree(ubuf); } @@ -196,17 +207,77 @@ 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 page *hpage = NULL; + struct folio *folio; + pgoff_t pgidx; + + mapidx <<= huge_page_order(hpstate); + for (pgidx = 0; pgidx < pgcnt; pgidx++) { + if (!hpage) { + 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; + ubuf->offsets[*pgbuf] = subpgoff << PAGE_SHIFT; + (*pgbuf)++; + if (++subpgoff == maxsubpgs) { + put_page(hpage); + hpage = NULL; + subpgoff = 0; + mapidx += pages_per_huge_page(hpstate); + } + } + + if (hpage) + put_page(hpage); + + 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 page *page; + + for (pgidx = 0; pgidx < pgcnt; pgidx++) { + page = shmem_read_mapping_page(memfd->f_mapping, + pgoff + pgidx); + if (IS_ERR(page)) + return PTR_ERR(page); + + ubuf->pages[*pgbuf] = page; + (*pgbuf)++; + } + + return 0; +} + static long udmabuf_create(struct miscdevice *device, struct udmabuf_create_list *head, struct udmabuf_create_item *list) { DEFINE_DMA_BUF_EXPORT_INFO(exp_info); struct file *memfd = NULL; - struct address_space *mapping = NULL; struct udmabuf *ubuf; struct dma_buf *buf; - pgoff_t pgoff, pgcnt, pgidx, pgbuf = 0, pglimit; - struct page *page; + pgoff_t pgcnt, pgbuf = 0, pglimit; int seals, ret = -EINVAL; u32 i, flags; @@ -234,6 +305,12 @@ static long udmabuf_create(struct miscdevice *device, ret = -ENOMEM; goto err; } + ubuf->offsets = kcalloc(ubuf->pagecount, sizeof(*ubuf->offsets), + GFP_KERNEL); + if (!ubuf->offsets) { + ret = -ENOMEM; + goto err; + } pgbuf = 0; for (i = 0; i < head->count; i++) { @@ -241,8 +318,7 @@ static long udmabuf_create(struct miscdevice *device, memfd = fget(list[i].memfd); if (!memfd) goto err; - mapping = memfd->f_mapping; - if (!shmem_mapping(mapping)) + if (!shmem_file(memfd) && !is_file_hugepages(memfd)) goto err; seals = memfd_fcntl(memfd, F_GET_SEALS, 0); if (seals == -EINVAL) @@ -251,16 +327,19 @@ static long udmabuf_create(struct miscdevice *device, if ((seals & SEALS_WANTED) != SEALS_WANTED || (seals & SEALS_DENIED) != 0) goto err; - pgoff = list[i].offset >> PAGE_SHIFT; - pgcnt = list[i].size >> PAGE_SHIFT; - for (pgidx = 0; pgidx < pgcnt; pgidx++) { - page = shmem_read_mapping_page(mapping, pgoff + pgidx); - if (IS_ERR(page)) { - ret = PTR_ERR(page); - goto err; - } - ubuf->pages[pgbuf++] = page; - } + + 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) + goto err; + fput(memfd); memfd = NULL; } @@ -287,6 +366,7 @@ static long udmabuf_create(struct miscdevice *device, put_page(ubuf->pages[--pgbuf]); if (memfd) fput(memfd); + kfree(ubuf->offsets); kfree(ubuf->pages); kfree(ubuf); return ret;