From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt0-f197.google.com (mail-qt0-f197.google.com [209.85.216.197]) by kanga.kvack.org (Postfix) with ESMTP id 1A3A26B02F3 for ; Tue, 16 May 2017 05:22:34 -0400 (EDT) Received: by mail-qt0-f197.google.com with SMTP id v27so55206612qtg.6 for ; Tue, 16 May 2017 02:22:34 -0700 (PDT) Received: from mail-qk0-x243.google.com (mail-qk0-x243.google.com. [2607:f8b0:400d:c09::243]) by mx.google.com with ESMTPS id c22si12830660qkb.219.2017.05.16.02.22.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 May 2017 02:22:33 -0700 (PDT) Received: by mail-qk0-x243.google.com with SMTP id k74so21670767qke.2 for ; Tue, 16 May 2017 02:22:33 -0700 (PDT) Date: Tue, 16 May 2017 11:22:30 +0200 From: Daniel Vetter Subject: Re: [PATCH] drm: use kvmalloc_array for drm_malloc* Message-ID: <20170516092230.pzadndxm5gq4i4h6@phenom.ffwll.local> References: <20170516090606.5891-1-mhocko@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170516090606.5891-1-mhocko@kernel.org> Sender: owner-linux-mm@kvack.org List-ID: To: Michal Hocko Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Daniel Vetter , Jani Nikula , Sean Paul , David Airlie , Michal Hocko On Tue, May 16, 2017 at 11:06:06AM +0200, Michal Hocko wrote: > From: Michal Hocko > > drm_malloc* has grown their own kmalloc with vmalloc fallback > implementations. MM has grown kvmalloc* helpers in the meantime. Let's > use those because it a) reduces the code and b) MM has a better idea > how to implement fallbacks (e.g. do not vmalloc before kmalloc is tried > with __GFP_NORETRY). > > Signed-off-by: Michal Hocko Shouldn't we go one step further and just remove these wrappers, maybe with cocci? Especially drm_malloc_gfp is surpremely pointless after this patch (and drm_malloc_ab probably not that useful either). -Daniel > --- > include/drm/drm_mem_util.h | 23 ++--------------------- > 1 file changed, 2 insertions(+), 21 deletions(-) > > diff --git a/include/drm/drm_mem_util.h b/include/drm/drm_mem_util.h > index d0f6cf2e5324..b461e4e4e6db 100644 > --- a/include/drm/drm_mem_util.h > +++ b/include/drm/drm_mem_util.h > @@ -43,31 +43,12 @@ static __inline__ void *drm_calloc_large(size_t nmemb, size_t size) > /* Modeled after cairo's malloc_ab, it's like calloc but without the zeroing. */ > static __inline__ void *drm_malloc_ab(size_t nmemb, size_t size) > { > - if (size != 0 && nmemb > SIZE_MAX / size) > - return NULL; > - > - if (size * nmemb <= PAGE_SIZE) > - return kmalloc(nmemb * size, GFP_KERNEL); > - > - return vmalloc(size * nmemb); > + return kvmalloc_array(nmemb, size, GFP_KERNEL); > } > > static __inline__ void *drm_malloc_gfp(size_t nmemb, size_t size, gfp_t gfp) > { > - if (size != 0 && nmemb > SIZE_MAX / size) > - return NULL; > - > - if (size * nmemb <= PAGE_SIZE) > - return kmalloc(nmemb * size, gfp); > - > - if (gfp & __GFP_RECLAIMABLE) { > - void *ptr = kmalloc(nmemb * size, > - gfp | __GFP_NOWARN | __GFP_NORETRY); > - if (ptr) > - return ptr; > - } > - > - return __vmalloc(size * nmemb, gfp, PAGE_KERNEL); > + return kvmalloc_array(nmemb, size, gfp); > } > > static __inline void drm_free_large(void *ptr) > -- > 2.11.0 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: email@kvack.org -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org