From patchwork Sun Feb 25 07:57:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kasireddy, Vivek" X-Patchwork-Id: 13570758 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 EA35CC54E41 for ; Sun, 25 Feb 2024 08:24:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9537E6B00FD; Sun, 25 Feb 2024 03:24:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 904856B00FF; Sun, 25 Feb 2024 03:24:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 755596B0100; Sun, 25 Feb 2024 03:24:19 -0500 (EST) 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 60A736B00FF for ; Sun, 25 Feb 2024 03:24:19 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 165EBC022F for ; Sun, 25 Feb 2024 08:24:19 +0000 (UTC) X-FDA: 81829639038.17.E9CEC5A Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by imf21.hostedemail.com (Postfix) with ESMTP id 338FA1C000C for ; Sun, 25 Feb 2024 08:24:17 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=jczufwZQ; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf21.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.17 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708849457; a=rsa-sha256; cv=none; b=0RVvpMp5SCR0BqBlyvbcKYbAyUdRMdiU0trc/1lKh1Woq+r/Ipsjso3vGqjxV5EM9RWj7D YZ8oh+sG9SQZkB1peHrry1QecwvwgovN2HVJUtIpU+wHAQgR3qJUKn3y5ATwtC10mQmL/s D3ybblhbZbXs86XWwRbTwfvK0Arddiw= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=jczufwZQ; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf21.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.17 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=1708849457; 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=eDTyFtrHY5fm0A6+zH2CclfNUTQWQvDuQ2oRHAqG5VTTR74LunMjdDTisNKygm7UCgKhTU X7un2J43DKqNNkOsf33zk7ZRFH1zVPz/0iPGVUTRJpJ+4V7vU9FIhRWR1uQEozudcJZcoo G6afqWZv8Q84SbbMXw9772Qu5Hzcmek= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708849457; x=1740385457; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OFY0cfHR/dm9OGHwjR/w6MaeqHarFwrIQpExmOosGtk=; b=jczufwZQKSCUkUIAU8QmRYaKPrNH5vUvRmixi/tHKb5RG/reNujjrMya Vm/dl5dE90/W4L6XeDMBw/xp0WK8nPxMH8ZZSdfyBC4WtSlE+B/jq6IEp 8fRSk5ScheEuRmH0vXjzNmtEtAYeXO38KTDwceIn4Gg1ekrU1pxnTVK5q ZazJjxYTvf9z5M7LLkobT5b+xLcCa+k3XEI9AHkwpj8y4rmD67zvNnb4u 1vkrwzONuyaV9YaJCi+QlJcQjgxZi2STe/5ZiHVaRPihUCwhQybN2e1A+ hUlPS2GfJ2HVgC0/sgwRkfg5+QHrt32za60ZJlGH+OmLmDYk01uby97xo g==; X-IronPort-AV: E=McAfee;i="6600,9927,10994"; a="2988374" X-IronPort-AV: E=Sophos;i="6.06,183,1705392000"; d="scan'208";a="2988374" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Feb 2024 00:24:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,183,1705392000"; d="scan'208";a="6783260" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Feb 2024 00:24:13 -0800 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 v12 5/8] udmabuf: Add back support for mapping hugetlb pages Date: Sat, 24 Feb 2024 23:57:01 -0800 Message-ID: <20240225080008.1019653-6-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240225080008.1019653-1-vivek.kasireddy@intel.com> References: <20240225080008.1019653-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 338FA1C000C X-Stat-Signature: rfsqdmumkb3w96ppxppsfkytima5oxwz X-HE-Tag: 1708849457-73345 X-HE-Meta: U2FsdGVkX18yM2KDOjrmfZCEO/kncF7biMfR68Gdo/RpE6mdTSEPh7nrnFlvkZa+JkXw/WqGxcnv9llBCzWM24WF+sWb6rurQit2tm0eb2V5qzgwsesO/76WfqQeWk/C9eKqAmCzHCV9YPgJkSQMRNmD5GwWypRCN1uNZn71nh5CEQpXIP9ktrBQLg67WkupZbyYNrJxnVgdxTjbjeicyMzWxfxbuXd3iB6mkqDgAlhN/uNCjTeVyxor7mmmUUOcZnAkrufqJfv3VquNH4MI4iIVqlLI52onFJGsDGyF4tFqsDyZLumVQrYUz+x13ymZgxEFNxDz7IIn1pmx4YJ9nJO/IjnVAGkX2i6rXD5cbvEyHTUUhmpsS/jQyJUNR3qWBFCOMnBTDOKzRn342St5zj2ZIMI+rfoD0CTZ7ie55IuY0fVmHxLm3fCePBFuW4ZUMFjPSJlbLJrKIpKpS/srBX5V4av02SUy7OgAZJVibQ4XA9bWdr9uMJNwZXnopEI4RzX7QAlM9cg2wOTDREmio30j+yxlnMqxa7fz0BlWMN8NXJunkepQamK5QF7JIDz6s9JGYLF+eddJxl9ggAnPlQ3ykYYNJWp/Ol9ksSKBmJcgMs5BeSKIxaeMwTsHmf2AD3+giheFZziYYg2uvW3zu8T2ZIj+y6tAFQK4wloZE6rCpeI933beW7ckuzrt6huhmRJsRxMzNpM1+TmWcE1FAcB/uNrg2+bSNpXJseheOr4piS2U8/Gvx/4TUe0MwBFSC6L6HYM7R5N+XQn0ZHsBefUX30brVpFtx4veQjto7/JTq5Wa8dGUKMoUwk+Xy2wHXzU/NVhrR0BraVK++tjPOVjMJmElqXV8ALWQG95L6ijqoboccfUSbPlYQV8FUEMpEqLfZcbVsz387SjdCMl0DMvhyTuwsyMyiZDB0S3TWlDMPJIykKQm7wiWpLJLUJZHlVw5iVYhRHaHFiBa2Ug fHgsUuqQ 6V+va/j02X6VRi0FHcDMpzT1uPraXBYyAV6N5gnks6w3hDsx/sP2cKKaexwAcs2nozgNFXxWFiKAXOsdBUH8C1IJykkNV254zhavaOBpGjQYnLjy7FQ1Ej/mET3dq9NYo0F3dGLcbbhLABVMYBxWpTaQOdYS7HZh0F2u4HyKwf1WWlLVun6t9GA7OkiAZ+cSbQyq5GJU+MbgBGlGb/QSqprvg2SzTrnvFrBxLM93o/BK11/myTb3vBuVoi+3zd7xYlnpq 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;