* [PATCH 1/3] mm: vmalloc: introduce array allocation functions [not found] <20220308105918.615575-1-pbonzini@redhat.com> @ 2022-03-08 10:59 ` Paolo Bonzini 2022-03-08 13:47 ` Michal Hocko 2022-03-08 14:26 ` David Hildenbrand 2022-03-08 10:59 ` [PATCH 3/3] KVM: use vcalloc/__vcalloc for very large allocations Paolo Bonzini 1 sibling, 2 replies; 8+ messages in thread From: Paolo Bonzini @ 2022-03-08 10:59 UTC (permalink / raw) To: linux-kernel, kvm Cc: Michael Ellerman, Andrew Morton, Dennis Zhou, Tejun Heo, Christoph Lameter, Johannes Weiner, Michal Hocko, Vladimir Davydov, linux-mm, cgroups, stable Linux has dozens of occurrences of vmalloc(array_size()) and vzalloc(array_size()). Allow to simplify the code by providing vmalloc_array and vcalloc, as well as the underscored variants that let the caller specify the GFP flags. Cc: stable@vger.kernel.org Cc: linux-mm@kvack.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- include/linux/vmalloc.h | 5 +++++ mm/util.c | 50 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 880227b9f044..d1bbd4fd50c5 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -159,6 +159,11 @@ void *__vmalloc_node(unsigned long size, unsigned long align, gfp_t gfp_mask, int node, const void *caller) __alloc_size(1); void *vmalloc_no_huge(unsigned long size) __alloc_size(1); +extern void *__vmalloc_array(size_t n, size_t size, gfp_t flags) __alloc_size(1, 2); +extern void *vmalloc_array(size_t n, size_t size) __alloc_size(1, 2); +extern void *__vcalloc(size_t n, size_t size, gfp_t flags) __alloc_size(1, 2); +extern void *vcalloc(size_t n, size_t size) __alloc_size(1, 2); + extern void vfree(const void *addr); extern void vfree_atomic(const void *addr); diff --git a/mm/util.c b/mm/util.c index 7e43369064c8..94475abe54a0 100644 --- a/mm/util.c +++ b/mm/util.c @@ -647,6 +647,56 @@ void *kvrealloc(const void *p, size_t oldsize, size_t newsize, gfp_t flags) } EXPORT_SYMBOL(kvrealloc); +/** + * __vmalloc_array - allocate memory for a virtually contiguous array. + * @n: number of elements. + * @size: element size. + * @flags: the type of memory to allocate (see kmalloc). + */ +void *__vmalloc_array(size_t n, size_t size, gfp_t flags) +{ + size_t bytes; + + if (unlikely(check_mul_overflow(n, size, &bytes))) + return NULL; + return __vmalloc(bytes, flags); +} +EXPORT_SYMBOL(__vmalloc_array); + +/** + * vmalloc_array - allocate memory for a virtually contiguous array. + * @n: number of elements. + * @size: element size. + */ +void *vmalloc_array(size_t n, size_t size) +{ + return __vmalloc_array(n, size, GFP_KERNEL); +} +EXPORT_SYMBOL(vmalloc_array); + +/** + * __vcalloc - allocate and zero memory for a virtually contiguous array. + * @n: number of elements. + * @size: element size. + * @flags: the type of memory to allocate (see kmalloc). + */ +void *__vcalloc(size_t n, size_t size, gfp_t flags) +{ + return __vmalloc_array(n, size, flags | __GFP_ZERO); +} +EXPORT_SYMBOL(__vcalloc); + +/** + * vcalloc - allocate and zero memory for a virtually contiguous array. + * @n: number of elements. + * @size: element size. + */ +void *vcalloc(size_t n, size_t size) +{ + return __vmalloc_array(n, size, GFP_KERNEL | __GFP_ZERO); +} +EXPORT_SYMBOL(vcalloc); + /* Neutral page->mapping pointer to address_space or anon_vma or other */ void *page_rmapping(struct page *page) { -- 2.31.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] mm: vmalloc: introduce array allocation functions 2022-03-08 10:59 ` [PATCH 1/3] mm: vmalloc: introduce array allocation functions Paolo Bonzini @ 2022-03-08 13:47 ` Michal Hocko 2022-03-08 13:55 ` Paolo Bonzini 2022-03-08 14:26 ` David Hildenbrand 1 sibling, 1 reply; 8+ messages in thread From: Michal Hocko @ 2022-03-08 13:47 UTC (permalink / raw) To: Paolo Bonzini Cc: linux-kernel, kvm, Michael Ellerman, Andrew Morton, Dennis Zhou, Tejun Heo, Christoph Lameter, Johannes Weiner, Vladimir Davydov, linux-mm, cgroups, stable On Tue 08-03-22 05:59:16, Paolo Bonzini wrote: > Linux has dozens of occurrences of vmalloc(array_size()) and > vzalloc(array_size()). Allow to simplify the code by providing > vmalloc_array and vcalloc, as well as the underscored variants that let > the caller specify the GFP flags. > > Cc: stable@vger.kernel.org > Cc: linux-mm@kvack.org > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Seems useful Acked-by: Michal Hocko <mhocko@suse.com> Is there any reason you haven't used __alloc_size(1, 2) annotation? Thanks! > --- > include/linux/vmalloc.h | 5 +++++ > mm/util.c | 50 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 55 insertions(+) > > diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h > index 880227b9f044..d1bbd4fd50c5 100644 > --- a/include/linux/vmalloc.h > +++ b/include/linux/vmalloc.h > @@ -159,6 +159,11 @@ void *__vmalloc_node(unsigned long size, unsigned long align, gfp_t gfp_mask, > int node, const void *caller) __alloc_size(1); > void *vmalloc_no_huge(unsigned long size) __alloc_size(1); > > +extern void *__vmalloc_array(size_t n, size_t size, gfp_t flags) __alloc_size(1, 2); > +extern void *vmalloc_array(size_t n, size_t size) __alloc_size(1, 2); > +extern void *__vcalloc(size_t n, size_t size, gfp_t flags) __alloc_size(1, 2); > +extern void *vcalloc(size_t n, size_t size) __alloc_size(1, 2); > + > extern void vfree(const void *addr); > extern void vfree_atomic(const void *addr); > > diff --git a/mm/util.c b/mm/util.c > index 7e43369064c8..94475abe54a0 100644 > --- a/mm/util.c > +++ b/mm/util.c > @@ -647,6 +647,56 @@ void *kvrealloc(const void *p, size_t oldsize, size_t newsize, gfp_t flags) > } > EXPORT_SYMBOL(kvrealloc); > > +/** > + * __vmalloc_array - allocate memory for a virtually contiguous array. > + * @n: number of elements. > + * @size: element size. > + * @flags: the type of memory to allocate (see kmalloc). > + */ > +void *__vmalloc_array(size_t n, size_t size, gfp_t flags) > +{ > + size_t bytes; > + > + if (unlikely(check_mul_overflow(n, size, &bytes))) > + return NULL; > + return __vmalloc(bytes, flags); > +} > +EXPORT_SYMBOL(__vmalloc_array); > + > +/** > + * vmalloc_array - allocate memory for a virtually contiguous array. > + * @n: number of elements. > + * @size: element size. > + */ > +void *vmalloc_array(size_t n, size_t size) > +{ > + return __vmalloc_array(n, size, GFP_KERNEL); > +} > +EXPORT_SYMBOL(vmalloc_array); > + > +/** > + * __vcalloc - allocate and zero memory for a virtually contiguous array. > + * @n: number of elements. > + * @size: element size. > + * @flags: the type of memory to allocate (see kmalloc). > + */ > +void *__vcalloc(size_t n, size_t size, gfp_t flags) > +{ > + return __vmalloc_array(n, size, flags | __GFP_ZERO); > +} > +EXPORT_SYMBOL(__vcalloc); > + > +/** > + * vcalloc - allocate and zero memory for a virtually contiguous array. > + * @n: number of elements. > + * @size: element size. > + */ > +void *vcalloc(size_t n, size_t size) > +{ > + return __vmalloc_array(n, size, GFP_KERNEL | __GFP_ZERO); > +} > +EXPORT_SYMBOL(vcalloc); > + > /* Neutral page->mapping pointer to address_space or anon_vma or other */ > void *page_rmapping(struct page *page) > { > -- > 2.31.1 -- Michal Hocko SUSE Labs ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] mm: vmalloc: introduce array allocation functions 2022-03-08 13:47 ` Michal Hocko @ 2022-03-08 13:55 ` Paolo Bonzini 2022-03-08 15:26 ` Michal Hocko 0 siblings, 1 reply; 8+ messages in thread From: Paolo Bonzini @ 2022-03-08 13:55 UTC (permalink / raw) To: Michal Hocko Cc: linux-kernel, kvm, Michael Ellerman, Andrew Morton, Dennis Zhou, Tejun Heo, Christoph Lameter, Johannes Weiner, Vladimir Davydov, linux-mm, cgroups, stable On 3/8/22 14:47, Michal Hocko wrote: > Seems useful > Acked-by: Michal Hocko<mhocko@suse.com> > > Is there any reason you haven't used __alloc_size(1, 2) annotation? It's enough to have them in the header: >> +extern void *__vmalloc_array(size_t n, size_t size, gfp_t flags) __alloc_size(1, 2); >> +extern void *vmalloc_array(size_t n, size_t size) __alloc_size(1, 2); >> +extern void *__vcalloc(size_t n, size_t size, gfp_t flags) __alloc_size(1, 2); >> +extern void *vcalloc(size_t n, size_t size) __alloc_size(1, 2); Thanks for the quick review! Paolo ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] mm: vmalloc: introduce array allocation functions 2022-03-08 13:55 ` Paolo Bonzini @ 2022-03-08 15:26 ` Michal Hocko 0 siblings, 0 replies; 8+ messages in thread From: Michal Hocko @ 2022-03-08 15:26 UTC (permalink / raw) To: Paolo Bonzini Cc: linux-kernel, kvm, Michael Ellerman, Andrew Morton, Dennis Zhou, Tejun Heo, Christoph Lameter, Johannes Weiner, Vladimir Davydov, linux-mm, cgroups, stable On Tue 08-03-22 14:55:39, Paolo Bonzini wrote: > On 3/8/22 14:47, Michal Hocko wrote: > > Seems useful > > Acked-by: Michal Hocko<mhocko@suse.com> > > > > Is there any reason you haven't used __alloc_size(1, 2) annotation? > > It's enough to have them in the header: > > > > +extern void *__vmalloc_array(size_t n, size_t size, gfp_t flags) __alloc_size(1, 2); > > > +extern void *vmalloc_array(size_t n, size_t size) __alloc_size(1, 2); > > > +extern void *__vcalloc(size_t n, size_t size, gfp_t flags) __alloc_size(1, 2); > > > +extern void *vcalloc(size_t n, size_t size) __alloc_size(1, 2); My bad, I have expected __alloc_size before the function name and simply haven't noticed it at the end. -- Michal Hocko SUSE Labs ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] mm: vmalloc: introduce array allocation functions 2022-03-08 10:59 ` [PATCH 1/3] mm: vmalloc: introduce array allocation functions Paolo Bonzini 2022-03-08 13:47 ` Michal Hocko @ 2022-03-08 14:26 ` David Hildenbrand 1 sibling, 0 replies; 8+ messages in thread From: David Hildenbrand @ 2022-03-08 14:26 UTC (permalink / raw) To: Paolo Bonzini, linux-kernel, kvm Cc: Michael Ellerman, Andrew Morton, Dennis Zhou, Tejun Heo, Christoph Lameter, Johannes Weiner, Michal Hocko, Vladimir Davydov, linux-mm, cgroups, stable On 08.03.22 11:59, Paolo Bonzini wrote: > Linux has dozens of occurrences of vmalloc(array_size()) and > vzalloc(array_size()). Allow to simplify the code by providing > vmalloc_array and vcalloc, as well as the underscored variants that let > the caller specify the GFP flags. > > Cc: stable@vger.kernel.org > Cc: linux-mm@kvack.org > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: David Hildenbrand <david@redhat.com> -- Thanks, David / dhildenb ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] KVM: use vcalloc/__vcalloc for very large allocations [not found] <20220308105918.615575-1-pbonzini@redhat.com> 2022-03-08 10:59 ` [PATCH 1/3] mm: vmalloc: introduce array allocation functions Paolo Bonzini @ 2022-03-08 10:59 ` Paolo Bonzini 2022-03-08 14:25 ` David Hildenbrand 2022-03-10 4:18 ` Andrew Morton 1 sibling, 2 replies; 8+ messages in thread From: Paolo Bonzini @ 2022-03-08 10:59 UTC (permalink / raw) To: linux-kernel, kvm Cc: Michael Ellerman, Andrew Morton, Dennis Zhou, Tejun Heo, Christoph Lameter, Johannes Weiner, Michal Hocko, Vladimir Davydov, linux-mm, cgroups, stable Allocations whose size is related to the memslot size can be arbitrarily large. Do not use kvzalloc/kvcalloc, as those are limited to "not crazy" sizes that fit in 32 bits. Now that it is available, they can use either vcalloc or __vcalloc, the latter if accounting is required. Cc: stable@vger.kernel.org Cc: kvm@vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- arch/x86/kvm/mmu/page_track.c | 7 ++++--- arch/x86/kvm/x86.c | 4 ++-- virt/kvm/kvm_main.c | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_hv_uvmem.c index e414ca44839f..be441403925b 100644 --- a/arch/powerpc/kvm/book3s_hv_uvmem.c +++ b/arch/powerpc/kvm/book3s_hv_uvmem.c @@ -251,7 +251,7 @@ int kvmppc_uvmem_slot_init(struct kvm *kvm, const struct kvm_memory_slot *slot) p = kzalloc(sizeof(*p), GFP_KERNEL); if (!p) return -ENOMEM; - p->pfns = vzalloc(array_size(slot->npages, sizeof(*p->pfns))); + p->pfns = vcalloc(slot->npages, sizeof(*p->pfns)); if (!p->pfns) { kfree(p); return -ENOMEM; diff --git a/arch/x86/kvm/mmu/page_track.c b/arch/x86/kvm/mmu/page_track.c index 68eb1fb548b6..2e09d1b6249f 100644 --- a/arch/x86/kvm/mmu/page_track.c +++ b/arch/x86/kvm/mmu/page_track.c @@ -47,8 +47,8 @@ int kvm_page_track_create_memslot(struct kvm *kvm, continue; slot->arch.gfn_track[i] = - kvcalloc(npages, sizeof(*slot->arch.gfn_track[i]), - GFP_KERNEL_ACCOUNT); + __vcalloc(npages, sizeof(*slot->arch.gfn_track[i]), + GFP_KERNEL_ACCOUNT); if (!slot->arch.gfn_track[i]) goto track_free; } @@ -75,7 +75,8 @@ int kvm_page_track_write_tracking_alloc(struct kvm_memory_slot *slot) if (slot->arch.gfn_track[KVM_PAGE_TRACK_WRITE]) return 0; - gfn_track = kvcalloc(slot->npages, sizeof(*gfn_track), GFP_KERNEL_ACCOUNT); + gfn_track = __vcalloc(slot->npages, sizeof(*gfn_track), + GFP_KERNEL_ACCOUNT); if (gfn_track == NULL) return -ENOMEM; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f79bf4552082..4fa4d8269e5b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -11838,7 +11838,7 @@ int memslot_rmap_alloc(struct kvm_memory_slot *slot, unsigned long npages) if (slot->arch.rmap[i]) continue; - slot->arch.rmap[i] = kvcalloc(lpages, sz, GFP_KERNEL_ACCOUNT); + slot->arch.rmap[i] = __vcalloc(lpages, sz, GFP_KERNEL_ACCOUNT); if (!slot->arch.rmap[i]) { memslot_rmap_free(slot); return -ENOMEM; @@ -11875,7 +11875,7 @@ static int kvm_alloc_memslot_metadata(struct kvm *kvm, lpages = __kvm_mmu_slot_lpages(slot, npages, level); - linfo = kvcalloc(lpages, sizeof(*linfo), GFP_KERNEL_ACCOUNT); + linfo = __vcalloc(lpages, sizeof(*linfo), GFP_KERNEL_ACCOUNT); if (!linfo) goto out_free; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index c941b97fa133..a5726099df67 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1274,9 +1274,9 @@ static int kvm_vm_release(struct inode *inode, struct file *filp) */ static int kvm_alloc_dirty_bitmap(struct kvm_memory_slot *memslot) { - unsigned long dirty_bytes = 2 * kvm_dirty_bitmap_bytes(memslot); + unsigned long dirty_bytes = kvm_dirty_bitmap_bytes(memslot); - memslot->dirty_bitmap = kvzalloc(dirty_bytes, GFP_KERNEL_ACCOUNT); + memslot->dirty_bitmap = __vcalloc(2, dirty_bytes, GFP_KERNEL_ACCOUNT); if (!memslot->dirty_bitmap) return -ENOMEM; -- 2.31.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] KVM: use vcalloc/__vcalloc for very large allocations 2022-03-08 10:59 ` [PATCH 3/3] KVM: use vcalloc/__vcalloc for very large allocations Paolo Bonzini @ 2022-03-08 14:25 ` David Hildenbrand 2022-03-10 4:18 ` Andrew Morton 1 sibling, 0 replies; 8+ messages in thread From: David Hildenbrand @ 2022-03-08 14:25 UTC (permalink / raw) To: Paolo Bonzini, linux-kernel, kvm Cc: Michael Ellerman, Andrew Morton, Dennis Zhou, Tejun Heo, Christoph Lameter, Johannes Weiner, Michal Hocko, Vladimir Davydov, linux-mm, cgroups, stable On 08.03.22 11:59, Paolo Bonzini wrote: > Allocations whose size is related to the memslot size can be arbitrarily > large. Do not use kvzalloc/kvcalloc, as those are limited to "not crazy" > sizes that fit in 32 bits. Now that it is available, they can use either > vcalloc or __vcalloc, the latter if accounting is required. > > Cc: stable@vger.kernel.org > Cc: kvm@vger.kernel.org > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Fixes: 7661809d493b ("mm: don't allow oversized kvmalloc() calls") ? Reviewed-by: David Hildenbrand <david@redhat.com> -- Thanks, David / dhildenb ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] KVM: use vcalloc/__vcalloc for very large allocations 2022-03-08 10:59 ` [PATCH 3/3] KVM: use vcalloc/__vcalloc for very large allocations Paolo Bonzini 2022-03-08 14:25 ` David Hildenbrand @ 2022-03-10 4:18 ` Andrew Morton 1 sibling, 0 replies; 8+ messages in thread From: Andrew Morton @ 2022-03-10 4:18 UTC (permalink / raw) To: Paolo Bonzini Cc: linux-kernel, kvm, Michael Ellerman, Dennis Zhou, Tejun Heo, Christoph Lameter, Johannes Weiner, Michal Hocko, Vladimir Davydov, linux-mm, cgroups, stable On Tue, 8 Mar 2022 05:59:18 -0500 Paolo Bonzini <pbonzini@redhat.com> wrote: > Allocations whose size is related to the memslot size can be arbitrarily > large. Do not use kvzalloc/kvcalloc, as those are limited to "not crazy" > sizes that fit in 32 bits. Now that it is available, they can use either > vcalloc or __vcalloc, the latter if accounting is required. > > Cc: stable@vger.kernel.org Please fully describe the end user visible runtime effects when proposing a -stable backport. And when not proposing a -stable backport, come to that... ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-03-10 4:18 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <20220308105918.615575-1-pbonzini@redhat.com> 2022-03-08 10:59 ` [PATCH 1/3] mm: vmalloc: introduce array allocation functions Paolo Bonzini 2022-03-08 13:47 ` Michal Hocko 2022-03-08 13:55 ` Paolo Bonzini 2022-03-08 15:26 ` Michal Hocko 2022-03-08 14:26 ` David Hildenbrand 2022-03-08 10:59 ` [PATCH 3/3] KVM: use vcalloc/__vcalloc for very large allocations Paolo Bonzini 2022-03-08 14:25 ` David Hildenbrand 2022-03-10 4:18 ` Andrew Morton
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).