From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751470AbdEPJGV (ORCPT ); Tue, 16 May 2017 05:06:21 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:36147 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751104AbdEPJGP (ORCPT ); Tue, 16 May 2017 05:06:15 -0400 From: Michal Hocko To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, , Daniel Vetter , Jani Nikula , Sean Paul , David Airlie , Michal Hocko Subject: [PATCH] drm: use kvmalloc_array for drm_malloc* Date: Tue, 16 May 2017 11:06:06 +0200 Message-Id: <20170516090606.5891-1-mhocko@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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