When we detect consecutive allocation of pages swap them to avoid accidentally freeing them as huge page.
Signed-off-by: Christian König christian.koenig@amd.com --- drivers/gpu/drm/ttm/ttm_page_alloc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index c82d94cbbabc..60401350a01a 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -921,6 +921,14 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags, return -ENOMEM; }
+ /* Swap the pages if we detect consecutive order */ + if (i && pages[i - 1] == p - 1) { + struct page *tmp = p; + + p = pages[i - 1]; + pages[i - 1] = tmp; + } + pages[i++] = p; --npages; }
When we detect consecutive allocation of pages swap them to avoid accidentally freeing them as huge page.
Signed-off-by: Christian König christian.koenig@amd.com --- drivers/gpu/drm/ttm/ttm_page_alloc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index 60401350a01a..909028fd663d 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -957,8 +957,16 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags, r = ttm_page_pool_get_pages(pool, &plist, flags, cstate, npages - count, 0);
- list_for_each_entry(p, &plist, lru) + list_for_each_entry(p, &plist, lru) { + /* Swap the pages if we detect consecutive order */ + if (count && pages[count - 1] == p - 1) { + struct page *tmp = p; + + p = pages[count - 1]; + pages[count - 1] = tmp; + } pages[count++] = p; + }
if (r) { /* If there is any pages in the list put them back to
On 2017-12-04 12:42 PM, Christian König wrote:
When we detect consecutive allocation of pages swap them to avoid accidentally freeing them as huge page.
Signed-off-by: Christian König christian.koenig@amd.com
drivers/gpu/drm/ttm/ttm_page_alloc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index c82d94cbbabc..60401350a01a 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -921,6 +921,14 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags, return -ENOMEM; }
/* Swap the pages if we detect consecutive order */if (i && pages[i - 1] == p - 1) {struct page *tmp = p;p = pages[i - 1];pages[i - 1] = tmp;}
Should be (something like):
if (i && pages[i - 1] == p - 1) swap(pages[i - 1], p);
Am 04.12.2017 um 12:51 schrieb Michel Dänzer:
On 2017-12-04 12:42 PM, Christian König wrote:
When we detect consecutive allocation of pages swap them to avoid accidentally freeing them as huge page.
Signed-off-by: Christian König christian.koenig@amd.com
drivers/gpu/drm/ttm/ttm_page_alloc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index c82d94cbbabc..60401350a01a 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -921,6 +921,14 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags, return -ENOMEM; }
/* Swap the pages if we detect consecutive order */if (i && pages[i - 1] == p - 1) {struct page *tmp = p;p = pages[i - 1];pages[i - 1] = tmp;}Should be (something like):
if (i && pages[i - 1] == p - 1) swap(pages[i - 1], p);
Good point, updates patches send out a few seconds ago.
Please review, Christian.
dri-devel@lists.freedesktop.org
-
Christian König -
Michel Dänzer