From patchwork Mon Feb 29 21:16:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Gordon X-Patchwork-Id: 8458331 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E38289F65E for ; Mon, 29 Feb 2016 21:17:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13208201F4 for ; Mon, 29 Feb 2016 21:17:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2C3A9201DD for ; Mon, 29 Feb 2016 21:17:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B5526E38C; Mon, 29 Feb 2016 21:16:55 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 49DCA6E381 for ; Mon, 29 Feb 2016 21:16:47 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 29 Feb 2016 13:16:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,521,1449561600"; d="scan'208";a="923744039" Received: from dsgordon-linux2.isw.intel.com ([10.102.226.88]) by orsmga002.jf.intel.com with ESMTP; 29 Feb 2016 13:16:46 -0800 From: Dave Gordon To: intel-gfx@lists.freedesktop.org Date: Mon, 29 Feb 2016 21:16:09 +0000 Message-Id: <1456780572-19196-5-git-send-email-david.s.gordon@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456780572-19196-1-git-send-email-david.s.gordon@intel.com> References: <1456780572-19196-1-git-send-email-david.s.gordon@intel.com> Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ Subject: [Intel-gfx] [PATCH v6 4/7] drm/i915: optimise i915_gem_object_vmap_range() for small objects X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We're using this function for ringbuffers and other "small" objects, so it's worth avoiding an extra malloc()/free() cycle if the page array is small enough to put on the stack. Here we've chosen an arbitrary cutoff of 32 (4k) pages, which is big enough for a ringbuffer (4 pages) or a context image (currently up to 22 pages). v5: change name of local array [Chris Wilson] Signed-off-by: Dave Gordon Reviewed-by: Tvrtko Ursulin Cc: Chris Wilson Cc: Alex Dai --- drivers/gpu/drm/i915/i915_gem.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 8f12e73..9410c72 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2420,7 +2420,8 @@ void *i915_gem_object_vmap_range(struct drm_i915_gem_object *obj, { struct scatterlist *sg = obj->pages->sgl; struct sg_page_iter sg_iter; - struct page **pages; + struct page *stack_pages[32]; + struct page **pages = stack_pages; unsigned long first, npages, i; int nents; void *addr; @@ -2436,10 +2437,13 @@ void *i915_gem_object_vmap_range(struct drm_i915_gem_object *obj, first = start >> PAGE_SHIFT; npages = DIV_ROUND_UP(start + nbytes, PAGE_SIZE) - first; - pages = drm_malloc_gfp(npages, sizeof(*pages), GFP_TEMPORARY); - if (pages == NULL) { - DRM_DEBUG_DRIVER("Failed to get space for pages\n"); - return NULL; + if (npages > ARRAY_SIZE(stack_pages)) { + /* Too big for stack -- allocate temporary array instead */ + pages = drm_malloc_gfp(npages, sizeof(*pages), GFP_TEMPORARY); + if (pages == NULL) { + DRM_DEBUG_DRIVER("Failed to get space for pages\n"); + return NULL; + } } i = 0; @@ -2453,7 +2457,8 @@ void *i915_gem_object_vmap_range(struct drm_i915_gem_object *obj, addr = vmap(pages, npages, 0, PAGE_KERNEL); if (addr == NULL) DRM_DEBUG_DRIVER("Failed to vmap pages\n"); - drm_free_large(pages); + if (pages != stack_pages) + drm_free_large(pages); return addr; }