From patchwork Tue Dec 12 07:37:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Kasireddy X-Patchwork-Id: 13488633 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 A8AE6C4167D for ; Tue, 12 Dec 2023 08:01:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61BA66B0295; Tue, 12 Dec 2023 03:01:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CACC6B0297; Tue, 12 Dec 2023 03:01:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41D536B0298; Tue, 12 Dec 2023 03:01:32 -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 2C0006B0295 for ; Tue, 12 Dec 2023 03:01:32 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 01FE01208C8 for ; Tue, 12 Dec 2023 08:01:31 +0000 (UTC) X-FDA: 81557421624.20.E34AC32 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by imf08.hostedemail.com (Postfix) with ESMTP id CC839160029 for ; Tue, 12 Dec 2023 08:01:28 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=m3E5X7xO; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf08.hostedemail.com: domain of vivek.kasireddy@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702368089; a=rsa-sha256; cv=none; b=QcGrXcpUEBOmEzGbh1HkddPqAl8gW21r6OSfF7CsFnUO7E8rAIIrwG9s960MXSoc9uiYt2 5wqHPytoo6s0RvB89CH1wGaoAHizNd4qyMv2miFZjrpTCRDRveNNOnRXpqWAuyN/4Y8yQg SeI4eMkMrRX6T1FFzqAlGv55pV1W6Xo= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=m3E5X7xO; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf08.hostedemail.com: domain of vivek.kasireddy@intel.com designates 134.134.136.24 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=1702368089; 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=gnFFCZ/4N7bQ8jwcsO7jGvxgDXP7BPVbDrHLX60MqX8=; b=do+e9LhcHwThZceF6OS4JFCoAu8/5nmuIYGjwAdTkW6NK6QsRis6QravktsioLhF4n6o8z V8D20RqiF8jQXKVwyovNJOBs2ULihc95Z3XZ0/2bL3m8NOUlDgheNpcQmofyLH7XBCIUhe vPtxqDE+KbL1JnesNTjf4TAsNcpSvc0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702368088; x=1733904088; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O1c3JIhGATN1dxcRTvUuRK9RhQSZEkJPgfU5c33zkAo=; b=m3E5X7xOFuAojGv6yUTvgAHqjbsJNu43vGm45Xj8nCvBAkC204b04fMa EIKuZcnZmmZghvAwRQRHG8CfKdbuiNOUDZn1frQJ/LwMdxR1U40FTxHWD VXffwVZv5cWM4oZmS5EGxOZnqIhTqVFy6mwFdvwHhqMnVijQV+egKe6Y4 ytk17c+GJQJN3KfVxm7j0lJLfF2dhvyy4AKxA2C40EBgRtqOvy5MO3r+Z +SSdOx9qwmOSxwO8eM6seNPLw7QOy7f4U3veib7uXLZn0GHoKcgg/Ke0l FmhACc7NoHHcKZxmJnZjZ3cA5o8Wf3qM7d7if0ZFUoJOLLR+qRg9ZP+Pn A==; X-IronPort-AV: E=McAfee;i="6600,9927,10921"; a="397553950" X-IronPort-AV: E=Sophos;i="6.04,269,1695711600"; d="scan'208";a="397553950" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2023 00:01:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10921"; a="802376324" X-IronPort-AV: E=Sophos;i="6.04,269,1695711600"; d="scan'208";a="802376324" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2023 00:01:24 -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 v7 2/6] udmabuf: Add back support for mapping hugetlb pages (v6) Date: Mon, 11 Dec 2023 23:37:59 -0800 Message-Id: <20231212073803.3233055-3-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231212073803.3233055-1-vivek.kasireddy@intel.com> References: <20231212073803.3233055-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: CC839160029 X-Stat-Signature: gn1pc6axcprgafmy1qbjddna4ek3xsxw X-HE-Tag: 1702368088-958027 X-HE-Meta: U2FsdGVkX1/Q874ulQfUf1zrMGOX1xw1WiPq4F9PuPTRyuVVjj/GW20ztQ75JovD4m1h1DJ1v8+GszFNICRf/4++2W3497ofyUrJdQ1zdh2FK9dks/uWWXt/KCtCwftH/q8xoOoqsgltet39/ni7rkyx6yPqTkn17rXiaxWcK49R8rHx7IPl3+wnUdGLN/Mhg9LCG/w4iZbMqXpAIahFwX26oNF6xoMb1D79Lstv2qVjnOUd1S1NrmO8KnFW/PmksfMzz/9g+TqL8myAS7bN07V+r5UKNokoGlhJxgE309nUsUUaol+yskO9mjW9fTDCfaLoB+iFjwezmwFevz9QUmvSfBv6qoMN0Iweo8zsQjXQvX6mrFlKvLXO2FaHJCj11zVW21oDJxmzrPO8R3V0jgmTt7e57Gdp4dgzmXXNrReaZC4MDgPDlkLX3URXa7e7BNrCn0m7tp+JVzETZdhNxvuE+pcBNfeh8DRsYLS9BvnCBNQLpxhSJhKe97sGSC8W+d74LEvniPKtxfg2CsyimRMpMndp73nvI45v82+DMtgT1susaixps8/c4Tt73HHzdcRUmMiiBLRdl/fQS8Vd8Y2H0IaaSkWoC3lJfjmcgUHfPr4CpJEFUh2z3GVPQSk8Pb1RT9i5orjAzLx16++iwuE9JgWsfJV+cpmwVbVjhFULmkoBmvT+zXkPLPmxC6hQOrrs2e/5MN1Ga4ZFtCXetGICH3/zX0FXU+Y+hbvqV6AZ1kRVDBxgU/xnSEQgiRC952WJD7KBvVo/jYXeTS+7MMU9t7asn0d9X4lwZei4FB47iMBEMrVXurO0mm18sEKA4sqTphJz4kocSZrsKWFmtFg8O55FQDj+KqW2YvU9DJ51DAStjDsnpXyfF1vsiBh2h1372+l0CdGrobEC0KqEFT/2qAwuvl6IQ4pxLo0P1Zgb5ezOk8xl2Mpnco2rZFVig1KW7HGK/guHXqV7qmF 784RPKTu gccA0RBpwiazdZUTB+cMJofL+uROFeeIhVn+2/LOCkq9DLXPXp9h1e3jyi2mQp8APiG9djXv3icdriuoMeqZVUrXIh9fBSYswLkZ3TeTZzoOMBoZZuJJ1hGAvIUuR/H6dMWNCGfR0LVAptWkRsaARjlm+AWtwP7WQSzaYFZxl7vyNR0K5yIqw04rSG8vCW50B4h9cy11PhbHWL4vxpDHGaEUZ5dATz9k+iq+RZHBvILTTv+LZkurCukaxWG5spZ5UQtll 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. v2: Updated get_sg_table() to manually populate the scatterlist for both huge page and non-huge-page cases. v3: s/offsets/subpgoff/g s/hpoff/mapidx/g v4: Replaced find_get_page_flags() with __filemap_get_folio() to ensure that we only obtain head pages from the mapping v5: Fix the calculation of mapidx to ensure that it is a order-n page multiple v6: - Split the processing of hugetlb or shmem pages into helpers to simplify the code in udmabuf_create() (Christoph) - Move the creation of offsets array out of hugetlb context and into common code 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;