From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934435AbcJUOMr (ORCPT ); Fri, 21 Oct 2016 10:12:47 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:34197 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933757AbcJUOLn (ORCPT ); Fri, 21 Oct 2016 10:11:43 -0400 From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Chris Wilson , Tvrtko Ursulin Subject: [PATCH 4/5] drm/i915: Use __sg_alloc_table_from_pages for allocating object backing store Date: Fri, 21 Oct 2016 15:11:22 +0100 Message-Id: <1477059083-3500-5-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477059083-3500-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1477059083-3500-1-git-send-email-tvrtko.ursulin@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tvrtko Ursulin With the current way of allocating backing store which over-estimates the number of sg entries required we typically waste around 1-6 MiB of memory on unused sg entries at runtime. We can instead have the intermediate step of storing our pages in an array and use __sg_alloc_table_from_pages which will create us the most compact list possible. Signed-off-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_gem.c | 72 ++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 8ed8e24025ac..4bf675568a37 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2208,9 +2208,9 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj) static unsigned int swiotlb_max_size(void) { #if IS_ENABLED(CONFIG_SWIOTLB) - return rounddown(swiotlb_nr_tbl() << IO_TLB_SHIFT, PAGE_SIZE); + return swiotlb_nr_tbl() << IO_TLB_SHIFT; #else - return 0; + return UINT_MAX; #endif } @@ -2221,11 +2221,8 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) int page_count, i; struct address_space *mapping; struct sg_table *st; - struct scatterlist *sg; - struct sgt_iter sgt_iter; - struct page *page; - unsigned long last_pfn = 0; /* suppress gcc warning */ - unsigned int max_segment; + struct page *page, **pages; + unsigned int max_segment = swiotlb_max_size(); int ret; gfp_t gfp; @@ -2236,18 +2233,16 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) BUG_ON(obj->base.read_domains & I915_GEM_GPU_DOMAINS); BUG_ON(obj->base.write_domain & I915_GEM_GPU_DOMAINS); - max_segment = swiotlb_max_size(); - if (!max_segment) - max_segment = rounddown(UINT_MAX, PAGE_SIZE); - - st = kmalloc(sizeof(*st), GFP_KERNEL); - if (st == NULL) - return -ENOMEM; - page_count = obj->base.size / PAGE_SIZE; - if (sg_alloc_table(st, page_count, GFP_KERNEL)) { - kfree(st); + pages = drm_malloc_gfp(page_count, sizeof(struct page *), + GFP_TEMPORARY | __GFP_ZERO); + if (!pages) return -ENOMEM; + + st = kmalloc(sizeof(*st), GFP_KERNEL); + if (st == NULL) { + ret = -ENOMEM; + goto err_st; } /* Get the list of pages out of our struct file. They'll be pinned @@ -2258,8 +2253,6 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) mapping = obj->base.filp->f_mapping; gfp = mapping_gfp_constraint(mapping, ~(__GFP_IO | __GFP_RECLAIM)); gfp |= __GFP_NORETRY | __GFP_NOWARN; - sg = st->sgl; - st->nents = 0; for (i = 0; i < page_count; i++) { page = shmem_read_mapping_page_gfp(mapping, i, gfp); if (IS_ERR(page)) { @@ -2281,29 +2274,28 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) goto err_pages; } } - if (!i || - sg->length >= max_segment || - page_to_pfn(page) != last_pfn + 1) { - if (i) - sg = sg_next(sg); - st->nents++; - sg_set_page(sg, page, PAGE_SIZE, 0); - } else { - sg->length += PAGE_SIZE; - } - last_pfn = page_to_pfn(page); + + pages[i] = page; /* Check that the i965g/gm workaround works. */ - WARN_ON((gfp & __GFP_DMA32) && (last_pfn >= 0x00100000UL)); + WARN_ON((gfp & __GFP_DMA32) && + (page_to_pfn(page) >= 0x00100000UL)); } - if (sg) /* loop terminated early; short sg table */ - sg_mark_end(sg); + + ret = __sg_alloc_table_from_pages(st, pages, page_count, 0, + obj->base.size, GFP_KERNEL, + max_segment); + if (ret) + goto err_pages; + obj->pages = st; ret = i915_gem_gtt_prepare_object(obj); if (ret) goto err_pages; + drm_free_large(pages); + if (i915_gem_object_needs_bit17_swizzle(obj)) i915_gem_object_do_bit_17_swizzle(obj); @@ -2314,10 +2306,13 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) return 0; err_pages: - sg_mark_end(sg); - for_each_sgt_page(page, sgt_iter, st) - put_page(page); - sg_free_table(st); + for (i = 0; i < page_count; i++) { + if (pages[i]) + put_page(pages[i]); + else + break; + } + kfree(st); /* shmemfs first checks if there is enough memory to allocate the page @@ -2331,6 +2326,9 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) if (ret == -ENOSPC) ret = -ENOMEM; +err_st: + drm_free_large(pages); + return ret; } -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 4/5] drm/i915: Use __sg_alloc_table_from_pages for allocating object backing store Date: Fri, 21 Oct 2016 15:11:22 +0100 Message-ID: <1477059083-3500-5-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1477059083-3500-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qk0-x244.google.com (mail-qk0-x244.google.com [IPv6:2607:f8b0:400d:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id AE4C66E02C for ; Fri, 21 Oct 2016 14:11:43 +0000 (UTC) Received: by mail-qk0-x244.google.com with SMTP id z190so7262139qkc.3 for ; Fri, 21 Oct 2016 07:11:43 -0700 (PDT) In-Reply-To: <1477059083-3500-1-git-send-email-tvrtko.ursulin@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel-gfx@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldpdGggdGhl IGN1cnJlbnQgd2F5IG9mIGFsbG9jYXRpbmcgYmFja2luZyBzdG9yZSB3aGljaCBvdmVyLWVzdGlt YXRlcwp0aGUgbnVtYmVyIG9mIHNnIGVudHJpZXMgcmVxdWlyZWQgd2UgdHlwaWNhbGx5IHdhc3Rl IGFyb3VuZCAxLTYgTWlCIG9mCm1lbW9yeSBvbiB1bnVzZWQgc2cgZW50cmllcyBhdCBydW50aW1l LgoKV2UgY2FuIGluc3RlYWQgaGF2ZSB0aGUgaW50ZXJtZWRpYXRlIHN0ZXAgb2Ygc3RvcmluZyBv dXIgcGFnZXMgaW4gYW4KYXJyYXkgYW5kIHVzZSBfX3NnX2FsbG9jX3RhYmxlX2Zyb21fcGFnZXMg d2hpY2ggd2lsbCBjcmVhdGUgdXMgdGhlCm1vc3QgY29tcGFjdCBsaXN0IHBvc3NpYmxlLgoKU2ln bmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgNzIgKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCsp LCAzNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA4ZWQ4ZTI0MDI1 YWMuLjRiZjY3NTU2OGEzNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yMjA4LDkgKzIy MDgsOSBAQCBpOTE1X2dlbV9vYmplY3RfcHV0X3BhZ2VzKHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmopCiBzdGF0aWMgdW5zaWduZWQgaW50IHN3aW90bGJfbWF4X3NpemUodm9pZCkKIHsK ICNpZiBJU19FTkFCTEVEKENPTkZJR19TV0lPVExCKQotCXJldHVybiByb3VuZGRvd24oc3dpb3Rs Yl9ucl90YmwoKSA8PCBJT19UTEJfU0hJRlQsIFBBR0VfU0laRSk7CisJcmV0dXJuIHN3aW90bGJf bnJfdGJsKCkgPDwgSU9fVExCX1NISUZUOwogI2Vsc2UKLQlyZXR1cm4gMDsKKwlyZXR1cm4gVUlO VF9NQVg7CiAjZW5kaWYKIH0KIApAQCAtMjIyMSwxMSArMjIyMSw4IEBAIGk5MTVfZ2VtX29iamVj dF9nZXRfcGFnZXNfZ3R0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJaW50IHBh Z2VfY291bnQsIGk7CiAJc3RydWN0IGFkZHJlc3Nfc3BhY2UgKm1hcHBpbmc7CiAJc3RydWN0IHNn X3RhYmxlICpzdDsKLQlzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnOwotCXN0cnVjdCBzZ3RfaXRlciBz Z3RfaXRlcjsKLQlzdHJ1Y3QgcGFnZSAqcGFnZTsKLQl1bnNpZ25lZCBsb25nIGxhc3RfcGZuID0g MDsJLyogc3VwcHJlc3MgZ2NjIHdhcm5pbmcgKi8KLQl1bnNpZ25lZCBpbnQgbWF4X3NlZ21lbnQ7 CisJc3RydWN0IHBhZ2UgKnBhZ2UsICoqcGFnZXM7CisJdW5zaWduZWQgaW50IG1heF9zZWdtZW50 ID0gc3dpb3RsYl9tYXhfc2l6ZSgpOwogCWludCByZXQ7CiAJZ2ZwX3QgZ2ZwOwogCkBAIC0yMjM2 LDE4ICsyMjMzLDE2IEBAIGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZXNfZ3R0KHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJQlVHX09OKG9iai0+YmFzZS5yZWFkX2RvbWFpbnMgJiBJ OTE1X0dFTV9HUFVfRE9NQUlOUyk7CiAJQlVHX09OKG9iai0+YmFzZS53cml0ZV9kb21haW4gJiBJ OTE1X0dFTV9HUFVfRE9NQUlOUyk7CiAKLQltYXhfc2VnbWVudCA9IHN3aW90bGJfbWF4X3NpemUo KTsKLQlpZiAoIW1heF9zZWdtZW50KQotCQltYXhfc2VnbWVudCA9IHJvdW5kZG93bihVSU5UX01B WCwgUEFHRV9TSVpFKTsKLQotCXN0ID0ga21hbGxvYyhzaXplb2YoKnN0KSwgR0ZQX0tFUk5FTCk7 Ci0JaWYgKHN0ID09IE5VTEwpCi0JCXJldHVybiAtRU5PTUVNOwotCiAJcGFnZV9jb3VudCA9IG9i ai0+YmFzZS5zaXplIC8gUEFHRV9TSVpFOwotCWlmIChzZ19hbGxvY190YWJsZShzdCwgcGFnZV9j b3VudCwgR0ZQX0tFUk5FTCkpIHsKLQkJa2ZyZWUoc3QpOworCXBhZ2VzID0gZHJtX21hbGxvY19n ZnAocGFnZV9jb3VudCwgc2l6ZW9mKHN0cnVjdCBwYWdlICopLAorCQkJICAgICAgIEdGUF9URU1Q T1JBUlkgfCBfX0dGUF9aRVJPKTsKKwlpZiAoIXBhZ2VzKQogCQlyZXR1cm4gLUVOT01FTTsKKwor CXN0ID0ga21hbGxvYyhzaXplb2YoKnN0KSwgR0ZQX0tFUk5FTCk7CisJaWYgKHN0ID09IE5VTEwp IHsKKwkJcmV0ID0gLUVOT01FTTsKKwkJZ290byBlcnJfc3Q7CiAJfQogCiAJLyogR2V0IHRoZSBs aXN0IG9mIHBhZ2VzIG91dCBvZiBvdXIgc3RydWN0IGZpbGUuICBUaGV5J2xsIGJlIHBpbm5lZApA QCAtMjI1OCw4ICsyMjUzLDYgQEAgaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlc19ndHQoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAltYXBwaW5nID0gb2JqLT5iYXNlLmZpbHAtPmZf bWFwcGluZzsKIAlnZnAgPSBtYXBwaW5nX2dmcF9jb25zdHJhaW50KG1hcHBpbmcsIH4oX19HRlBf SU8gfCBfX0dGUF9SRUNMQUlNKSk7CiAJZ2ZwIHw9IF9fR0ZQX05PUkVUUlkgfCBfX0dGUF9OT1dB Uk47Ci0Jc2cgPSBzdC0+c2dsOwotCXN0LT5uZW50cyA9IDA7CiAJZm9yIChpID0gMDsgaSA8IHBh Z2VfY291bnQ7IGkrKykgewogCQlwYWdlID0gc2htZW1fcmVhZF9tYXBwaW5nX3BhZ2VfZ2ZwKG1h cHBpbmcsIGksIGdmcCk7CiAJCWlmIChJU19FUlIocGFnZSkpIHsKQEAgLTIyODEsMjkgKzIyNzQs MjggQEAgaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlc19ndHQoc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaikKIAkJCQlnb3RvIGVycl9wYWdlczsKIAkJCX0KIAkJfQotCQlpZiAoIWkgfHwK LQkJICAgIHNnLT5sZW5ndGggPj0gbWF4X3NlZ21lbnQgfHwKLQkJICAgIHBhZ2VfdG9fcGZuKHBh Z2UpICE9IGxhc3RfcGZuICsgMSkgewotCQkJaWYgKGkpCi0JCQkJc2cgPSBzZ19uZXh0KHNnKTsK LQkJCXN0LT5uZW50cysrOwotCQkJc2dfc2V0X3BhZ2Uoc2csIHBhZ2UsIFBBR0VfU0laRSwgMCk7 Ci0JCX0gZWxzZSB7Ci0JCQlzZy0+bGVuZ3RoICs9IFBBR0VfU0laRTsKLQkJfQotCQlsYXN0X3Bm biA9IHBhZ2VfdG9fcGZuKHBhZ2UpOworCisJCXBhZ2VzW2ldID0gcGFnZTsKIAogCQkvKiBDaGVj ayB0aGF0IHRoZSBpOTY1Zy9nbSB3b3JrYXJvdW5kIHdvcmtzLiAqLwotCQlXQVJOX09OKChnZnAg JiBfX0dGUF9ETUEzMikgJiYgKGxhc3RfcGZuID49IDB4MDAxMDAwMDBVTCkpOworCQlXQVJOX09O KChnZnAgJiBfX0dGUF9ETUEzMikgJiYKKwkJCShwYWdlX3RvX3BmbihwYWdlKSA+PSAweDAwMTAw MDAwVUwpKTsKIAl9Ci0JaWYgKHNnKSAvKiBsb29wIHRlcm1pbmF0ZWQgZWFybHk7IHNob3J0IHNn IHRhYmxlICovCi0JCXNnX21hcmtfZW5kKHNnKTsKKworCXJldCA9IF9fc2dfYWxsb2NfdGFibGVf ZnJvbV9wYWdlcyhzdCwgcGFnZXMsIHBhZ2VfY291bnQsIDAsCisJCQkJCSAgb2JqLT5iYXNlLnNp emUsIEdGUF9LRVJORUwsCisJCQkJCSAgbWF4X3NlZ21lbnQpOworCWlmIChyZXQpCisJCWdvdG8g ZXJyX3BhZ2VzOworCiAJb2JqLT5wYWdlcyA9IHN0OwogCiAJcmV0ID0gaTkxNV9nZW1fZ3R0X3By ZXBhcmVfb2JqZWN0KG9iaik7CiAJaWYgKHJldCkKIAkJZ290byBlcnJfcGFnZXM7CiAKKwlkcm1f ZnJlZV9sYXJnZShwYWdlcyk7CisKIAlpZiAoaTkxNV9nZW1fb2JqZWN0X25lZWRzX2JpdDE3X3N3 aXp6bGUob2JqKSkKIAkJaTkxNV9nZW1fb2JqZWN0X2RvX2JpdF8xN19zd2l6emxlKG9iaik7CiAK QEAgLTIzMTQsMTAgKzIzMDYsMTMgQEAgaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlc19ndHQoc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAlyZXR1cm4gMDsKIAogZXJyX3BhZ2VzOgot CXNnX21hcmtfZW5kKHNnKTsKLQlmb3JfZWFjaF9zZ3RfcGFnZShwYWdlLCBzZ3RfaXRlciwgc3Qp Ci0JCXB1dF9wYWdlKHBhZ2UpOwotCXNnX2ZyZWVfdGFibGUoc3QpOworCWZvciAoaSA9IDA7IGkg PCBwYWdlX2NvdW50OyBpKyspIHsKKwkJaWYgKHBhZ2VzW2ldKQorCQkJcHV0X3BhZ2UocGFnZXNb aV0pOworCQllbHNlCisJCQlicmVhazsKKwl9CisKIAlrZnJlZShzdCk7CiAKIAkvKiBzaG1lbWZz IGZpcnN0IGNoZWNrcyBpZiB0aGVyZSBpcyBlbm91Z2ggbWVtb3J5IHRvIGFsbG9jYXRlIHRoZSBw YWdlCkBAIC0yMzMxLDYgKzIzMjYsOSBAQCBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2VzX2d0dChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCWlmIChyZXQgPT0gLUVOT1NQQykKIAkJ cmV0ID0gLUVOT01FTTsKIAorZXJyX3N0OgorCWRybV9mcmVlX2xhcmdlKHBhZ2VzKTsKKwogCXJl dHVybiByZXQ7CiB9CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK