drm/ttm: allocate/free multiple pages in a single call
Subsystems (4)
PATCH 1/6 drm/ttm: allocate/free multiple pages in a single call
From: Christian König <[email protected]>
Totally surprisingly this is more efficient than doing it page by page.
--- drivers/gpu/drm/ttm/ttm_page_alloc.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-)
drivers/gpu/drm/ttm/ttm_page_alloc.c +14 -15
@@ -873,15 +873,14 @@ int ttm_pool_populate(struct ttm_tt *ttm)if (ttm->state != tt_unpopulated)return 0 ; -for (i =0 ; i < ttm->num_pages; ++i) { - ret =ttm_get_pages (&ttm->pages[i],1 , - ttm->page_flags, - ttm->caching_state); -if (ret !=0 ) { -ttm_pool_unpopulate (ttm); -return -ENOMEM ; - } + ret =ttm_get_pages (ttm->pages, ttm->num_pages, ttm->page_flags, + ttm->caching_state); +if (unlikely (ret !=0 )) { +ttm_pool_unpopulate (ttm); +return ret; + } +for (i =0 ; i < ttm->num_pages; ++i) { ret =ttm_mem_global_alloc_page (mem_glob, ttm->pages[i],PAGE_SIZE );if (unlikely (ret !=0 )) {
@@ -908,14 +907,14 @@ void ttm_pool_unpopulate(struct ttm_tt *ttm)unsigned i;for (i =0 ; i < ttm->num_pages; ++i) { -if (ttm->pages[i]) { -ttm_mem_global_free_page (ttm->glob->mem_glob, - ttm->pages[i],PAGE_SIZE ); -ttm_put_pages (&ttm->pages[i],1 , - ttm->page_flags, - ttm->caching_state); - } +if (!ttm->pages[i]) +continue ; + +ttm_mem_global_free_page (ttm->glob->mem_glob, ttm->pages[i], +PAGE_SIZE ); } +ttm_put_pages (ttm->pages, ttm->num_pages, ttm->page_flags, + ttm->caching_state); ttm->state = tt_unpopulated; }EXPORT_SYMBOL (ttm_pool_unpopulate);
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/6 drm/ttm: DMA map/unmap consecutive pages as a whole v2
From: Christian König <[email protected]>
Instead of mapping them bit by bit map/unmap all consecutive pages as in one call.
v2: test for consecutive pages instead of using compound page order.
--- drivers/gpu/drm/ttm/ttm_page_alloc.c | 48 +++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 9 deletions(-)
drivers/gpu/drm/ttm/ttm_page_alloc.c +39 -9
@@ -922,16 +922,26 @@ EXPORT_SYMBOL(ttm_pool_unpopulate);#if defined(CONFIG_SWIOTLB ) || defined(CONFIG_INTEL_IOMMU )int ttm_populate_and_map_pages (struct device *dev,struct ttm_dma_tt *tt) { -unsigned i; +unsigned i, j;int r; r =ttm_pool_populate (&tt->ttm);if (r)return r; -for (i =0 ; i < tt->ttm.num_pages; i++) { +for (i =0 ; i < tt->ttm.num_pages; ++i) { +struct page *p = tt->ttm.pages[i]; +size_t num_pages =1 ; + +for (j = i +1 ; j < tt->ttm.num_pages; ++j) { +if (++p != tt->ttm.pages[j]) +break ; + + ++num_pages; + } + tt->dma_address[i] =dma_map_page (dev, tt->ttm.pages[i], -0 ,PAGE_SIZE , +0 , num_pages *PAGE_SIZE ,DMA_BIDIRECTIONAL );if (dma_mapping_error (dev, tt->dma_address[i])) {while (i--) {
@@ -942,6 +952,11 @@ int ttm_populate_and_map_pages(struct device *dev, struct ttm_dma_tt *tt)ttm_pool_unpopulate (&tt->ttm);return -EFAULT ; } + +for (j =1 ; j < num_pages; ++j) { + tt->dma_address[i +1 ] = tt->dma_address[i] +PAGE_SIZE ; + ++i; + } }return 0 ; }
@@ -949,13 +964,28 @@ EXPORT_SYMBOL(ttm_populate_and_map_pages);void ttm_unmap_and_unpopulate_pages (struct device *dev,struct ttm_dma_tt *tt) { -unsigned i; - -for (i =0 ; i < tt->ttm.num_pages; i++) { -if (tt->dma_address[i]) { -dma_unmap_page (dev, tt->dma_address[i], -PAGE_SIZE ,DMA_BIDIRECTIONAL ); +unsigned i, j; + +for (i =0 ; i < tt->ttm.num_pages;) { +struct page *p = tt->ttm.pages[i]; +size_t num_pages =1 ; + +if (!tt->dma_address[i] || !tt->ttm.pages[i]) { + ++i; +continue ; } + +for (j = i +1 ; j < tt->ttm.num_pages; ++j) { +if (++p != tt->ttm.pages[j]) +break ; + + ++num_pages; + } + +dma_unmap_page (dev, tt->dma_address[i], num_pages *PAGE_SIZE , +DMA_BIDIRECTIONAL ); + + i += num_pages; }ttm_pool_unpopulate (&tt->ttm); }
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 1507208874-3448-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
PATCH 3/6 drm/ttm: add transparent huge page support for cached allocations
From: Christian König <[email protected]>
Try to allocate huge pages when it makes sense.
--- drivers/gpu/drm/ttm/ttm_page_alloc.c | 49 ++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 8 deletions(-)
drivers/gpu/drm/ttm/ttm_page_alloc.c +41 -8
@@ -685,12 +685,24 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags,if (pool ==NULL ) {/* No pool for this memory type so free the pages */ -for (i =0 ; i < npages; i++) { -if (pages[i]) { -if (page_count (pages[i]) !=1 ) -pr_err ("Erroneous page count. Leaking pages.\n" ); -__free_page (pages[i]); - pages[i] =NULL ; + i =0 ; +while (i < npages) { +unsigned order; + +if (!pages[i]) { + ++i; +continue ; + } + +if (page_count (pages[i]) !=1 ) +pr_err ("Erroneous page count. Leaking pages.\n" ); + order =compound_order (pages[i]); +__free_pages (pages[i], order); + + order =1 << order; +while (order) { + pages[i++] =NULL ; + --order; } }return ;
@@ -740,12 +752,32 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,/* No pool for cached pages */ if (pool ==NULL ) { +unsigned i, j; +if (flags &TTM_PAGE_FLAG_DMA32 ) gfp_flags |=GFP_DMA32 ;else gfp_flags |=GFP_HIGHUSER ; -for (r =0 ; r < npages; ++r) { + i =0 ; +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +while (npages >=HPAGE_PMD_NR ) { +gfp_t huge_flags = gfp_flags; + + huge_flags |=GFP_TRANSHUGE ; + huge_flags &= ~__GFP_MOVABLE; + p =alloc_pages (huge_flags,HPAGE_PMD_ORDER ); +if (!p) +break ; + +for (j =0 ; j <HPAGE_PMD_NR ; ++j) + pages[i++] = p++; + + npages -=HPAGE_PMD_NR ; + } +#endif + +while (npages) { p =alloc_page (gfp_flags);if (!p) {
@@ -753,7 +785,8 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,return -ENOMEM ; } - pages[r] = p; + pages[i++] = p; + --npages; }return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/6 drm/ttm: move more logic into ttm_page_pool_get_pages
In reply to a message not in the archiveFrom: Christian König <[email protected]>
Make it easier to add huge page pool.
--- drivers/gpu/drm/ttm/ttm_page_alloc.c | 98 +++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 46 deletions(-)
drivers/gpu/drm/ttm/ttm_page_alloc.c +52 -46
@@ -627,19 +627,20 @@ static void ttm_page_pool_fill_locked(struct ttm_page_pool *pool, }/** -* Cut 'count' number of pages from the pool and put them on the return list. +* Allocate pages from the pool and put them on the return list. * -* @return count of pages still required to fulfill the request. +* @return zero for success or negative error code. */ -static unsigned ttm_page_pool_get_pages (struct ttm_page_pool *pool, -struct list_head *pages, -int ttm_flags, -enum ttm_caching_state cstate, -unsigned count) +static int ttm_page_pool_get_pages (struct ttm_page_pool *pool, +struct list_head *pages, +int ttm_flags, +enum ttm_caching_state cstate, +unsigned count) {unsigned long irq_flags;struct list_head *p;unsigned i; +int r =0 ;spin_lock_irqsave (&pool->lock, irq_flags);ttm_page_pool_fill_locked (pool, ttm_flags, cstate, count, &irq_flags);
@@ -672,7 +673,35 @@ static unsigned ttm_page_pool_get_pages(struct ttm_page_pool *pool, count =0 ; out:spin_unlock_irqrestore (&pool->lock, irq_flags); -return count; + +/* clear the pages coming from the pool if requested */ +if (ttm_flags &TTM_PAGE_FLAG_ZERO_ALLOC ) { +struct page *page; + +list_for_each_entry (page, pages, lru) { +if (PageHighMem (page)) +clear_highpage (page); +else +clear_page (page_address (page)); + } + } + +/* If pool didn't have enough pages allocate new one. */ +if (count) { +gfp_t gfp_flags = pool->gfp_flags; + +/* set zero flag for page allocation if required */ +if (ttm_flags &TTM_PAGE_FLAG_ZERO_ALLOC ) + gfp_flags |= __GFP_ZERO; + +/* ttm_alloc_new_pages doesn't reference pool so we can run +* multiple requests in parallel. +**/ + r =ttm_alloc_new_pages (pages, gfp_flags, ttm_flags, cstate, + count); + } + +return r; }/* Put all pages in pages list to correct pool to wait for reuse */
@@ -742,18 +771,18 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,struct ttm_page_pool *pool =ttm_get_pool (flags, cstate);struct list_head plist;struct page *p =NULL ; -gfp_t gfp_flags =GFP_USER ;unsigned count;int r; -/* set zero flag for page allocation if required */ -if (flags &TTM_PAGE_FLAG_ZERO_ALLOC ) - gfp_flags |= __GFP_ZERO; -/* No pool for cached pages */ if (pool ==NULL ) { +gfp_t gfp_flags =GFP_USER ;unsigned i, j; +/* set zero flag for page allocation if required */ +if (flags &TTM_PAGE_FLAG_ZERO_ALLOC ) + gfp_flags |= __GFP_ZERO; +if (flags &TTM_PAGE_FLAG_DMA32 ) gfp_flags |=GFP_DMA32 ;else
@@ -791,44 +820,21 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,return 0 ; } -/* combine zero flag to pool flags */ - gfp_flags |= pool->gfp_flags; -/* First we take pages from the pool */ INIT_LIST_HEAD (&plist); - npages =ttm_page_pool_get_pages (pool, &plist, flags, cstate, npages); + 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) pages[count++] = p; - } - -/* clear the pages coming from the pool if requested */ -if (flags &TTM_PAGE_FLAG_ZERO_ALLOC ) { -list_for_each_entry (p, &plist, lru) { -if (PageHighMem (p)) -clear_highpage (p); -else -clear_page (page_address (p)); - } - } -/* If pool didn't have enough pages allocate new one. */ -if (npages >0 ) { -/* ttm_alloc_new_pages doesn't reference pool so we can run -* multiple requests in parallel. -**/ -INIT_LIST_HEAD (&plist); - r =ttm_alloc_new_pages (&plist, gfp_flags, flags, cstate, npages); -list_for_each_entry (p, &plist, lru) { - pages[count++] = p; - } -if (r) { -/* If there is any pages in the list put them back to -* the pool. */ -pr_err ("Failed to allocate extra pages for large request\n" ); -ttm_put_pages (pages, count, flags, cstate); -return r; - } +if (r) { +/* If there is any pages in the list put them back to +* the pool. +*/ +pr_err ("Failed to allocate extra pages for large request\n" ); +ttm_put_pages (pages, count, flags, cstate); +return r; }return 0 ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/6 drm/ttm: add transparent huge page support for wc or uc allocations
In reply to a message not in the archiveFrom: Christian König <[email protected]>
Add a new huge page pool and try to allocate from it when it makes sense.
--- drivers/gpu/drm/ttm/ttm_page_alloc.c | 134 ++++++++++++++++++++++++++++------- 1 file changed, 107 insertions(+), 27 deletions(-)
drivers/gpu/drm/ttm/ttm_page_alloc.c +107 -27
@@ -95,7 +95,7 @@ struct ttm_pool_opts {unsigned small; }; -#define NUM_POOLS 4 +#define NUM_POOLS 6/** * struct ttm_pool_manager - Holds memory pools for fst allocation
@@ -122,6 +122,8 @@ struct ttm_pool_manager {struct ttm_page_pool uc_pool;struct ttm_page_pool wc_pool_dma32;struct ttm_page_pool uc_pool_dma32; +struct ttm_page_pool wc_pool_huge; +struct ttm_page_pool uc_pool_huge; } ; }; };
@@ -256,8 +258,8 @@ static int set_pages_array_uc(struct page **pages, int addrinarray)/** * Select the right pool or requested caching state and ttm flags. */ -static struct ttm_page_pool *ttm_get_pool (int flags, -enum ttm_caching_state cstate) +static struct ttm_page_pool *ttm_get_pool (int flags,bool huge, +enum ttm_caching_state cstate) {int pool_index;
@@ -269,9 +271,15 @@ static struct ttm_page_pool *ttm_get_pool(int flags,else pool_index =0x1 ; -if (flags &TTM_PAGE_FLAG_DMA32 ) +if (flags &TTM_PAGE_FLAG_DMA32 ) { +if (huge) +return NULL ; pool_index |=0x2 ; + }else if (huge) { + pool_index |=0x4 ; + } +return &_manager->pools[pool_index]; }
@@ -494,12 +502,14 @@ static void ttm_handle_caching_state_failure(struct list_head *pages,* pages returned in pages array. */ static int ttm_alloc_new_pages (struct list_head *pages,gfp_t gfp_flags, -int ttm_flags,enum ttm_caching_state cstate,unsigned count) +int ttm_flags,enum ttm_caching_state cstate, +unsigned count,unsigned order) {struct page **caching_array;struct page *p;int r =0 ; -unsigned i, cpages; +unsigned i, j, cpages; +unsigned npages =1 << order;unsigned max_cpages =min (count, (unsigned )(PAGE_SIZE /sizeof (struct page *)));
@@ -512,7 +522,7 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags, }for (i =0 , cpages =0 ; i < count; ++i) { - p =alloc_page (gfp_flags); + p =alloc_pages (gfp_flags, order);if (!p) {pr_err ("Unable to get page %u\n" , i);
@@ -531,14 +541,18 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags, goto out; } +list_add (&p->lru, pages); +#ifdef CONFIG_HIGHMEM /* gfp flags of highmem page should never be dma32 so we * we should be fine in such case */ -if (!PageHighMem (p)) +if (PageHighMem (p)) +continue ; +#endif - { - caching_array[cpages++] = p; +for (j =0 ; j < npages; ++j) { + caching_array[cpages++] = p++;if (cpages == max_cpages) { r = ttm_set_pages_caching(caching_array,
@@ -552,8 +566,6 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags, cpages =0 ; } } - -list_add (&p->lru, pages); }if (cpages) {
@@ -573,9 +585,9 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags,* Fill the given pool if there aren't enough pages and the requested number of * pages is small. */ -static void ttm_page_pool_fill_locked (struct ttm_page_pool *pool, -int ttm_flags,enum ttm_caching_state cstate,unsigned count, -unsigned long *irq_flags) +static void ttm_page_pool_fill_locked (struct ttm_page_pool *pool,int ttm_flags, +enum ttm_caching_state cstate, +unsigned count,unsigned long *irq_flags) {struct page *p;int r;
@@ -605,7 +617,7 @@ static void ttm_page_pool_fill_locked(struct ttm_page_pool *pool,INIT_LIST_HEAD (&new_pages); r =ttm_alloc_new_pages (&new_pages, pool->gfp_flags, ttm_flags, - cstate, alloc_size); + cstate, alloc_size,0 );spin_lock_irqsave (&pool->lock, *irq_flags);if (!r) {
@@ -635,7 +647,7 @@ static int ttm_page_pool_get_pages(struct ttm_page_pool *pool,struct list_head *pages, int ttm_flags, enum ttm_caching_state cstate, - unsigned count) + unsigned count, unsigned order) { unsigned long irq_flags;struct list_head *p;
@@ -643,7 +655,9 @@ static int ttm_page_pool_get_pages(struct ttm_page_pool *pool,int r =0 ;spin_lock_irqsave (&pool->lock, irq_flags); -ttm_page_pool_fill_locked (pool, ttm_flags, cstate, count, &irq_flags); +if (!order) +ttm_page_pool_fill_locked (pool, ttm_flags, cstate, count, + &irq_flags);if (count >= pool->npages) {/* take all pages from the pool */
@@ -698,7 +712,7 @@ static int ttm_page_pool_get_pages(struct ttm_page_pool *pool,* multiple requests in parallel. **/ r =ttm_alloc_new_pages (pages, gfp_flags, ttm_flags, cstate, - count); + count, order); }return r;
@@ -708,8 +722,9 @@ static int ttm_page_pool_get_pages(struct ttm_page_pool *pool,static void ttm_put_pages (struct page **pages,unsigned npages,int flags,enum ttm_caching_state cstate) { +struct ttm_page_pool *pool =ttm_get_pool (flags, false, cstate); +struct ttm_page_pool *huge =ttm_get_pool (flags, true, cstate);unsigned long irq_flags; -struct ttm_page_pool *pool =ttm_get_pool (flags, cstate);unsigned i;if (pool ==NULL ) {
@@ -737,8 +752,48 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags,return ; } + i =0 ; +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +if (huge) { +unsigned max_size, n2free; + +spin_lock_irqsave (&huge->lock, irq_flags); +while (i < npages) { +struct page *p = pages[i]; +unsigned j; + +if (!p) +break ; + +for (j =0 ; j <HPAGE_PMD_NR ; ++j) +if (p++ != pages[i + j]) +break ; + +if (j !=HPAGE_PMD_NR ) +break ; + +list_add_tail (&pages[i]->lru, &huge->list); + +for (j =0 ; j <HPAGE_PMD_NR ; ++j) + pages[i++] =NULL ; + huge->npages++; + } + +/* Check that we don't go over the pool limit */ + max_size = _manager->options.max_size; + max_size /=HPAGE_PMD_NR ; +if (huge->npages > max_size) + n2free = huge->npages - max_size; +else + n2free =0 ; +spin_unlock_irqrestore (&huge->lock, irq_flags); +if (n2free) +ttm_page_pool_free (huge, n2free, false); + } +#endif +spin_lock_irqsave (&pool->lock, irq_flags); -for (i =0 ; i < npages; i++) { +while (i < npages) {if (pages[i]) {if (page_count (pages[i]) !=1 )pr_err ("Erroneous page count. Leaking pages.\n" );
@@ -746,6 +801,7 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags, pages[i] =NULL ; pool->npages++; } + ++i; }/* Check that we don't go over the pool limit */ npages =0 ;
@@ -768,7 +824,8 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags,static int ttm_get_pages (struct page **pages,unsigned npages,int flags,enum ttm_caching_state cstate) { -struct ttm_page_pool *pool =ttm_get_pool (flags, cstate); +struct ttm_page_pool *pool =ttm_get_pool (flags, false, cstate); +struct ttm_page_pool *huge =ttm_get_pool (flags, true, cstate);struct list_head plist;struct page *p =NULL ;unsigned count;
@@ -820,11 +877,28 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,return 0 ; } -/* First we take pages from the pool */ + count =0 ; + +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +if (huge && npages >=HPAGE_PMD_NR ) { +INIT_LIST_HEAD (&plist); +ttm_page_pool_get_pages (huge, &plist, flags, cstate, + npages /HPAGE_PMD_NR , +HPAGE_PMD_ORDER ); + +list_for_each_entry (p, &plist, lru) { +unsigned j; + +for (j =0 ; j <HPAGE_PMD_NR ; ++j) + pages[count++] = &p[j]; + } + } +#endif +INIT_LIST_HEAD (&plist); - r =ttm_page_pool_get_pages (pool, &plist, flags, cstate, npages); + r =ttm_page_pool_get_pages (pool, &plist, flags, cstate, + npages - count,0 ); - count =0 ;list_for_each_entry (p, &plist, lru) pages[count++] = p;
@@ -871,6 +945,12 @@ int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)ttm_page_pool_init_locked (&_manager->uc_pool_dma32,GFP_USER |GFP_DMA32 ,"uc dma" ); +ttm_page_pool_init_locked (&_manager->wc_pool_huge, +GFP_TRANSHUGE & ~__GFP_MOVABLE,"wc huge" ); + +ttm_page_pool_init_locked (&_manager->uc_pool_huge, +GFP_TRANSHUGE & ~__GFP_MOVABLE,"uc huge" ); + _manager->options.max_size = max_pages; _manager->options.small =SMALL_ALLOCATION ; _manager->options.alloc_size =NUM_PAGES_TO_ALLOC ;
@@ -1040,12 +1120,12 @@ int ttm_page_alloc_debugfs(struct seq_file *m, void *data)seq_printf (m,"No pool allocator running.\n" );return 0 ; } -seq_printf (m,"%6s %12s %13s %8s\n" , +seq_printf (m,"%7s %12s %13s %8s\n" , h[0 ], h[1 ], h[2 ], h[3 ]);for (i =0 ; i <NUM_POOLS ; ++i) { p = &_manager->pools[i]; -seq_printf (m,"%6s %12ld %13ld %8d\n" , +seq_printf (m,"%7s %12ld %13ld %8d\n" , p->name, p->nrefills, p->nfrees, p->npages); }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/6 drm/amdgpu: add VM support for huge pages v2
In reply to a message not in the archiveFrom: Christian König <[email protected]>
Convert GTT mappings into linear ones for huge page handling.
v2: use fragment size as minimum for linear conversion
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +22 -3
@@ -1698,6 +1698,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,struct drm_mm_node *nodes, struct dma_fence **fence) { + unsigned min_linear_pages = 1 << adev->vm_manager.fragment_size;uint64_t pfn, start = mapping->start;int r;
@@ -1732,6 +1733,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, } do { + dma_addr_t *dma_addr = NULL; uint64_t max_entries; uint64_t addr, last;
@@ -1745,15 +1747,32 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, }if (pages_addr) { +uint64_t count; + max_entries =min (max_entries,16ull *1024ull ); - addr =0 ; +for (count =1 ; count < max_entries; ++count) { +uint64_t idx = pfn + count; + +if (pages_addr[idx] != + (pages_addr[idx -1 ] +PAGE_SIZE )) +break ; + } + +if (count < min_linear_pages) { + addr = pfn <<PAGE_SHIFT ; + dma_addr = pages_addr; + }else { + addr = pages_addr[pfn]; + max_entries = count; + } + }else if (flags &AMDGPU_PTE_VALID ) { addr += adev->vm_manager.vram_base_offset; + addr += pfn <<PAGE_SHIFT ; } - addr += pfn <<PAGE_SHIFT ; last =min ((uint64_t )mapping->last, start + max_entries -1 ); - r =amdgpu_vm_bo_update_mapping (adev, exclusive, pages_addr, vm, + r =amdgpu_vm_bo_update_mapping (adev, exclusive, dma_addr, vm, start, last, flags, addr, fence);if (r)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1507208874-3448-6-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Deucher, Alexander
Acked-by Alex DeucherRE: [PATCH 6/6] drm/amdgpu: add VM support for huge pages v2
Quoted 7 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian König
Sent: Thursday, October 05, 2017 9:08 AM
To: [email protected]; [email protected]
Subject: [PATCH 6/6] drm/amdgpu: add VM support for huge pages v2
Quoted 8 lines
From: Christian König <[email protected]>
Convert GTT mappings into linear ones for huge page handling.
v2: use fragment size as minimum for linear conversion
Signed-off-by Christian König <[email protected]>Reviewed-by Felix Kuehling <[email protected]>
Series is:
Quoted 71 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-0@@ -1698,6 +1698,7 @@ static int amdgpu_vm_bo_split_mapping(structamdgpu_device *adev, struct drm_mm_node *nodes, struct dma_fence **fence) { + unsigned min_linear_pages = 1 << adev- >vm_manager.fragment_size;uint64_t pfn, start = mapping->start;drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +21
-3int r;@@ -1732,6 +1733,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, } do { + dma_addr_t *dma_addr = NULL; uint64_t max_entries; uint64_t addr, last;@@ -1745,15 +1747,32 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, }if (pages_addr) { +uint64_t count; + max_entries =min (max_entries,16ull *1024ull ); - addr =0 ; +for (count =1 ; count < max_entries; ++count) { +uint64_t idx = pfn + count; + +if (pages_addr[idx] != + (pages_addr[idx -1 ] +PAGE_SIZE )) +break ; + } + +if (count < min_linear_pages) { + addr = pfn <<PAGE_SHIFT ; + dma_addr = pages_addr; + }else { + addr = pages_addr[pfn]; + max_entries = count; + } + }else if (flags &AMDGPU_PTE_VALID ) { addr += adev->vm_manager.vram_base_offset; + addr += pfn <<PAGE_SHIFT ; } - addr += pfn <<PAGE_SHIFT ; last =min ((uint64_t )mapping->last, start + max_entries -1 ); - r = amdgpu_vm_bo_update_mapping(adev, exclusive, pages_addr, vm, + r = amdgpu_vm_bo_update_mapping(adev, exclusive, dma_addr, vm,drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-1start, last, flags, addr, fence);if (r) --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx