From: Michal Hocko <mhocko@kernel.org>
To: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org, <linux-mm@kvack.org>,
Daniel Vetter <daniel.vetter@intel.com>,
Jani Nikula <jani.nikula@linux.intel.com>,
Sean Paul <seanpaul@chromium.org>,
David Airlie <airlied@linux.ie>, Michal Hocko <mhocko@suse.com>
Subject: [PATCH] drm: use kvmalloc_array for drm_malloc*
Date: Tue, 16 May 2017 11:06:06 +0200 [thread overview]
Message-ID: <20170516090606.5891-1-mhocko@kernel.org> (raw)
From: Michal Hocko <mhocko@suse.com>
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 <mhocko@suse.com>
---
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
next reply other threads:[~2017-05-16 9:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-16 9:06 Michal Hocko [this message]
2017-05-16 9:22 ` [PATCH] drm: use kvmalloc_array for drm_malloc* Daniel Vetter
2017-05-16 9:52 ` Michal Hocko
2017-05-16 13:08 ` Daniel Vetter
2017-05-16 13:21 ` Michal Hocko
2017-05-16 9:31 ` Chris Wilson
2017-05-16 10:53 ` Michal Hocko
2017-05-16 11:09 ` Chris Wilson
2017-05-17 7:44 ` Michal Hocko
2017-05-17 7:59 ` Chris Wilson
2017-05-17 8:09 ` Michal Hocko
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=20170516090606.5891-1-mhocko@kernel.org \
--to=mhocko@kernel.org \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=seanpaul@chromium.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).