From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chunming Zhou Subject: Re: [PATCH 2/4] drm/ttm: add page order support in ttm_pages_put Date: Wed, 22 Nov 2017 14:01:57 +0800 Message-ID: <1348615c-1841-27aa-b2e7-03d9c8d89d66@amd.com> References: <1511329016-552-1-git-send-email-Hongbo.He@amd.com> <1511329016-552-2-git-send-email-Hongbo.He@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1397030488==" Return-path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0072.outbound.protection.outlook.com [104.47.32.72]) by gabe.freedesktop.org (Postfix) with ESMTPS id DB169899B0 for ; Wed, 22 Nov 2017 06:17:51 +0000 (UTC) In-Reply-To: <1511329016-552-2-git-send-email-Hongbo.He@amd.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============1397030488== Content-Type: multipart/alternative; boundary="------------E56C64B1DA46F84BBF4C669D" Content-Language: en-US --------------E56C64B1DA46F84BBF4C669D Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit On 2017年11月22日 13:36, Roger He wrote: > Change-Id: Ia55b206d95812c5afcfd6cec29f580758d1f50f0 > Signed-off-by: Roger He > --- > drivers/gpu/drm/ttm/ttm_page_alloc.c | 42 +++++++++++++++++++++++++++++------- > 1 file changed, 34 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c > index 0a0c653..de64209 100644 > --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c > +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c > @@ -285,13 +285,39 @@ static struct ttm_page_pool *ttm_get_pool(int flags, bool huge, > } > > /* set memory back to wb and free the pages. */ > -static void ttm_pages_put(struct page *pages[], unsigned npages) > +static void ttm_pages_put(struct page *pages[], unsigned npages, > + unsigned int order) > { > - unsigned i; > - if (set_pages_array_wb(pages, npages)) > - pr_err("Failed to set %d pages to wb!\n", npages); > - for (i = 0; i < npages; ++i) > - __free_page(pages[i]); > + struct page **pages_to_free = NULL; > + struct page **pages_array; > + struct page *p; > + unsigned int i, j, pages_nr = (1 << order); > + > + if (order > 0) { > + pages_to_free = kmalloc_array(pages_nr, sizeof(struct page *), > + GFP_KERNEL); > + if (!pages_to_free) { > + pr_err("Failed to allocate memory for ttm pages put operation\n"); > + return; > + } > + } > + > + for (i = 0; i < npages; ++i) { > + if (order > 0) { + p = pages[i]; + for (j = 0; j < pages_nr; ++j) + > pages_to_free[j] = p++; + + pages_array = pages_to_free; + } else + > pages_array = pages; + + if (set_pages_array_wb(pages_array, pages_nr)) you can use set_pages_wb(pages[i], 1 << order) to instead of creating page array marked red, this way, you will not need to kmalloc and patch#3. and more, if you select set_pages_wb, you also need to clone it in TTM like set_pages_array_wb for non-x86 case. Regards, David Zhou > + pr_err("Failed to set %d pages to wb!\n", pages_nr); > + __free_pages(pages[i], order); > + } > + > + kfree(pages_to_free); > } > > static void ttm_pool_update_free_locked(struct ttm_page_pool *pool, > @@ -354,7 +380,7 @@ static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free, > */ > spin_unlock_irqrestore(&pool->lock, irq_flags); > > - ttm_pages_put(pages_to_free, freed_pages); > + ttm_pages_put(pages_to_free, freed_pages, pool->order); > if (likely(nr_free != FREE_ALL_PAGES)) > nr_free -= freed_pages; > > @@ -389,7 +415,7 @@ static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free, > spin_unlock_irqrestore(&pool->lock, irq_flags); > > if (freed_pages) > - ttm_pages_put(pages_to_free, freed_pages); > + ttm_pages_put(pages_to_free, freed_pages, pool->order); > out: > if (pages_to_free != static_buf) > kfree(pages_to_free); --------------E56C64B1DA46F84BBF4C669D Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: 8bit



On 2017年11月22日 13:36, Roger He wrote:
Change-Id: Ia55b206d95812c5afcfd6cec29f580758d1f50f0
Signed-off-by: Roger He <Hongbo.He@amd.com>
---
 drivers/gpu/drm/ttm/ttm_page_alloc.c | 42 +++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index 0a0c653..de64209 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -285,13 +285,39 @@ static struct ttm_page_pool *ttm_get_pool(int flags, bool huge,
 }
 
 /* set memory back to wb and free the pages. */
-static void ttm_pages_put(struct page *pages[], unsigned npages)
+static void ttm_pages_put(struct page *pages[], unsigned npages,
+		unsigned int order)
 {
-	unsigned i;
-	if (set_pages_array_wb(pages, npages))
-		pr_err("Failed to set %d pages to wb!\n", npages);
-	for (i = 0; i < npages; ++i)
-		__free_page(pages[i]);
+	struct page **pages_to_free = NULL;
+	struct page **pages_array;
+	struct page *p;
+	unsigned int i, j, pages_nr = (1 << order);
+
+	if (order > 0) {
+		pages_to_free = kmalloc_array(pages_nr, sizeof(struct page *),
+					GFP_KERNEL);
+		if (!pages_to_free) {
+			pr_err("Failed to allocate memory for ttm pages put operation\n");
+			return;
+		}
+	}
+
+	for (i = 0; i < npages; ++i) {
+		if (order > 0) {
+			p = pages[i];
+			for (j = 0; j < pages_nr; ++j)
+				pages_to_free[j] = p++;
+
+			pages_array = pages_to_free;
+		} else
+			pages_array = pages;
+
+		if (set_pages_array_wb(pages_array, pages_nr))
you can use set_pages_wb(pages[i], 1 << order) to instead of creating page array marked red, this way, you will not need to kmalloc and patch#3.

and more, if you select set_pages_wb, you also need to clone it in TTM like set_pages_array_wb for non-x86 case.

Regards,
David Zhou
+			pr_err("Failed to set %d pages to wb!\n", pages_nr);
+		__free_pages(pages[i], order);
+	}
+
+	kfree(pages_to_free);
 }
 
 static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
@@ -354,7 +380,7 @@ static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
 			 */
 			spin_unlock_irqrestore(&pool->lock, irq_flags);
 
-			ttm_pages_put(pages_to_free, freed_pages);
+			ttm_pages_put(pages_to_free, freed_pages, pool->order);
 			if (likely(nr_free != FREE_ALL_PAGES))
 				nr_free -= freed_pages;
 
@@ -389,7 +415,7 @@ static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
 	spin_unlock_irqrestore(&pool->lock, irq_flags);
 
 	if (freed_pages)
-		ttm_pages_put(pages_to_free, freed_pages);
+		ttm_pages_put(pages_to_free, freed_pages, pool->order);
 out:
 	if (pages_to_free != static_buf)
 		kfree(pages_to_free);

--------------E56C64B1DA46F84BBF4C669D-- --===============1397030488== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --===============1397030488==--