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 5E7A0C27C4F for ; Thu, 13 Jun 2024 22:13:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 929366B009B; Thu, 13 Jun 2024 18:13:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8D6EE6B009C; Thu, 13 Jun 2024 18:13:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 750DF6B009D; Thu, 13 Jun 2024 18:13:45 -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 551C66B009B for ; Thu, 13 Jun 2024 18:13:45 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id ED66D40300 for ; Thu, 13 Jun 2024 22:13:44 +0000 (UTC) X-FDA: 82227268368.14.8117B31 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by imf09.hostedemail.com (Postfix) with ESMTP id C6BC6140004 for ; Thu, 13 Jun 2024 22:13:42 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="G2w/6qFG"; spf=pass (imf09.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.8 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=1718316822; 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=fYNzMo8R9IZza3lof7PJHFdB/0yyaWpys8zRImzF5hA=; b=qtw+XH8otFdp7w14rpCoJ/tOUkAVvS4Iz2eghesCXpfqrqmzzAOwfFASNXxtorOvgLQjFe R4LADgcA22oD1K30peEN9Ff9nG6HnJNFjKCvMcCKnJMMpndELaAculJKFPZQRqLK0mZilO qPF4Rz3Pi7BFtr5ZZRFIkMA9ub/NzA4= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="G2w/6qFG"; spf=pass (imf09.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.8 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=1718316822; a=rsa-sha256; cv=none; b=Aey3weAUdk57YttPgU9Iz6rMIIl3vAxxKDrpNhuc+/reQ3eXmPZurnosj0a7b44EsoG7WC L6aHXRZWh4hbDF95iyj+x+ymN3YSSyJGG/3OucNf4xkY2jleKV2KhEpwDVH7qZlENjBRmC h8d8qDjnVuLytTFQjXoZ0iTVlynAB58= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718316823; x=1749852823; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KWfvKYp6qtQmdJwHokBW0M3ksxOQNq0tWLBPfJBLXlM=; b=G2w/6qFGYbN4ryMaUiTHXxjLw7Ql9XjNbhSeDinOcG8c9mhqVvhVVs/Y oeSMTC6fvHoI7VzWTOPUFzYDQCnfexZZpDTB0tHx3fFf1EcKahmhfGcq+ BUhf5sxGImKy2j5VXWVlmZm+ktp/kaP/tXsD8jKAriGukLQhyzceeQTcz IfN3DFYmfda5Zz4pxWcpJOfZCyPUFGOHeksdVQTmWjfb8p9PulTc/okTM RFcoJUK6L123KPi2i+cFpzY+fGC9mYi+vn9RPIJYwdHGTJhg4dxZ2ol0j kkKup/MFkATrg3pczkUjdgQn0vD7vAhrOFuPufsABjkbmkTDRk8NlKZ/4 A==; X-CSE-ConnectionGUID: 047d/c5sRC+lBJh2wxLXGA== X-CSE-MsgGUID: F6N0p2ZzQvC5StyqrjyWkA== X-IronPort-AV: E=McAfee;i="6700,10204,11102"; a="32720557" X-IronPort-AV: E=Sophos;i="6.08,236,1712646000"; d="scan'208";a="32720557" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2024 15:13:37 -0700 X-CSE-ConnectionGUID: Iw7WpsIcSCOsE8JejDKvRg== X-CSE-MsgGUID: m6PDUEu0TtWRmlcYtDwzMw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,236,1712646000"; d="scan'208";a="45214107" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2024 15:13:37 -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 , Dave Airlie Subject: [PATCH v15 6/9] udmabuf: Add back support for mapping hugetlb pages Date: Thu, 13 Jun 2024 14:42:08 -0700 Message-ID: <20240613214741.1029446-7-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240613214741.1029446-1-vivek.kasireddy@intel.com> References: <20240613214741.1029446-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: C6BC6140004 X-Stat-Signature: bsxmt73s9h5xdbe6hm7d3jwq9e3ip1s7 X-HE-Tag: 1718316822-312958 X-HE-Meta: U2FsdGVkX1+tJcpNfVOcZVIj3yBYlmWSqpjUSAkK1uaHG266XoixiDPeoK7IToghjthUDxs2CdessTZQrStKOT9q6a2WbwyrWZqds85L9/VO4MTdSw/lp4pO5hhNANZphbTaLgLB6udbCx9f7LIIHSGjWItck6Z6GGqzAtNMyOlEGlRgeoCUtuwj/Gm2H4Gg68hqstg1QgXH8CawZkskrx7aT355n5xHvszx6yX9xnTfwRWSKruOonNRywkuJMSFy+tGo4vZbweHgawwmvnRNyi7MlRxcRvufJv2Z5R6+bNbod8RB9mEbe73IyHNZCp0CY/qFWsgA4XQkQ4VP5dr4WqwUnJNr1Q75ddpWi+/8kGKieufnVGoDD0Et/ulmjaXXO6t/dAzOlAMIZ1EHjUmqUpo7DH2lbrhOo9GqTie6AU/fejXPdugeAvk+rTMal7+M03n2NDYLH9QmGUtFVBpb0pcAcgycsnuMZJGXU/wxqkhQO4yxur+aGCuX0XdVo7kmwEMSpo3uryRSYbXjJH4+8DYJJeF5aW0tkSZYiFpRVEuixxgJKzft92Pd375zvyekz7H7OlunXrocdqPjnXUlp66fNBkMAL6uSYW0C60oNppd6uNxXXoE7AcOIr6ffFj+0Y/syzZPT54wPKakut31ZJYmftHnghjdy9RkgUusTNzsrNgk8pAFO1MP4LL6NwVXBzqXI5AuwXw5fvArY0RKSymzj7NNXuG6rZidjK1pbhsFD+83EopGWmrquX1dct3JNjOgmO1dNugFD26LCqFXK6nMiTEvWUNi6atD/5h1S2QnmpQkfh44Zo7xHNXpZqFce+oxPtdwQ/OwEFMUHOYbdYwcVJc6vStPUrPB7bIommCDdp95BqA8VuaZlM+9DB4BiRw0I3FNrit4vMbe4ia6+bIp0RoZ5EvUenNoVgEEEVQmr7Uo8jV+bwDqixZJnXhes6Rgs/vtWj9yLrlNyF FuoB4jy4 3cip6aAl9a/NFmYTcoatNbkdDE8J617rvLYhDkPE280pCmpfHzVzNMTw+8oG3/f5/Hj7hRlUEsk/NUKU35j/RaJ9wiHELB/LhRglVjgtJtC83GY55pp39CsHJ84BboceLREV90YhX71syaslWxGmQLmGHEWObiujTcrvmdcZAvZ8QjrqccHMANKT/7tDeUEXBq11rx1GLYqiObz9McNaeWf4jPB/2bd8WF5UySs9TvhRNmZId99dsxG+afg== 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) Acked-by: Dave Airlie Acked-by: Gerd Hoffmann 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; -- 2.45.1