From: Christoph Hellwig <hch@lst.de> To: Andrew Morton <akpm@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org>, Boris Ostrovsky <boris.ostrovsky@oracle.com>, Juergen Gross <jgross@suse.com>, Stefano Stabellini <sstabellini@kernel.org>, Jani Nikula <jani.nikula@linux.intel.com>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Minchan Kim <minchan@kernel.org>, Nitin Gupta <ngupta@vflare.org>, x86@kernel.org, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org Subject: [PATCH 2/6] mm: add a vmap_pfn function Date: Fri, 18 Sep 2020 18:37:20 +0200 [thread overview] Message-ID: <20200918163724.2511-3-hch@lst.de> (raw) In-Reply-To: <20200918163724.2511-1-hch@lst.de> Add a proper helper to remap PFNs into kernel virtual space so that drivers don't have to abuse alloc_vm_area and open coded PTE manipulation for it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/linux/vmalloc.h | 1 + mm/Kconfig | 3 +++ mm/vmalloc.c | 45 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 0221f852a7e1a3..8ecd92a947ee0c 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -121,6 +121,7 @@ extern void vfree_atomic(const void *addr); extern void *vmap(struct page **pages, unsigned int count, unsigned long flags, pgprot_t prot); +void *vmap_pfn(unsigned long *pfns, unsigned int count, pgprot_t prot); extern void vunmap(const void *addr); extern int remap_vmalloc_range_partial(struct vm_area_struct *vma, diff --git a/mm/Kconfig b/mm/Kconfig index 6c974888f86f97..6fa7ba1199eb1e 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -815,6 +815,9 @@ config DEVICE_PRIVATE memory; i.e., memory that is only accessible from the device (or group of devices). You likely also want to select HMM_MIRROR. +config VMAP_PFN + bool + config FRAME_VECTOR bool diff --git a/mm/vmalloc.c b/mm/vmalloc.c index be4724b916b3e7..59f2afcf26c312 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2407,6 +2407,51 @@ void *vmap(struct page **pages, unsigned int count, } EXPORT_SYMBOL(vmap); +#ifdef CONFIG_VMAP_PFN +struct vmap_pfn_data { + unsigned long *pfns; + pgprot_t prot; + unsigned int idx; +}; + +static int vmap_pfn_apply(pte_t *pte, unsigned long addr, void *private) +{ + struct vmap_pfn_data *data = private; + + if (WARN_ON_ONCE(pfn_valid(data->pfns[data->idx]))) + return -EINVAL; + *pte = pte_mkspecial(pfn_pte(data->pfns[data->idx++], data->prot)); + return 0; +} + +/** + * vmap_pfn - map an array of PFNs into virtually contiguous space + * @pfns: array of PFNs + * @count: number of pages to map + * @prot: page protection for the mapping + * + * Maps @count PFNs from @pfns into contiguous kernel virtual space and returns + * the start address of the mapping. + */ +void *vmap_pfn(unsigned long *pfns, unsigned int count, pgprot_t prot) +{ + struct vmap_pfn_data data = { .pfns = pfns, .prot = pgprot_nx(prot) }; + struct vm_struct *area; + + area = get_vm_area_caller(count * PAGE_SIZE, VM_IOREMAP, + __builtin_return_address(0)); + if (!area) + return NULL; + if (apply_to_page_range(&init_mm, (unsigned long)area->addr, + count * PAGE_SIZE, vmap_pfn_apply, &data)) { + free_vm_area(area); + return NULL; + } + return area->addr; +} +EXPORT_SYMBOL_GPL(vmap_pfn); +#endif /* CONFIG_VMAP_PFN */ + static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, pgprot_t prot, int node) { -- 2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Andrew Morton <akpm@linux-foundation.org> Cc: Juergen Gross <jgross@suse.com>, Stefano Stabellini <sstabellini@kernel.org>, linux-mm@kvack.org, Peter Zijlstra <peterz@infradead.org>, intel-gfx@lists.freedesktop.org, x86@kernel.org, linux-kernel@vger.kernel.org, Minchan Kim <minchan@kernel.org>, dri-devel@lists.freedesktop.org, xen-devel@lists.xenproject.org, Boris Ostrovsky <boris.ostrovsky@oracle.com>, Nitin Gupta <ngupta@vflare.org> Subject: [Intel-gfx] [PATCH 2/6] mm: add a vmap_pfn function Date: Fri, 18 Sep 2020 18:37:20 +0200 [thread overview] Message-ID: <20200918163724.2511-3-hch@lst.de> (raw) In-Reply-To: <20200918163724.2511-1-hch@lst.de> Add a proper helper to remap PFNs into kernel virtual space so that drivers don't have to abuse alloc_vm_area and open coded PTE manipulation for it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/linux/vmalloc.h | 1 + mm/Kconfig | 3 +++ mm/vmalloc.c | 45 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 0221f852a7e1a3..8ecd92a947ee0c 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -121,6 +121,7 @@ extern void vfree_atomic(const void *addr); extern void *vmap(struct page **pages, unsigned int count, unsigned long flags, pgprot_t prot); +void *vmap_pfn(unsigned long *pfns, unsigned int count, pgprot_t prot); extern void vunmap(const void *addr); extern int remap_vmalloc_range_partial(struct vm_area_struct *vma, diff --git a/mm/Kconfig b/mm/Kconfig index 6c974888f86f97..6fa7ba1199eb1e 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -815,6 +815,9 @@ config DEVICE_PRIVATE memory; i.e., memory that is only accessible from the device (or group of devices). You likely also want to select HMM_MIRROR. +config VMAP_PFN + bool + config FRAME_VECTOR bool diff --git a/mm/vmalloc.c b/mm/vmalloc.c index be4724b916b3e7..59f2afcf26c312 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2407,6 +2407,51 @@ void *vmap(struct page **pages, unsigned int count, } EXPORT_SYMBOL(vmap); +#ifdef CONFIG_VMAP_PFN +struct vmap_pfn_data { + unsigned long *pfns; + pgprot_t prot; + unsigned int idx; +}; + +static int vmap_pfn_apply(pte_t *pte, unsigned long addr, void *private) +{ + struct vmap_pfn_data *data = private; + + if (WARN_ON_ONCE(pfn_valid(data->pfns[data->idx]))) + return -EINVAL; + *pte = pte_mkspecial(pfn_pte(data->pfns[data->idx++], data->prot)); + return 0; +} + +/** + * vmap_pfn - map an array of PFNs into virtually contiguous space + * @pfns: array of PFNs + * @count: number of pages to map + * @prot: page protection for the mapping + * + * Maps @count PFNs from @pfns into contiguous kernel virtual space and returns + * the start address of the mapping. + */ +void *vmap_pfn(unsigned long *pfns, unsigned int count, pgprot_t prot) +{ + struct vmap_pfn_data data = { .pfns = pfns, .prot = pgprot_nx(prot) }; + struct vm_struct *area; + + area = get_vm_area_caller(count * PAGE_SIZE, VM_IOREMAP, + __builtin_return_address(0)); + if (!area) + return NULL; + if (apply_to_page_range(&init_mm, (unsigned long)area->addr, + count * PAGE_SIZE, vmap_pfn_apply, &data)) { + free_vm_area(area); + return NULL; + } + return area->addr; +} +EXPORT_SYMBOL_GPL(vmap_pfn); +#endif /* CONFIG_VMAP_PFN */ + static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, pgprot_t prot, int node) { -- 2.28.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-09-18 16:44 UTC|newest] Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-18 16:37 remove alloc_vm_area Christoph Hellwig 2020-09-18 16:37 ` [Intel-gfx] " Christoph Hellwig 2020-09-18 16:37 ` [PATCH 1/6] zsmalloc: switch from alloc_vm_area to get_vm_area Christoph Hellwig 2020-09-18 16:37 ` [Intel-gfx] " Christoph Hellwig 2020-09-21 17:42 ` Minchan Kim 2020-09-21 17:42 ` [Intel-gfx] " Minchan Kim 2020-09-21 17:42 ` Minchan Kim 2020-09-21 18:17 ` Christoph Hellwig 2020-09-21 18:17 ` [Intel-gfx] " Christoph Hellwig 2020-09-21 18:42 ` Minchan Kim 2020-09-21 18:42 ` [Intel-gfx] " Minchan Kim 2020-09-21 18:42 ` Minchan Kim 2020-09-21 18:43 ` Christoph Hellwig 2020-09-21 18:43 ` [Intel-gfx] " Christoph Hellwig 2020-09-18 16:37 ` Christoph Hellwig [this message] 2020-09-18 16:37 ` [Intel-gfx] [PATCH 2/6] mm: add a vmap_pfn function Christoph Hellwig 2020-09-18 16:37 ` [PATCH 3/6] drm/i915: use vmap in shmem_pin_map Christoph Hellwig 2020-09-18 16:37 ` [Intel-gfx] " Christoph Hellwig 2020-09-21 19:11 ` Matthew Wilcox 2020-09-21 19:11 ` [Intel-gfx] " Matthew Wilcox 2020-09-21 19:11 ` Matthew Wilcox 2020-09-22 6:22 ` Christoph Hellwig 2020-09-22 6:22 ` [Intel-gfx] " Christoph Hellwig 2020-09-22 8:23 ` Tvrtko Ursulin 2020-09-22 8:23 ` Tvrtko Ursulin 2020-09-22 8:23 ` Tvrtko Ursulin 2020-09-22 14:31 ` Christoph Hellwig 2020-09-22 14:31 ` Christoph Hellwig 2020-09-22 16:13 ` Tvrtko Ursulin 2020-09-22 16:13 ` Tvrtko Ursulin 2020-09-22 16:13 ` Tvrtko Ursulin 2020-09-22 16:33 ` Christoph Hellwig 2020-09-22 16:33 ` Christoph Hellwig 2020-09-22 17:04 ` Tvrtko Ursulin 2020-09-22 17:04 ` Tvrtko Ursulin 2020-09-22 17:04 ` Tvrtko Ursulin 2020-09-23 6:11 ` Christoph Hellwig 2020-09-23 6:11 ` Christoph Hellwig 2020-09-22 11:21 ` Matthew Wilcox 2020-09-22 11:21 ` [Intel-gfx] " Matthew Wilcox 2020-09-22 11:21 ` Matthew Wilcox 2020-09-22 14:39 ` Christoph Hellwig 2020-09-22 14:39 ` [Intel-gfx] " Christoph Hellwig 2020-09-22 14:53 ` Matthew Wilcox 2020-09-22 14:53 ` [Intel-gfx] " Matthew Wilcox 2020-09-22 14:53 ` Matthew Wilcox 2020-09-18 16:37 ` [PATCH 4/6] drm/i915: use vmap in i915_gem_object_map Christoph Hellwig 2020-09-18 16:37 ` [Intel-gfx] " Christoph Hellwig 2020-09-23 9:52 ` Tvrtko Ursulin 2020-09-23 9:52 ` Tvrtko Ursulin 2020-09-23 9:52 ` Tvrtko Ursulin 2020-09-23 13:41 ` Christoph Hellwig 2020-09-23 13:41 ` Christoph Hellwig 2020-09-23 13:58 ` Tvrtko Ursulin 2020-09-23 13:58 ` Tvrtko Ursulin 2020-09-23 13:58 ` Tvrtko Ursulin 2020-09-23 14:44 ` Christoph Hellwig 2020-09-23 14:44 ` Christoph Hellwig 2020-09-24 12:22 ` Tvrtko Ursulin 2020-09-24 12:22 ` Tvrtko Ursulin 2020-09-24 12:22 ` Tvrtko Ursulin 2020-09-24 13:23 ` Christoph Hellwig 2020-09-24 13:23 ` Christoph Hellwig 2020-09-18 16:37 ` [PATCH 5/6] xen/xenbus: use apply_to_page_range directly in xenbus_map_ring_pv Christoph Hellwig 2020-09-18 16:37 ` [Intel-gfx] " Christoph Hellwig 2020-09-18 16:37 ` [PATCH 6/6] x86/xen: open code alloc_vm_area in arch_gnttab_valloc Christoph Hellwig 2020-09-18 16:37 ` [Intel-gfx] " Christoph Hellwig 2020-09-21 20:44 ` boris.ostrovsky 2020-09-21 20:44 ` [Intel-gfx] " boris.ostrovsky 2020-09-21 20:44 ` boris.ostrovsky 2020-09-22 14:58 ` Christoph Hellwig 2020-09-22 14:58 ` [Intel-gfx] " Christoph Hellwig 2020-09-22 15:24 ` boris.ostrovsky 2020-09-22 15:24 ` [Intel-gfx] " boris.ostrovsky 2020-09-22 15:24 ` boris.ostrovsky 2020-09-22 15:27 ` Christoph Hellwig 2020-09-22 15:27 ` [Intel-gfx] " Christoph Hellwig 2020-09-22 15:34 ` boris.ostrovsky 2020-09-22 15:34 ` [Intel-gfx] " boris.ostrovsky 2020-09-22 15:34 ` boris.ostrovsky 2020-09-18 17:03 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/6] zsmalloc: switch from alloc_vm_area to get_vm_area Patchwork 2020-09-21 17:50 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/6] zsmalloc: switch from alloc_vm_area to get_vm_area (rev2) Patchwork 2020-09-21 18:47 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/6] zsmalloc: switch from alloc_vm_area to get_vm_area (rev3) Patchwork 2020-09-22 14:44 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/6] zsmalloc: switch from alloc_vm_area to get_vm_area (rev4) Patchwork 2020-09-22 15:01 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/6] zsmalloc: switch from alloc_vm_area to get_vm_area (rev5) Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200918163724.2511-3-hch@lst.de \ --to=hch@lst.de \ --cc=akpm@linux-foundation.org \ --cc=boris.ostrovsky@oracle.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@linux.intel.com \ --cc=jgross@suse.com \ --cc=joonas.lahtinen@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=minchan@kernel.org \ --cc=ngupta@vflare.org \ --cc=peterz@infradead.org \ --cc=rodrigo.vivi@intel.com \ --cc=sstabellini@kernel.org \ --cc=x86@kernel.org \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.