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>, Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>, Chris Wilson <chris@chris-wilson.co.uk>, Matthew Auld <matthew.auld@intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Minchan Kim <minchan@kernel.org>, Matthew Wilcox <willy@infradead.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 02/11] mm: add a VM_MAP_PUT_PAGES flag for vmap Date: Thu, 24 Sep 2020 15:58:44 +0200 [thread overview] Message-ID: <20200924135853.875294-3-hch@lst.de> (raw) In-Reply-To: <20200924135853.875294-1-hch@lst.de> Add a flag so that vmap takes ownership of the passed in page array. When vfree is called on such an allocation it will put one reference on each page, and free the page array itself. Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/linux/vmalloc.h | 1 + mm/vmalloc.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 0221f852a7e1a3..b899681e3ff9f0 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -24,6 +24,7 @@ struct notifier_block; /* in notifier.h */ #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */ #define VM_NO_GUARD 0x00000040 /* don't add guard page */ #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */ +#define VM_MAP_PUT_PAGES 0x00000100 /* put pages and free array in vfree */ /* * VM_KASAN is used slighly differently depending on CONFIG_KASAN_VMALLOC. diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 8770260419af06..ffad65f052c3f9 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2377,8 +2377,11 @@ EXPORT_SYMBOL(vunmap); * @flags: vm_area->flags * @prot: page protection for the mapping * - * Maps @count pages from @pages into contiguous kernel virtual - * space. + * Maps @count pages from @pages into contiguous kernel virtual space. + * If @flags contains %VM_MAP_PUT_PAGES the ownership of the pages array itself + * (which must be kmalloc or vmalloc memory) and one reference per pages in it + * are transferred from the caller to vmap(), and will be freed / dropped when + * vfree() is called on the return value. * * Return: the address of the area or %NULL on failure */ @@ -2404,6 +2407,8 @@ void *vmap(struct page **pages, unsigned int count, return NULL; } + if (flags & VM_MAP_PUT_PAGES) + area->pages = pages; return area->addr; } EXPORT_SYMBOL(vmap); -- 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>, Matthew Wilcox <willy@infradead.org>, dri-devel@lists.freedesktop.org, linux-mm@kvack.org, Peter Zijlstra <peterz@infradead.org>, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, x86@kernel.org, Chris Wilson <chris@chris-wilson.co.uk>, Minchan Kim <minchan@kernel.org>, Matthew Auld <matthew.auld@intel.com>, xen-devel@lists.xenproject.org, Boris Ostrovsky <boris.ostrovsky@oracle.com>, Nitin Gupta <ngupta@vflare.org> Subject: [Intel-gfx] [PATCH 02/11] mm: add a VM_MAP_PUT_PAGES flag for vmap Date: Thu, 24 Sep 2020 15:58:44 +0200 [thread overview] Message-ID: <20200924135853.875294-3-hch@lst.de> (raw) In-Reply-To: <20200924135853.875294-1-hch@lst.de> Add a flag so that vmap takes ownership of the passed in page array. When vfree is called on such an allocation it will put one reference on each page, and free the page array itself. Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/linux/vmalloc.h | 1 + mm/vmalloc.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 0221f852a7e1a3..b899681e3ff9f0 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -24,6 +24,7 @@ struct notifier_block; /* in notifier.h */ #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */ #define VM_NO_GUARD 0x00000040 /* don't add guard page */ #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */ +#define VM_MAP_PUT_PAGES 0x00000100 /* put pages and free array in vfree */ /* * VM_KASAN is used slighly differently depending on CONFIG_KASAN_VMALLOC. diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 8770260419af06..ffad65f052c3f9 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2377,8 +2377,11 @@ EXPORT_SYMBOL(vunmap); * @flags: vm_area->flags * @prot: page protection for the mapping * - * Maps @count pages from @pages into contiguous kernel virtual - * space. + * Maps @count pages from @pages into contiguous kernel virtual space. + * If @flags contains %VM_MAP_PUT_PAGES the ownership of the pages array itself + * (which must be kmalloc or vmalloc memory) and one reference per pages in it + * are transferred from the caller to vmap(), and will be freed / dropped when + * vfree() is called on the return value. * * Return: the address of the area or %NULL on failure */ @@ -2404,6 +2407,8 @@ void *vmap(struct page **pages, unsigned int count, return NULL; } + if (flags & VM_MAP_PUT_PAGES) + area->pages = pages; return area->addr; } EXPORT_SYMBOL(vmap); -- 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-24 13:59 UTC|newest] Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-24 13:58 remove alloc_vm_area v2 Christoph Hellwig 2020-09-24 13:58 ` [Intel-gfx] " Christoph Hellwig 2020-09-24 13:58 ` [PATCH 01/11] mm: update the documentation for vfree Christoph Hellwig 2020-09-24 13:58 ` [Intel-gfx] " Christoph Hellwig 2020-09-24 13:58 ` Christoph Hellwig [this message] 2020-09-24 13:58 ` [Intel-gfx] [PATCH 02/11] mm: add a VM_MAP_PUT_PAGES flag for vmap Christoph Hellwig 2020-09-24 13:58 ` [PATCH 03/11] mm: add a vmap_pfn function Christoph Hellwig 2020-09-24 13:58 ` [Intel-gfx] " Christoph Hellwig 2020-09-24 13:58 ` [PATCH 04/11] mm: allow a NULL fn callback in apply_to_page_range Christoph Hellwig 2020-09-24 13:58 ` [Intel-gfx] " Christoph Hellwig 2020-09-24 13:58 ` [PATCH 05/11] zsmalloc: switch from alloc_vm_area to get_vm_area Christoph Hellwig 2020-09-24 13:58 ` [Intel-gfx] " Christoph Hellwig 2020-09-24 13:58 ` [PATCH 06/11] drm/i915: use vmap in shmem_pin_map Christoph Hellwig 2020-09-24 13:58 ` [Intel-gfx] " Christoph Hellwig 2020-09-25 13:05 ` Tvrtko Ursulin 2020-09-25 13:05 ` [Intel-gfx] " Tvrtko Ursulin 2020-09-25 13:05 ` Tvrtko Ursulin 2020-09-24 13:58 ` [PATCH 07/11] drm/i915: stop using kmap in i915_gem_object_map Christoph Hellwig 2020-09-24 13:58 ` [Intel-gfx] " Christoph Hellwig 2020-09-25 13:01 ` Tvrtko Ursulin 2020-09-25 13:01 ` [Intel-gfx] " Tvrtko Ursulin 2020-09-25 13:01 ` Tvrtko Ursulin 2020-09-24 13:58 ` [PATCH 08/11] drm/i915: use vmap " Christoph Hellwig 2020-09-24 13:58 ` [Intel-gfx] " Christoph Hellwig 2020-09-25 13:11 ` Tvrtko Ursulin 2020-09-25 13:11 ` [Intel-gfx] " Tvrtko Ursulin 2020-09-25 13:11 ` Tvrtko Ursulin 2020-09-25 14:08 ` [Intel-gfx] " Matthew Auld 2020-09-25 14:08 ` Matthew Auld 2020-09-25 14:08 ` Matthew Auld 2020-09-25 14:08 ` Matthew Auld 2020-09-25 14:08 ` Matthew Auld 2020-09-25 16:02 ` Christoph Hellwig 2020-09-25 16:02 ` Christoph Hellwig 2020-09-25 16:09 ` [PATCH 08/11, fixed] " Christoph Hellwig 2020-09-25 16:09 ` [Intel-gfx] " Christoph Hellwig 2020-09-24 13:58 ` [PATCH 09/11] xen/xenbus: use apply_to_page_range directly in xenbus_map_ring_pv Christoph Hellwig 2020-09-24 13:58 ` [Intel-gfx] " Christoph Hellwig 2020-09-24 23:42 ` boris.ostrovsky 2020-09-24 23:42 ` [Intel-gfx] " boris.ostrovsky 2020-09-24 23:42 ` boris.ostrovsky 2020-09-24 13:58 ` [PATCH 10/11] x86/xen: open code alloc_vm_area in arch_gnttab_valloc Christoph Hellwig 2020-09-24 13:58 ` [Intel-gfx] " Christoph Hellwig 2020-09-24 23:43 ` boris.ostrovsky 2020-09-24 23:43 ` [Intel-gfx] " boris.ostrovsky 2020-09-24 23:43 ` boris.ostrovsky 2020-09-24 13:58 ` [PATCH 11/11] mm: remove alloc_vm_area Christoph Hellwig 2020-09-24 13:58 ` [Intel-gfx] " Christoph Hellwig 2020-09-24 15:09 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/11] mm: update the documentation for vfree Patchwork 2020-09-24 15:34 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-09-24 20:44 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2020-09-25 16:50 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [01/11] mm: update the documentation for vfree (rev2) Patchwork 2020-09-26 0:08 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2020-09-26 2:43 ` remove alloc_vm_area v2 Andrew Morton 2020-09-26 2:43 ` [Intel-gfx] " Andrew Morton 2020-09-26 2:43 ` Andrew Morton 2020-09-26 6:29 ` Christoph Hellwig 2020-09-26 6:29 ` [Intel-gfx] " Christoph Hellwig 2020-09-28 10:13 ` Joonas Lahtinen 2020-09-28 10:13 ` [Intel-gfx] " Joonas Lahtinen 2020-09-28 10:13 ` Joonas Lahtinen 2020-09-28 12:37 ` Christoph Hellwig 2020-09-28 12:37 ` [Intel-gfx] " Christoph Hellwig 2020-09-29 12:43 ` Joonas Lahtinen 2020-09-29 12:43 ` [Intel-gfx] " Joonas Lahtinen 2020-09-29 12:43 ` Joonas Lahtinen 2020-09-30 14:48 ` Christoph Hellwig 2020-09-30 14:48 ` [Intel-gfx] " Christoph Hellwig 2020-09-30 18:37 ` Daniel Vetter 2020-09-30 18:37 ` [Intel-gfx] " Daniel Vetter 2020-09-30 18:37 ` Daniel Vetter 2020-09-30 18:37 ` Daniel Vetter 2020-10-02 12:21 remove alloc_vm_area v4 Christoph Hellwig 2020-10-02 12:21 ` [PATCH 02/11] mm: add a VM_MAP_PUT_PAGES flag for vmap Christoph Hellwig
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=20200924135853.875294-3-hch@lst.de \ --to=hch@lst.de \ --cc=akpm@linux-foundation.org \ --cc=boris.ostrovsky@oracle.com \ --cc=chris@chris-wilson.co.uk \ --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=matthew.auld@intel.com \ --cc=minchan@kernel.org \ --cc=ngupta@vflare.org \ --cc=peterz@infradead.org \ --cc=rodrigo.vivi@intel.com \ --cc=sstabellini@kernel.org \ --cc=tvrtko.ursulin@linux.intel.com \ --cc=willy@infradead.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.