Use drm_clflush* instead of clflush
Subsystems (3)
v6 cover Use drm_clflush* instead of clflush
This patch series re-work a few i915 functions to use drm_clflush_virt_range instead of calling clflush or clflushopt directly. This will prevent errors when building for non-x86 architectures.
v2: s/PAGE_SIZE/sizeof(value) for Re-work intel_write_status_page and added more patches to convert additional clflush/clflushopt to use drm_clflush*. (Michael Cheng)
v3: Drop invalidate_csb_entries and directly invoke drm_clflush_virt_ran
v4: Remove extra memory barriers
v5: s/cache_clflush_range/drm_clflush_virt_range
v6: Fix up "Drop invalidate_csb_entries" to use correct parameters. Also added in arm64 support for drm_clflush_virt_range.
Michael Cheng (6):
drm/i915/gt: Re-work intel_write_status_page
drm/i915/gt: Drop invalidate_csb_entries
drm/i915/gt: Re-work reset_csb
drm/i915/: Re-work clflush_write32
drm/i915/gt: replace cache_clflush_range
drm: Add arch arm64 for drm_clflush_virt_range
drivers/gpu/drm/drm_cache.c | 4 ++++ .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 8 +++----- drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 12 ++++++------ drivers/gpu/drm/i915/gt/intel_engine.h | 13 ++++--------- .../drm/i915/gt/intel_execlists_submission.c | 19 ++++++------------- drivers/gpu/drm/i915/gt/intel_gtt.c | 2 +- drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- 8 files changed, 26 insertions(+), 36 deletions(-)
Signature · 1 line
2.25.1
PATCH v6 1/6 drm/i915/gt: Re-work intel_write_status_page
Re-work intel_write_status_page to use drm_clflush_virt_range. This will prevent compiler errors when building for non-x86 architectures.
--- drivers/gpu/drm/i915/gt/intel_engine.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine.h +4 -9
@@ -4,6 +4,7 @@#include <asm/cacheflush.h> #include <drm/drm_util.h> +#include <drm/drm_cache.h> #include <linux/hashtable.h> #include <linux/irq_work.h>
@@ -143,15 +144,9 @@ intel_write_status_page(struct intel_engine_cs *engine, int reg, u32 value)* of extra paranoia to try and ensure that the HWS takes the value * we give and that it doesn't end up trapped inside the CPU! */ -if (static_cpu_has (X86_FEATURE_CLFLUSH )) { -mb (); -clflush (&engine->status_page.addr[reg]); - engine->status_page.addr[reg] = value; -clflush (&engine->status_page.addr[reg]); -mb (); - }else { -WRITE_ONCE (engine->status_page.addr[reg], value); - } +drm_clflush_virt_range (&engine->status_page.addr[reg],sizeof (value)); +WRITE_ONCE (engine->status_page.addr[reg], value); +drm_clflush_virt_range (&engine->status_page.addr[reg],sizeof (value)); }/*
Signature · 1 line
2.25.1
PATCH v6 2/6 drm/i915/gt: Drop invalidate_csb_entries
In reply to Michael ChengDrop invalidate_csb_entries and directly call drm_clflush_virt_range. This allows for one less function call, and prevent complier errors when building for non-x86 architectures.
v2(Michael Cheng): Drop invalidate_csb_entries function and directly
invoke drm_clflush_virt_range. Thanks to Tvrtko for the sugguestion.
v3(Michael Cheng): Use correct parameters for drm_clflush_virt_range.
Thanks to Tvrtko for pointing this out.
--- drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +3 -9
@@ -1646,12 +1646,6 @@ cancel_port_requests(struct intel_engine_execlists * const execlists,return inactive; } -static void invalidate_csb_entries (const u64 *first,const u64 *last) -{ -clflush ((void *)first); -clflush ((void *)last); -} -/* * Starting with Gen12, the status has a new format: *
@@ -1999,7 +1993,7 @@ process_csb(struct intel_engine_cs *engine, struct i915_request **inactive)* the wash as hardware, working or not, will need to do the * invalidation before. */ -invalidate_csb_entries (&buf[0 ], &buf[num_entries -1 ]); +drm_clflush_virt_range (&buf[0 ], num_entries *sizeof (buf[0 ]));/* * We assume that any event reflects a change in context flow
@@ -2783,8 +2777,8 @@ static void reset_csb_pointers(struct intel_engine_cs *engine)/* Check that the GPU does indeed update the CSB entries! */ memset (execlists->csb_status,-1 , (reset_value +1 ) *sizeof (u64)); -invalidate_csb_entries (&execlists->csb_status[0 ], - &execlists->csb_status[reset_value]); +drm_clflush_virt_range (&execlists->csb_status[0 ], + execlists->csb_size *sizeof (execlists->csb_status[0 ]));/* Once more for luck and our trusty paranoia */ ENGINE_WRITE(engine, RING_CONTEXT_STATUS_PTR,
Signature · 1 line
2.25.1
PATCH v6 3/6 drm/i915/gt: Re-work reset_csb
In reply to Michael ChengUse drm_clflush_virt_range instead of directly invoking clflush. This will prevent compiler errors when building for non-x86 architectures.
v2(Michael Cheng): Remove extra clflush
v3(Michael Cheng): Remove memory barrier since drm_clflush_virt_range
takes care of it.
--- drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +2 -3
@@ -2944,9 +2944,8 @@ reset_csb(struct intel_engine_cs *engine, struct i915_request **inactive) {struct intel_engine_execlists *const execlists = &engine->execlists; -mb ();/* paranoia: read the CSB pointers from after the reset */ -clflush (execlists->csb_write); -mb (); +drm_clflush_virt_range (execlists->csb_write, +sizeof (execlists->csb_write)); inactive =process_csb (engine, inactive);/* drain preemption events */
Signature · 1 line
2.25.1
PATCH v6 4/6 drm/i915/: Re-work clflush_write32
In reply to Michael ChengUse drm_clflush_virt_range instead of clflushopt and remove the memory barrier, since drm_clflush_virt_range takes care of that.
--- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +3 -5
@@ -1332,10 +1332,8 @@ static void *reloc_vaddr(struct i915_vma *vma,static void clflush_write32 (u32 *addr,u32 value,unsigned int flushes) {if (unlikely (flushes & (CLFLUSH_BEFORE |CLFLUSH_AFTER ))) { -if (flushes &CLFLUSH_BEFORE ) { -clflushopt (addr); -mb (); - } +if (flushes &CLFLUSH_BEFORE ) +drm_clflush_virt_range (addr,sizeof (addr)); *addr = value;
@@ -1347,7 +1345,7 @@ static void clflush_write32(u32 *addr, u32 value, unsigned int flushes)* to ensure ordering of clflush wrt to the system. */ if (flushes &CLFLUSH_AFTER ) -clflushopt (addr); +drm_clflush_virt_range (addr,sizeof (addr)); }else *addr = value; }
Signature · 1 line
2.25.1
kernel test robot
build bot[PATCH] drm/i915/: fix noderef.cocci warnings
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1310:32-38: ERROR: application of sizeof to pointer drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1322:32-38: ERROR: application of sizeof to pointer
From: kernel test robot <[email protected]>
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1310:32-38: ERROR: application of sizeof to pointer drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1322:32-38: ERROR: application of sizeof to pointer
sizeof when applied to a pointer typed expression gives the size of the pointer
Generated by: scripts/coccinelle/misc/noderef.cocci
---
url: https://github.com/0day-ci/linux/commits/Michael-Cheng/Use-drm_clflush-instead-of-clflush/20220208-041326 base: git://anongit.freedesktop.org/drm-intel for-linux-next
:::::: branch date: 2 days ago
:::::: commit date: 2 days ago
i915_gem_execbuffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +2 -2
@@ -1307,7 +1307,7 @@ static void clflush_write32(u32 *addr, u {if (unlikely (flushes & (CLFLUSH_BEFORE |CLFLUSH_AFTER ))) {if (flushes &CLFLUSH_BEFORE ) -drm_clflush_virt_range (addr,sizeof (addr)); +drm_clflush_virt_range (addr,sizeof (*addr)); *addr = value;
@@ -1319,7 +1319,7 @@ static void clflush_write32(u32 *addr, u* to ensure ordering of clflush wrt to the system. */ if (flushes &CLFLUSH_AFTER ) -drm_clflush_virt_range (addr,sizeof (addr)); +drm_clflush_virt_range (addr,sizeof (*addr)); }else *addr = value; }
kernel test robot
build botRe: [Intel-gfx] [PATCH v6 4/6] drm/i915/: Re-work clflush_write32
In reply to Michael ChengThank you for the patch! Perhaps something to improve:
Hi Michael,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip drm/drm-next v5.17-rc3] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Michael-Cheng/Use-drm_clflush-instead-of-clflush/20220208-041326 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-randconfig-c002 (https://download.01.org/0day-ci/archive/20220210/202202100010.fBBNyCpm-lkp(a)intel.com/config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
If you fix the issue, kindly add following tag as appropriate
cocci warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1310:32-38: ERROR: application of sizeof to pointer
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1322:32-38: ERROR: application of sizeof to pointer
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v6 5/6 drm/i915/gt: replace cache_clflush_range
In reply to Michael ChengReplace all occurance of cache_clflush_range with drm_clflush_virt_range. This will prevent compile errors on non-x86 platforms.
--- drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 12 ++++++------ drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 2 +- drivers/gpu/drm/i915/gt/intel_gtt.c | 2 +- drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/gt/gen8_ppgtt.c +6 -6
@@ -444,11 +444,11 @@ gen8_ppgtt_insert_pte(struct i915_ppgtt *ppgtt, pd = pdp->entry[gen8_pd_index (idx,2 )]; } -clflush_cache_range (vaddr,PAGE_SIZE ); +drm_clflush_virt_range (vaddr,PAGE_SIZE ); vaddr =px_vaddr (i915_pt_entry (pd,gen8_pd_index (idx,1 ))); } }while (1 ); -clflush_cache_range (vaddr,PAGE_SIZE ); +drm_clflush_virt_range (vaddr,PAGE_SIZE );return idx; }
@@ -532,7 +532,7 @@ static void gen8_ppgtt_insert_huge(struct i915_address_space *vm, } }while (rem >= page_size && index <I915_PDES ); -clflush_cache_range (vaddr,PAGE_SIZE ); +drm_clflush_virt_range (vaddr,PAGE_SIZE );/* * Is it safe to mark the 2M block as 64K? -- Either we have
@@ -548,7 +548,7 @@ static void gen8_ppgtt_insert_huge(struct i915_address_space *vm, I915_GTT_PAGE_SIZE_2M)))) { vaddr =px_vaddr (pd); vaddr[maybe_64K] |=GEN8_PDE_IPS_64K ; -clflush_cache_range (vaddr,PAGE_SIZE ); +drm_clflush_virt_range (vaddr,PAGE_SIZE ); page_size =I915_GTT_PAGE_SIZE_64K ;/*
@@ -569,7 +569,7 @@ static void gen8_ppgtt_insert_huge(struct i915_address_space *vm,for (i =1 ; i < index; i +=16 )memset64 (vaddr + i, encode,15 ); -clflush_cache_range (vaddr,PAGE_SIZE ); +drm_clflush_virt_range (vaddr,PAGE_SIZE ); } }
@@ -617,7 +617,7 @@ static void gen8_ppgtt_insert_entry(struct i915_address_space *vm, vaddr =px_vaddr (i915_pt_entry (pd,gen8_pd_index (idx,1 ))); vaddr[gen8_pd_index (idx,0 )] =gen8_pte_encode (addr, level, flags); -clflush_cache_range (&vaddr[gen8_pd_index (idx,0 )],sizeof (*vaddr)); +drm_clflush_virt_range (&vaddr[gen8_pd_index (idx,0 )],sizeof (*vaddr)); }static int gen8_init_scratch (struct i915_address_space *vm)
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +1 -1
@@ -2822,7 +2822,7 @@ static void execlists_sanitize(struct intel_engine_cs *engine)sanitize_hwsp (engine);/* And scrub the dirty cachelines for the HWSP */ -clflush_cache_range (engine->status_page.addr,PAGE_SIZE ); +drm_clflush_virt_range (engine->status_page.addr,PAGE_SIZE );intel_engine_reset_pinned_contexts (engine); }
drivers/gpu/drm/i915/gt/intel_gtt.c +1 -1
@@ -255,7 +255,7 @@ fill_page_dma(struct drm_i915_gem_object *p, const u64 val, unsigned int count)void *vaddr =__px_vaddr (p);memset64 (vaddr, val, count); -clflush_cache_range (vaddr,PAGE_SIZE ); +drm_clflush_virt_range (vaddr,PAGE_SIZE ); }static void poison_scratch_page (struct drm_i915_gem_object *scratch)
drivers/gpu/drm/i915/gt/intel_ppgtt.c +1 -1
@@ -90,7 +90,7 @@ write_dma_entry(struct drm_i915_gem_object * const pdma,u64 *const vaddr =__px_vaddr (pdma); vaddr[idx] = encoded_entry; -clflush_cache_range (&vaddr[idx],sizeof (u64)); +drm_clflush_virt_range (&vaddr[idx],sizeof (u64)); }void
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1 -1
@@ -3573,7 +3573,7 @@ static void guc_sanitize(struct intel_engine_cs *engine)sanitize_hwsp (engine);/* And scrub the dirty cachelines for the HWSP */ -clflush_cache_range (engine->status_page.addr,PAGE_SIZE ); +drm_clflush_virt_range (engine->status_page.addr,PAGE_SIZE );intel_engine_reset_pinned_contexts (engine); }
Signature · 1 line
2.25.1
PATCH v6 6/6 drm: Add arch arm64 for drm_clflush_virt_range
In reply to Michael ChengUse flush_tlb_kernel_range when invoking drm_clflush_virt_range on arm64 platforms. Using flush_tlb_kernel_range will:
1. Make sure prior page-table updates have been completed
2. Invalidate the TLB
3. Check if the TLB invalidation has been completed
--- drivers/gpu/drm/drm_cache.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/drm_cache.c +4 -0
@@ -176,6 +176,10 @@ drm_clflush_virt_range(void *addr, unsigned long length)if (wbinvd_on_all_cpus ())pr_err ("Timed out waiting for cache flush\n" ); + +#elif defined(CONFIG_ARM64 ) +void *end = addr + length; +flush_tlb_kernel_range (*addr, *end);#else pr_err ("Architecture has no drm_cache.c support\n" );WARN_ON_ONCE (1 );
Signature · 1 line
2.25.1
kernel test robot
build botRe: [Intel-gfx] [PATCH v6 6/6] drm: Add arch arm64 for drm_clflush_virt_range
Thank you for the patch! Yet something to improve:
Hi Michael,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip drm/drm-next v5.17-rc3 next-20220207] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Michael-Cheng/Use-drm_clflush-instead-of-clflush/20220208-041326 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: arm64-randconfig-r005-20220207 (https://download.01.org/0day-ci/archive/20220208/202202081151.wYD1tE4p-lkp(a)intel.com/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 0d8850ae2cae85d49bea6ae0799fa41c7202c05c)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/0day-ci/linux/commit/f2fb6ade1531d88b046e245e8b854a7422a05a14
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Michael-Cheng/Use-drm_clflush-instead-of-clflush/20220208-041326 git checkout f2fb6ade1531d88b046e245e8b854a7422a05a14
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/drm_cache.c:182:25: error: passing 'void' to parameter of incompatible type 'unsigned long'
flush_tlb_kernel_range(*addr, *end);
^~~~~
arch/arm64/include/asm/tlbflush.h:374:57: note: passing argument to parameter 'start' here
static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end)
^1 error generated.
vim +182 drivers/gpu/drm/drm_cache.c
151
152 /**
153 * drm_clflush_virt_range - Flush dcache lines of a region
154 * @addr: Initial kernel memory address.
155 * @length: Region size.
156 *
157 * Flush every data cache line entry that points to an address in the
158 * region requested.
159 */
160 void
161 drm_clflush_virt_range(void *addr, unsigned long length)
162 {
163 #if defined(CONFIG_X86)
164 if (static_cpu_has(X86_FEATURE_CLFLUSH)) {
165 const int size = boot_cpu_data.x86_clflush_size;
166 void *end = addr + length;
167
168 addr = (void *)(((unsigned long)addr) & -size);
169 mb(); /*CLFLUSH is only ordered with a full memory barrier*/
170 for (; addr < end; addr += size)
171 clflushopt(addr);
172 clflushopt(end - 1); /* force serialisation */
173 mb(); /*Ensure that every data cache line entry is flushed*/
174 return;
175 }
176
177 if (wbinvd_on_all_cpus())
178 pr_err("Timed out waiting for cache flush\n");
179
180 #elif defined(CONFIG_ARM64)
181 void *end = addr + length;
> 182 flush_tlb_kernel_range(*addr, *end);
183 #else
184 pr_err("Architecture has no drm_cache.c support\n");
185 WARN_ON_ONCE(1);
186 #endif
187 }
188 EXPORT_SYMBOL(drm_clflush_virt_range);
189
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [Intel-gfx] [PATCH v6 6/6] drm: Add arch arm64 for drm_clflush_virt_range
In reply to Michael ChengThank you for the patch! Yet something to improve:
Hi Michael,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip drm/drm-next v5.17-rc3 next-20220207] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Michael-Cheng/Use-drm_clflush-instead-of-clflush/20220208-041326 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: arm64-defconfig (https://download.01.org/0day-ci/archive/20220208/202202081258.VY7Y7JnA-lkp(a)intel.com/config) compiler: aarch64-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/f2fb6ade1531d88b046e245e8b854a7422a05a14
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Michael-Cheng/Use-drm_clflush-instead-of-clflush/20220208-041326 git checkout f2fb6ade1531d88b046e245e8b854a7422a05a14
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm64 SHELL=/bin/bash drivers/gpu/drm/
If you fix the issue, kindly add following tag as appropriate
All error/warnings (new ones prefixed by >>):
drivers/gpu/drm/drm_cache.c: In function 'drm_clflush_virt_range':
>> drivers/gpu/drm/drm_cache.c:182:32: warning: dereferencing 'void *' pointer
182 | flush_tlb_kernel_range(*addr, *end);
| ^~~~~
drivers/gpu/drm/drm_cache.c:182:39: warning: dereferencing 'void *' pointer
182 | flush_tlb_kernel_range(*addr, *end);
| ^~~~
>> drivers/gpu/drm/drm_cache.c:182:32: error: invalid use of void expression
182 | flush_tlb_kernel_range(*addr, *end);
| ^~~~~
drivers/gpu/drm/drm_cache.c:182:39: error: invalid use of void expression
182 | flush_tlb_kernel_range(*addr, *end);
| ^~~~vim +182 drivers/gpu/drm/drm_cache.c
151
152 /**
153 * drm_clflush_virt_range - Flush dcache lines of a region
154 * @addr: Initial kernel memory address.
155 * @length: Region size.
156 *
157 * Flush every data cache line entry that points to an address in the
158 * region requested.
159 */
160 void
161 drm_clflush_virt_range(void *addr, unsigned long length)
162 {
163 #if defined(CONFIG_X86)
164 if (static_cpu_has(X86_FEATURE_CLFLUSH)) {
165 const int size = boot_cpu_data.x86_clflush_size;
166 void *end = addr + length;
167
168 addr = (void *)(((unsigned long)addr) & -size);
169 mb(); /*CLFLUSH is only ordered with a full memory barrier*/
170 for (; addr < end; addr += size)
171 clflushopt(addr);
172 clflushopt(end - 1); /* force serialisation */
173 mb(); /*Ensure that every data cache line entry is flushed*/
174 return;
175 }
176
177 if (wbinvd_on_all_cpus())
178 pr_err("Timed out waiting for cache flush\n");
179
180 #elif defined(CONFIG_ARM64)
181 void *end = addr + length;
> 182 flush_tlb_kernel_range(*addr, *end);
183 #else
184 pr_err("Architecture has no drm_cache.c support\n");
185 WARN_ON_ONCE(1);
186 #endif
187 }
188 EXPORT_SYMBOL(drm_clflush_virt_range);
189
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH v6 6/6] drm: Add arch arm64 for drm_clflush_virt_range
In reply to Michael ChengQuoted 6 lines · Michael Cheng
Use
flush_tlb_kernel_rangewhen invokingdrm_clflush_virt_rangeon arm64 platforms. Usingflush_tlb_kernel_rangewill:1. Make sure prior page-table updates have been completed
2. Invalidate the TLB
3. Check if the TLB invalidation has been completed
Arm does not have a clflush equivalent but invalidating TLBs there includes flushing caches?
Regards,
Tvrtko
Quoted 20 lines
Signed-off-by Michael Cheng <[email protected]>--- drivers/gpu/drm/drm_cache.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/drm_cache.c +4
-0@@ -176,6 +176,10 @@ drm_clflush_virt_range(void *addr, unsigned long length)if (wbinvd_on_all_cpus ())pr_err ("Timed out waiting for cache flush\n" ); + +#elif defined(CONFIG_ARM64 ) +void *end = addr + length; +flush_tlb_kernel_range (*addr, *end);#else pr_err ("Architecture has no drm_cache.c support\n" );WARN_ON_ONCE (1 );
Re: [PATCH v6 6/6] drm: Add arch arm64 for drm_clflush_virt_range
Ah, thanks for asking this question. It seems like I was not thinking correctly. We are trying to flush dcache lines within this function and not the tlb.
Quoted 35 lines · Tvrtko Ursulin
Quoted 6 lines · Michael Cheng
Use
flush_tlb_kernel_rangewhen invokingdrm_clflush_virt_rangeon arm64 platforms. Usingflush_tlb_kernel_rangewill:1. Make sure prior page-table updates have been completed
2. Invalidate the TLB
3. Check if the TLB invalidation has been completedArm does not have a clflush equivalent but invalidating TLBs there includes flushing caches?
Regards,
Tvrtko
Quoted 20 lines
Signed-off-by Michael Cheng <[email protected]>---
drivers/gpu/drm/drm_cache.c| 4 ++++1 file changed, 4 insertions(+)drivers/gpu/drm/drm_cache.c +4
-0@@ -176,6 +176,10 @@ drm_clflush_virt_range(void *addr, unsigned long length) if (wbinvd_on_all_cpus()) pr_err("Timed out waiting for cache flush\n"); + +#elif defined(CONFIG_ARM64 ) + void *end = addr + length; + flush_tlb_kernel_range(*addr, *end); #else pr_err("Architecture has no drm_cache.c support\n"); WARN_ON_ONCE(1);
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Use drm_clflush* instead of clflush (rev5)
In reply to Michael Cheng== Series Details ==
== Series Details ==
Series: Use drm_clflush* instead of clflush (rev5)
URL : https://patchwork.freedesktop.org/series/99450/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 01334f06e3af drm/i915/gt: Re-work intel_write_status_page 5f2ab439de24 drm/i915/gt: Drop invalidate_csb_entries -:52: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #52: FILE: drivers/gpu/drm/i915/gt/intel_execlists_submission.c:2781: + drm_clflush_virt_range(&execlists->csb_status[0], + execlists->csb_size * sizeof(execlists->csb_status[0]));
total: 0 errors, 0 warnings, 1 checks, 30 lines checked 650830e66f5c drm/i915/gt: Re-work reset_csb
-:28: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #28: FILE: drivers/gpu/drm/i915/gt/intel_execlists_submission.c:2948:
+ drm_clflush_virt_range(execlists->csb_write,
+ sizeof(execlists->csb_write));
total: 0 errors, 0 warnings, 1 checks, 11 lines checked63075776239e drm/i915/: Re-work clflush_write328702d5add776 drm/i915/gt: replace cache_clflush_range
-:6: WARNING:TYPO_SPELLING: 'occurance' may be misspelled - perhaps 'occurrence'? #6:
Replace all occurance of cache_clflush_range with
^^^^^^^^^
total: 0 errors, 1 warnings, 0 checks, 77 lines checked 1f0f9e6c722a drm: Add arch arm64 for drm_clflush_virt_range -:26: WARNING:LINE_SPACING: Missing a blank line after declarations #26: FILE: drivers/gpu/drm/drm_cache.c:180:
+ void *end = addr + length;
+ flush_tlb_kernel_range(*addr, *end);
total: 0 errors, 1 warnings, 0 checks, 10 lines checked
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Use drm_clflush* instead of clflush (rev5)
In reply to Michael Cheng== Series Details ==
== Series Details ==
Series: Use drm_clflush* instead of clflush (rev5)
URL : https://patchwork.freedesktop.org/series/99450/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for Use drm_clflush* instead of clflush (rev5)
In reply to Michael Cheng== Series Details ==
== Series Details ==
Series: Use drm_clflush* instead of clflush (rev5)
URL : https://patchwork.freedesktop.org/series/99450/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11197 -> Patchwork_22192
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_22192 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_22192, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/index.html
Participating hosts (45 -> 46)
------------------------------
Additional (5): fi-kbl-soraka fi-icl-u2 fi-kbl-guc fi-apl-guc fi-pnv-d510
Missing (4): fi-bsw-cyan shard-rkl shard-dg1 shard-tglu
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_22192:
### IGT changes ###
#### Possible regressions ####
* igt@gem_close_race@basic-threads:
- fi-icl-u2: NOTRUN -> [DMESG-WARN][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-icl-u2/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_exec_suspend@basic-s3@smem:
- {fi-rkl-11600}: [PASS][2] -> [INCOMPLETE][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11197/fi-rkl-11600/igt@gem_exec_suspend@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-rkl-11600/igt@gem_exec_suspend@[email protected]
Known issues
------------
Here are the changes found in Patchwork_22192 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@read_all_entries:
- fi-apl-guc: NOTRUN -> [DMESG-WARN][4] ([i915#1610])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-apl-guc/igt@debugfs_test@read_all_entries.html
* igt@gem_exec_fence@basic-busy@bcs0:
- fi-kbl-soraka: NOTRUN -> [SKIP][5] ([fdo#109271]) +8 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-kbl-soraka/igt@gem_exec_fence@[email protected]
* igt@gem_exec_suspend@basic-s3@smem:
- fi-skl-6600u: NOTRUN -> [INCOMPLETE][6] ([i915#4547])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-skl-6600u/igt@gem_exec_suspend@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-pnv-d510: NOTRUN -> [SKIP][7] ([fdo#109271]) +57 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-pnv-d510/igt@[email protected]
- fi-kbl-soraka: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#2190])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-kbl-soraka/igt@[email protected]
* igt@gem_lmem_swapping@basic:
- fi-kbl-guc: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#4613]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-kbl-guc/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-kbl-soraka: NOTRUN -> [SKIP][10] ([fdo#109271] / [i915#4613]) +3 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-kbl-soraka/igt@[email protected]
* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][11] ([i915#1886] / [i915#2291])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@requests:
- fi-blb-e6850: [PASS][12] -> [DMESG-FAIL][13] ([i915#5026])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11197/fi-blb-e6850/igt@i915_selftest@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-blb-e6850/igt@i915_selftest@[email protected]
* igt@kms_busy@basic:
- fi-kbl-guc: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#1845])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-kbl-guc/igt@[email protected]
* igt@kms_chamelium@dp-edid-read:
- fi-kbl-soraka: NOTRUN -> [SKIP][15] ([fdo#109271] / [fdo#111827]) +8 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-kbl-soraka/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-guc: NOTRUN -> [SKIP][16] ([fdo#109271] / [fdo#111827]) +8 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-kbl-guc/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-cml-u2: [PASS][17] -> [DMESG-WARN][18] ([i915#4269])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11197/fi-cml-u2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-cml-u2/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-kbl-guc: NOTRUN -> [SKIP][19] ([fdo#109271] / [i915#533])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-kbl-guc/igt@[email protected]
- fi-kbl-soraka: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#533])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-kbl-soraka/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- fi-kbl-guc: NOTRUN -> [SKIP][21] ([fdo#109271]) +40 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-kbl-guc/igt@[email protected]
* igt@runner@aborted:
- fi-icl-u2: NOTRUN -> [FAIL][22] ([i915#2426] / [i915#3690] / [i915#4312])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-icl-u2/igt@[email protected]
- fi-blb-e6850: NOTRUN -> [FAIL][23] ([fdo#109271] / [i915#2403] / [i915#2426] / [i915#4312])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-blb-e6850/igt@[email protected]
- fi-apl-guc: NOTRUN -> [FAIL][24] ([i915#2426] / [i915#4312])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-apl-guc/igt@[email protected]
- fi-bdw-5557u: NOTRUN -> [FAIL][25] ([i915#2426] / [i915#4312])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/fi-bdw-5557u/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291
[i915#2403]: https://gitlab.freedesktop.org/drm/intel/issues/2403
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#3690]: https://gitlab.freedesktop.org/drm/intel/issues/3690
[i915#4269]: https://gitlab.freedesktop.org/drm/intel/issues/4269
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5026]: https://gitlab.freedesktop.org/drm/intel/issues/5026
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
Build changes
-------------
* Linux: CI_DRM_11197 -> Patchwork_22192
CI-20190529: 20190529
CI_DRM_11197: 3d72770ba26d63ddb15d5495317d43292acdf974 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6339: 9cd99d763440ae75d9981ce4e361d3deb5edb4e4 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22192: 1f0f9e6c722a7d9a6e8dc6146799fa2f2a5ee23b @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
1f0f9e6c722a drm: Add arch arm64 for drm_clflush_virt_range 8702d5add776 drm/i915/gt: replace cache_clflush_range 63075776239e drm/i915/: Re-work clflush_write32 650830e66f5c drm/i915/gt: Re-work reset_csb 5f2ab439de24 drm/i915/gt: Drop invalidate_csb_entries 01334f06e3af drm/i915/gt: Re-work intel_write_status_page
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22192/index.html