drm/i915: Paranoia - get zeroed page table pages
Subsystems (2)
PATCH 1/1 drm/i915: Paranoia - get zeroed page table pages
We normally clear the page tables as one of the first things during initialization. They are however wired up (and potentially valid) before we clear them.
To prevent the GPU from doing anything we might later regret, simply get zeroed pages, which always mean invalid on all GENs.
NOTE: that a similar paranoia could be applied to GGTT via making sure all entries are invalid ASAP. I think the extra work required to fix such a BIOS bug is unwarranted until proven necessary.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +9 -7
@@ -354,12 +354,13 @@ static struct page **__gen8_alloc_page_tables(void)struct page **pt_pages;int i; - pt_pages =kcalloc (GEN8_PDES_PER_PAGE ,sizeof (struct page *),GFP_KERNEL ); + pt_pages =kcalloc (GEN8_PDES_PER_PAGE ,sizeof (struct page *), +GFP_KERNEL | __GFP_ZERO);if (!pt_pages)return ERR_PTR (-ENOMEM );for (i =0 ; i <GEN8_PDES_PER_PAGE ; i++) { - pt_pages[i] =alloc_page (GFP_KERNEL ); + pt_pages[i] =alloc_page (GFP_KERNEL | __GFP_ZERO);if (!pt_pages[i]) goto bail; }
@@ -410,7 +411,7 @@ static int gen8_ppgtt_allocate_dma(struct i915_hw_ppgtt *ppgtt)for (i =0 ; i < ppgtt->num_pd_pages; i++) { ppgtt->gen8_pt_dma_addr[i] =kcalloc (GEN8_PDES_PER_PAGE ,sizeof (dma_addr_t), -GFP_KERNEL ); +GFP_KERNEL | __GFP_ZERO);if (!ppgtt->gen8_pt_dma_addr[i])return -ENOMEM ; }
@@ -421,7 +422,8 @@ static int gen8_ppgtt_allocate_dma(struct i915_hw_ppgtt *ppgtt)static int gen8_ppgtt_allocate_page_directories (struct i915_hw_ppgtt *ppgtt,const int max_pdp) { - ppgtt->pd_pages =alloc_pages (GFP_KERNEL ,get_order (max_pdp <<PAGE_SHIFT )); + ppgtt->pd_pages =alloc_pages (GFP_KERNEL | __GFP_ZERO, +get_order (max_pdp <<PAGE_SHIFT ));if (!ppgtt->pd_pages)return -ENOMEM ;
@@ -1015,13 +1017,13 @@ static int gen6_ppgtt_allocate_page_tables(struct i915_hw_ppgtt *ppgtt)int i; ppgtt->pt_pages =kcalloc (ppgtt->num_pd_entries,sizeof (struct page *), -GFP_KERNEL ); +GFP_KERNEL | __GFP_ZERO);if (!ppgtt->pt_pages)return -ENOMEM ;for (i =0 ; i < ppgtt->num_pd_entries; i++) { - ppgtt->pt_pages[i] =alloc_page (GFP_KERNEL ); + ppgtt->pt_pages[i] =alloc_page (GFP_KERNEL | __GFP_ZERO);if (!ppgtt->pt_pages[i]) {gen6_ppgtt_free (ppgtt);return -ENOMEM ;
@@ -1046,7 +1048,7 @@ static int gen6_ppgtt_alloc(struct i915_hw_ppgtt *ppgtt) } ppgtt->pt_dma_addr =kcalloc (ppgtt->num_pd_entries,sizeof (dma_addr_t), -GFP_KERNEL ); +GFP_KERNEL | __GFP_ZERO);if (!ppgtt->pt_dma_addr) {drm_mm_remove_node (&ppgtt->node);gen6_ppgtt_free (ppgtt);
Signature · 1 line
1.9.0
PATCH v2 1/1 drm/i915: Paranoia - get zeroed page table pages
We normally clear the page tables as one of the first things during initialization. They are however wired up (and potentially valid) before we clear them.
To prevent the GPU from doing anything we might later regret, simply get zeroed pages, which always mean invalid on all GENs.
NOTE: that a similar paranoia could be applied to GGTT via making sure all entries are invalid ASAP. I think the extra work required to fix such a BIOS bug is unwarranted until proven necessary.
v2: Remove useless GFP_ZERO in the kcallocs
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +4 -3
@@ -359,7 +359,7 @@ static struct page **__gen8_alloc_page_tables(void)return ERR_PTR (-ENOMEM );for (i =0 ; i <GEN8_PDES_PER_PAGE ; i++) { - pt_pages[i] =alloc_page (GFP_KERNEL ); + pt_pages[i] =alloc_page (GFP_KERNEL | __GFP_ZERO);if (!pt_pages[i]) goto bail; }
@@ -421,7 +421,8 @@ static int gen8_ppgtt_allocate_dma(struct i915_hw_ppgtt *ppgtt)static int gen8_ppgtt_allocate_page_directories (struct i915_hw_ppgtt *ppgtt,const int max_pdp) { - ppgtt->pd_pages =alloc_pages (GFP_KERNEL ,get_order (max_pdp <<PAGE_SHIFT )); + ppgtt->pd_pages =alloc_pages (GFP_KERNEL | __GFP_ZERO, +get_order (max_pdp <<PAGE_SHIFT ));if (!ppgtt->pd_pages)return -ENOMEM ;
@@ -1021,7 +1022,7 @@ static int gen6_ppgtt_allocate_page_tables(struct i915_hw_ppgtt *ppgtt)return -ENOMEM ;for (i =0 ; i < ppgtt->num_pd_entries; i++) { - ppgtt->pt_pages[i] =alloc_page (GFP_KERNEL ); + ppgtt->pt_pages[i] =alloc_page (GFP_KERNEL | __GFP_ZERO);if (!ppgtt->pt_pages[i]) {gen6_ppgtt_free (ppgtt);return -ENOMEM ;
Signature · 1 line
1.9.0
Quoted 3 lines · Ben Widawsky
We normally clear the page tables as one of the first things during initialization. They are however wired up (and potentially valid) before we clear them.
I might be missing something, but afaics the page directories/tables are not in use until after ppgtt->enable()/mm_switch() is called on them, which is after the clear_range() call.
I'd understand if it's about leaving uninitialized stuff _after_ clear_range() is called. But I think because of the 1G size alignment for ppgtt that's not possible either.
--Imre
Quoted 38 lines
To prevent the GPU from doing anything we might later regret, simply get zeroed pages, which always mean invalid on all GENs.
NOTE: that a similar paranoia could be applied to GGTT via making sure all entries are invalid ASAP. I think the extra work required to fix such a BIOS bug is unwarranted until proven necessary.
v2: Remove useless
GFP_ZEROin the kcallocsSigned-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +3
-2@@ -359,7 +359,7 @@ static struct page **__gen8_alloc_page_tables(void)return ERR_PTR (-ENOMEM );for (i =0 ; i <GEN8_PDES_PER_PAGE ; i++) { - pt_pages[i] =alloc_page (GFP_KERNEL ); + pt_pages[i] =alloc_page (GFP_KERNEL | __GFP_ZERO);if (!pt_pages[i]) goto bail; }@@ -421,7 +421,8 @@ static int gen8_ppgtt_allocate_dma(struct i915_hw_ppgtt *ppgtt)static int gen8_ppgtt_allocate_page_directories (struct i915_hw_ppgtt *ppgtt,const int max_pdp) { - ppgtt->pd_pages =alloc_pages (GFP_KERNEL ,get_order (max_pdp <<PAGE_SHIFT )); + ppgtt->pd_pages =alloc_pages (GFP_KERNEL | __GFP_ZERO, +get_order (max_pdp <<PAGE_SHIFT ));if (!ppgtt->pd_pages)return -ENOMEM ;
drivers/gpu/drm/i915/i915_gem_gtt.c static int gen6_ppgtt_allocate_page_tables(struct i915_hw_ppgtt *ppgtt) · line 1028
Quoted 8 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1@@ -1021,7 +1022,7 @@ static int gen6_ppgtt_allocate_page_tables(struct i915_hw_ppgtt *ppgtt)return -ENOMEM ;for (i =0 ; i < ppgtt->num_pd_entries; i++) { - ppgtt->pt_pages[i] =alloc_page (GFP_KERNEL ); + ppgtt->pt_pages[i] =alloc_page (GFP_KERNEL | __GFP_ZERO);if (!ppgtt->pt_pages[i]) {gen6_ppgtt_free (ppgtt);return -ENOMEM ;
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Imre Deak
Quoted 3 lines · Ben Widawsky
We normally clear the page tables as one of the first things during initialization. They are however wired up (and potentially valid) before we clear them.
I might be missing something, but afaics the page directories/tables are not in use until after ppgtt->enable()/mm_switch() is called on them, which is after the
clear_range()call.
Quoted 5 lines
I'd understand if it's about leaving uninitialized stuff _after_
clear_range()is called. But I think because of the 1G size alignment for ppgtt that's not possible either.--Imre
The only case I was able to fathom was if we accidentally connect a PDE before we populate the page table. I felt it was a rather harmless patch though.
I do agree with the IRC conversation that it shouldn't happen. It was in lines with the same reason of why we never BUG_ON.
Quoted 48 lines
Quoted 47 lines
To prevent the GPU from doing anything we might later regret, simply get zeroed pages, which always mean invalid on all GENs.
NOTE: that a similar paranoia could be applied to GGTT via making sure all entries are invalid ASAP. I think the extra work required to fix such a BIOS bug is unwarranted until proven necessary.
v2: Remove useless
GFP_ZEROin the kcallocsSigned-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +4
-3@@ -359,7 +359,7 @@ static struct page **__gen8_alloc_page_tables(void)return ERR_PTR (-ENOMEM );for (i =0 ; i <GEN8_PDES_PER_PAGE ; i++) { - pt_pages[i] =alloc_page (GFP_KERNEL ); + pt_pages[i] =alloc_page (GFP_KERNEL | __GFP_ZERO);if (!pt_pages[i]) goto bail; }@@ -421,7 +421,8 @@ static int gen8_ppgtt_allocate_dma(struct i915_hw_ppgtt *ppgtt)static int gen8_ppgtt_allocate_page_directories (struct i915_hw_ppgtt *ppgtt,const int max_pdp) { - ppgtt->pd_pages =alloc_pages (GFP_KERNEL ,get_order (max_pdp <<PAGE_SHIFT )); + ppgtt->pd_pages =alloc_pages (GFP_KERNEL | __GFP_ZERO, +get_order (max_pdp <<PAGE_SHIFT ));if (!ppgtt->pd_pages)return -ENOMEM ;@@ -1021,7 +1022,7 @@ static int gen6_ppgtt_allocate_page_tables(struct i915_hw_ppgtt *ppgtt)return -ENOMEM ;for (i =0 ; i < ppgtt->num_pd_entries; i++) { - ppgtt->pt_pages[i] =alloc_page (GFP_KERNEL ); + ppgtt->pt_pages[i] =alloc_page (GFP_KERNEL | __GFP_ZERO);if (!ppgtt->pt_pages[i]) {gen6_ppgtt_free (ppgtt);return -ENOMEM ;
Signature · 1 line
Ben Widawsky, Intel Open Source Technology Center