dri-devel June 2017

dri-devel@lists.freedesktop.org

228 participants
1479 discussions

[radeon-alex:amd-staging-4.11 1309/1319] drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1122:16: warning: 'shadow_addr' may be used uninitialized in this function
by kbuild test robot 09 Jun '17

09 Jun '17

tree: git://people.freedesktop.org/~agd5f/linux.git amd-staging-4.11 head: cad2d1111e124fe8a1637785bb47202da55f54af commit: 9989707c4000667d37a711b6a4eb2e77d8cd00a8 [1309/1319] drm/amdgpu: Support page directory update via CPU config: i386-randconfig-r0-06050939 (attached as .config) compiler: gcc-5 (Debian 5.4.1-2) 5.4.1 20160904 reproduce: git checkout 9989707c4000667d37a711b6a4eb2e77d8cd00a8 # save the attached .config to linux build tree make ARCH=i386 Note: it may well be a FALSE warning. FWIW you are at least aware of it now. http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings All warnings (new ones prefixed by >>): In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:32:0: drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c: In function 'amdgpu_vm_cpu_set_ptes': drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:977:41: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] amdgpu_gart_set_pte_pde(params->adev, (void *)pe, ^ drivers/gpu/drm/amd/amdgpu/amdgpu.h:1870:107: note: in definition of macro 'amdgpu_gart_set_pte_pde' #define amdgpu_gart_set_pte_pde(adev, pt, idx, addr, flags) (adev)->gart.gart_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags)) ^ In file included from arch/x86/include/asm/bug.h:35:0, from include/linux/bug.h:4, from include/linux/thread_info.h:11, from arch/x86/include/asm/preempt.h:6, from include/linux/preempt.h:80, from include/linux/spinlock.h:50, from include/linux/wait.h:8, from include/linux/dma-fence.h:25, from include/linux/dma-fence-array.h:23, from drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:28: drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c: In function 'amdgpu_vm_update_level': include/asm-generic/bug.h:93:5: warning: 'ndw' may be used uninitialized in this function [-Wmaybe-uninitialized] if (unlikely(__ret_warn_on)) \ ^ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1020:30: note: 'ndw' was declared here unsigned count = 0, pt_idx, ndw; ^ >> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1122:16: warning: 'shadow_addr' may be used uninitialized in this function [-Wmaybe-uninitialized] last_shadow = shadow_addr + pt_idx * 8; ^ >> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1151:5: warning: 'ring' may be used uninitialized in this function [-Wmaybe-uninitialized] r = amdgpu_job_submit(job, ring, &vm->entity, ^ vim +/shadow_addr +1122 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c d38ceaf99e Alex Deucher 2015-04-20 1014 { f8991bab1a Christian König 2016-09-16 1015 struct amdgpu_bo *shadow; 2d55e45a03 Christian König 2016-02-08 1016 struct amdgpu_ring *ring; f8991bab1a Christian König 2016-09-16 1017 uint64_t pd_addr, shadow_addr; bcb75af82e Christian König 2016-10-12 1018 uint32_t incr = amdgpu_vm_bo_size(adev, level + 1); f8991bab1a Christian König 2016-09-16 1019 uint64_t last_pde = ~0, last_pt = ~0, last_shadow = ~0; d38ceaf99e Alex Deucher 2015-04-20 @1020 unsigned count = 0, pt_idx, ndw; d71518b5aa Christian König 2016-02-01 1021 struct amdgpu_job *job; 29efc4f5df Christian König 2016-08-04 1022 struct amdgpu_pte_update_params params; f54d186700 Chris Wilson 2016-10-25 1023 struct dma_fence *fence = NULL; d5fc5e82a3 Chunming Zhou 2015-07-21 1024 d38ceaf99e Alex Deucher 2015-04-20 1025 int r; d38ceaf99e Alex Deucher 2015-04-20 1026 bcb75af82e Christian König 2016-10-12 1027 if (!parent->entries) bcb75af82e Christian König 2016-10-12 1028 return 0; 9989707c40 Harish Kasiviswanathan 2017-05-11 1029 9989707c40 Harish Kasiviswanathan 2017-05-11 1030 memset(&params, 0, sizeof(params)); 9989707c40 Harish Kasiviswanathan 2017-05-11 1031 params.adev = adev; 9989707c40 Harish Kasiviswanathan 2017-05-11 1032 shadow = parent->bo->shadow; 9989707c40 Harish Kasiviswanathan 2017-05-11 1033 9989707c40 Harish Kasiviswanathan 2017-05-11 1034 WARN_ON(vm->use_cpu_for_update && shadow); 9989707c40 Harish Kasiviswanathan 2017-05-11 1035 if (vm->use_cpu_for_update && !shadow) { 9989707c40 Harish Kasiviswanathan 2017-05-11 1036 r = amdgpu_bo_kmap(parent->bo, (void **)&pd_addr); 9989707c40 Harish Kasiviswanathan 2017-05-11 1037 if (r) 9989707c40 Harish Kasiviswanathan 2017-05-11 1038 return r; 9989707c40 Harish Kasiviswanathan 2017-05-11 1039 r = amdgpu_vm_bo_wait(adev, parent->bo); 9989707c40 Harish Kasiviswanathan 2017-05-11 1040 if (unlikely(r)) { 9989707c40 Harish Kasiviswanathan 2017-05-11 1041 amdgpu_bo_kunmap(parent->bo); 9989707c40 Harish Kasiviswanathan 2017-05-11 1042 return r; 9989707c40 Harish Kasiviswanathan 2017-05-11 1043 } 9989707c40 Harish Kasiviswanathan 2017-05-11 1044 params.func = amdgpu_vm_cpu_set_ptes; 9989707c40 Harish Kasiviswanathan 2017-05-11 1045 } else { 9989707c40 Harish Kasiviswanathan 2017-05-11 1046 if (shadow) { 9989707c40 Harish Kasiviswanathan 2017-05-11 1047 r = amdgpu_ttm_bind(&shadow->tbo, &shadow->tbo.mem); 9989707c40 Harish Kasiviswanathan 2017-05-11 1048 if (r) 9989707c40 Harish Kasiviswanathan 2017-05-11 1049 return r; 9989707c40 Harish Kasiviswanathan 2017-05-11 1050 } 9989707c40 Harish Kasiviswanathan 2017-05-11 1051 ring = container_of(vm->entity.sched, struct amdgpu_ring, 9989707c40 Harish Kasiviswanathan 2017-05-11 1052 sched); 2d55e45a03 Christian König 2016-02-08 1053 d38ceaf99e Alex Deucher 2015-04-20 1054 /* padding, etc. */ d38ceaf99e Alex Deucher 2015-04-20 1055 ndw = 64; d38ceaf99e Alex Deucher 2015-04-20 1056 d38ceaf99e Alex Deucher 2015-04-20 1057 /* assume the worst case */ bcb75af82e Christian König 2016-10-12 1058 ndw += parent->last_entry_used * 6; d38ceaf99e Alex Deucher 2015-04-20 1059 bcb75af82e Christian König 2016-10-12 1060 pd_addr = amdgpu_bo_gpu_offset(parent->bo); bcb75af82e Christian König 2016-10-12 1061 f8991bab1a Christian König 2016-09-16 1062 if (shadow) { f8991bab1a Christian König 2016-09-16 1063 shadow_addr = amdgpu_bo_gpu_offset(shadow); f8991bab1a Christian König 2016-09-16 1064 ndw *= 2; f8991bab1a Christian König 2016-09-16 1065 } else { f8991bab1a Christian König 2016-09-16 1066 shadow_addr = 0; f8991bab1a Christian König 2016-09-16 1067 } f8991bab1a Christian König 2016-09-16 1068 d71518b5aa Christian König 2016-02-01 1069 r = amdgpu_job_alloc_with_ib(adev, ndw * 4, &job); d71518b5aa Christian König 2016-02-01 1070 if (r) d38ceaf99e Alex Deucher 2015-04-20 1071 return r; d71518b5aa Christian König 2016-02-01 1072 29efc4f5df Christian König 2016-08-04 1073 params.ib = &job->ibs[0]; 9989707c40 Harish Kasiviswanathan 2017-05-11 1074 params.func = amdgpu_vm_do_set_ptes; 9989707c40 Harish Kasiviswanathan 2017-05-11 1075 } 9989707c40 Harish Kasiviswanathan 2017-05-11 1076 d38ceaf99e Alex Deucher 2015-04-20 1077 bcb75af82e Christian König 2016-10-12 1078 /* walk over the address space and update the directory */ bcb75af82e Christian König 2016-10-12 1079 for (pt_idx = 0; pt_idx <= parent->last_entry_used; ++pt_idx) { bcb75af82e Christian König 2016-10-12 1080 struct amdgpu_bo *bo = parent->entries[pt_idx].bo; d38ceaf99e Alex Deucher 2015-04-20 1081 uint64_t pde, pt; d38ceaf99e Alex Deucher 2015-04-20 1082 d38ceaf99e Alex Deucher 2015-04-20 1083 if (bo == NULL) d38ceaf99e Alex Deucher 2015-04-20 1084 continue; d38ceaf99e Alex Deucher 2015-04-20 1085 0fc8683e56 Christian König 2016-09-16 1086 if (bo->shadow) { f8991bab1a Christian König 2016-09-16 1087 struct amdgpu_bo *pt_shadow = bo->shadow; 0fc8683e56 Christian König 2016-09-16 1088 f8991bab1a Christian König 2016-09-16 1089 r = amdgpu_ttm_bind(&pt_shadow->tbo, f8991bab1a Christian König 2016-09-16 1090 &pt_shadow->tbo.mem); 0fc8683e56 Christian König 2016-09-16 1091 if (r) 0fc8683e56 Christian König 2016-09-16 1092 return r; 0fc8683e56 Christian König 2016-09-16 1093 } 0fc8683e56 Christian König 2016-09-16 1094 d38ceaf99e Alex Deucher 2015-04-20 1095 pt = amdgpu_bo_gpu_offset(bo); d029622227 Christian König 2017-05-15 1096 pt = amdgpu_gart_get_vm_pde(adev, pt); bcb75af82e Christian König 2016-10-12 1097 if (parent->entries[pt_idx].addr == pt) d38ceaf99e Alex Deucher 2015-04-20 1098 continue; f8991bab1a Christian König 2016-09-16 1099 bcb75af82e Christian König 2016-10-12 1100 parent->entries[pt_idx].addr = pt; d38ceaf99e Alex Deucher 2015-04-20 1101 d38ceaf99e Alex Deucher 2015-04-20 1102 pde = pd_addr + pt_idx * 8; d38ceaf99e Alex Deucher 2015-04-20 1103 if (((last_pde + 8 * count) != pde) || 96105e5375 Christian König 2016-08-12 1104 ((last_pt + incr * count) != pt) || 96105e5375 Christian König 2016-08-12 1105 (count == AMDGPU_VM_MAX_UPDATE_SIZE)) { d38ceaf99e Alex Deucher 2015-04-20 1106 d38ceaf99e Alex Deucher 2015-04-20 1107 if (count) { f8991bab1a Christian König 2016-09-16 1108 if (shadow) 9989707c40 Harish Kasiviswanathan 2017-05-11 1109 params.func(&params, f8991bab1a Christian König 2016-09-16 1110 last_shadow, d029622227 Christian König 2017-05-15 1111 last_pt, count, f8991bab1a Christian König 2016-09-16 1112 incr, f8991bab1a Christian König 2016-09-16 1113 AMDGPU_PTE_VALID); f8991bab1a Christian König 2016-09-16 1114 9989707c40 Harish Kasiviswanathan 2017-05-11 1115 params.func(&params, last_pde, d029622227 Christian König 2017-05-15 1116 last_pt, count, incr, 9ab2146289 Christian König 2015-11-30 1117 AMDGPU_PTE_VALID); d38ceaf99e Alex Deucher 2015-04-20 1118 } d38ceaf99e Alex Deucher 2015-04-20 1119 d38ceaf99e Alex Deucher 2015-04-20 1120 count = 1; d38ceaf99e Alex Deucher 2015-04-20 1121 last_pde = pde; f8991bab1a Christian König 2016-09-16 @1122 last_shadow = shadow_addr + pt_idx * 8; d38ceaf99e Alex Deucher 2015-04-20 1123 last_pt = pt; d38ceaf99e Alex Deucher 2015-04-20 1124 } else { d38ceaf99e Alex Deucher 2015-04-20 1125 ++count; d38ceaf99e Alex Deucher 2015-04-20 1126 } d38ceaf99e Alex Deucher 2015-04-20 1127 } d38ceaf99e Alex Deucher 2015-04-20 1128 f8991bab1a Christian König 2016-09-16 1129 if (count) { fd5c3bae81 Christian König 2016-10-12 1130 if (vm->root.bo->shadow) 9989707c40 Harish Kasiviswanathan 2017-05-11 1131 params.func(&params, last_shadow, last_pt, f8991bab1a Christian König 2016-09-16 1132 count, incr, AMDGPU_PTE_VALID); f8991bab1a Christian König 2016-09-16 1133 9989707c40 Harish Kasiviswanathan 2017-05-11 1134 params.func(&params, last_pde, last_pt, 9ab2146289 Christian König 2015-11-30 1135 count, incr, AMDGPU_PTE_VALID); f8991bab1a Christian König 2016-09-16 1136 } f8991bab1a Christian König 2016-09-16 1137 9989707c40 Harish Kasiviswanathan 2017-05-11 1138 if (params.func == amdgpu_vm_cpu_set_ptes) 9989707c40 Harish Kasiviswanathan 2017-05-11 1139 amdgpu_bo_kunmap(parent->bo); 9989707c40 Harish Kasiviswanathan 2017-05-11 1140 else if (params.ib->length_dw == 0) { f8991bab1a Christian König 2016-09-16 1141 amdgpu_job_free(job); bcb75af82e Christian König 2016-10-12 1142 } else { 29efc4f5df Christian König 2016-08-04 1143 amdgpu_ring_pad_ib(ring, params.ib); bcb75af82e Christian König 2016-10-12 1144 amdgpu_sync_resv(adev, &job->sync, parent->bo->tbo.resv, e86f9ceee1 Christian König 2016-02-08 1145 AMDGPU_FENCE_OWNER_VM); f8991bab1a Christian König 2016-09-16 1146 if (shadow) f8991bab1a Christian König 2016-09-16 1147 amdgpu_sync_resv(adev, &job->sync, shadow->tbo.resv, f8991bab1a Christian König 2016-09-16 1148 AMDGPU_FENCE_OWNER_VM); f8991bab1a Christian König 2016-09-16 1149 29efc4f5df Christian König 2016-08-04 1150 WARN_ON(params.ib->length_dw > ndw); 2bd9ccfa75 Christian König 2016-02-01 @1151 r = amdgpu_job_submit(job, ring, &vm->entity, 2bd9ccfa75 Christian König 2016-02-01 1152 AMDGPU_FENCE_OWNER_VM, &fence); d5fc5e82a3 Chunming Zhou 2015-07-21 1153 if (r) 4af9f07ccd Chunming Zhou 2015-08-03 1154 goto error_free; :::::: The code at line 1122 was first introduced by commit :::::: f8991bab1aa2121e33b8569857dfb22e536bc396 drm/amdgpu: update the shadow PD together with the real one v2 :::::: TO: Christian König <christian.koenig(a)amd.com> :::::: CC: Alex Deucher <alexander.deucher(a)amd.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[radeon-alex:drm-next-4.13-wip 334/343] drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1308:24: warning: cast from pointer to integer of different size
by kbuild test robot 09 Jun '17

09 Jun '17

tree: git://people.freedesktop.org/~agd5f/linux.git drm-next-4.13-wip head: 822bfb93ca63bd15ccc3f0ba925110c8298b3162 commit: b4d42511b7f2269f4cca3c02cd6e4c58099f9108 [334/343] drm/amdgpu: Support page table update via CPU config: i386-randconfig-r0-06050939 (attached as .config) compiler: gcc-5 (Debian 5.4.1-2) 5.4.1 20160904 reproduce: git checkout b4d42511b7f2269f4cca3c02cd6e4c58099f9108 # save the attached .config to linux build tree make ARCH=i386 All warnings (new ones prefixed by >>): In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:32:0: drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c: In function 'amdgpu_vm_cpu_set_ptes': drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:987:41: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] amdgpu_gart_set_pte_pde(params->adev, (void *)pe, ^ drivers/gpu/drm/amd/amdgpu/amdgpu.h:1858:107: note: in definition of macro 'amdgpu_gart_set_pte_pde' #define amdgpu_gart_set_pte_pde(adev, pt, idx, addr, flags) (adev)->gart.gart_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags)) ^ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c: In function 'amdgpu_vm_update_ptes_cpu': >> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1308:24: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] params->func(params, (uint64_t)pe_ptr, dst, nptes, ^ In file included from arch/x86/include/asm/bug.h:81:0, from include/linux/bug.h:4, from include/linux/thread_info.h:11, from arch/x86/include/asm/preempt.h:6, from include/linux/preempt.h:80, from include/linux/spinlock.h:50, from include/linux/wait.h:8, from include/linux/dma-fence.h:25, from include/linux/dma-fence-array.h:23, from drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:28: drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c: In function 'amdgpu_vm_update_level': include/asm-generic/bug.h:107:5: warning: 'ndw' may be used uninitialized in this function [-Wmaybe-uninitialized] if (unlikely(__ret_warn_on)) \ ^ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1030:30: note: 'ndw' was declared here unsigned count = 0, pt_idx, ndw; ^ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1132:16: warning: 'shadow_addr' may be used uninitialized in this function [-Wmaybe-uninitialized] last_shadow = shadow_addr + pt_idx * 8; ^ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1161:5: warning: 'ring' may be used uninitialized in this function [-Wmaybe-uninitialized] r = amdgpu_job_submit(job, ring, &vm->entity, ^ vim +1308 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c 1292 return -EINVAL; 1293 } 1294 1295 WARN_ON(params->shadow); 1296 1297 r = amdgpu_bo_kmap(pt, &pe_ptr); 1298 if (r) 1299 return r; 1300 1301 pe_ptr += (addr & mask) * 8; 1302 1303 if ((addr & ~mask) == (end & ~mask)) 1304 nptes = end - addr; 1305 else 1306 nptes = AMDGPU_VM_PTE_COUNT(adev) - (addr & mask); 1307 > 1308 params->func(params, (uint64_t)pe_ptr, dst, nptes, 1309 AMDGPU_GPU_PAGE_SIZE, flags); 1310 1311 amdgpu_bo_kunmap(pt); 1312 addr += nptes; 1313 dst += nptes * AMDGPU_GPU_PAGE_SIZE; 1314 } 1315 1316 return 0; --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[PATCH RFC 0/7] HDMI audio support for Exynos Odroid boards
by Sylwester Nawrocki 09 Jun '17

09 Jun '17

In this series I gathered patches touching various subsystems to make the overall review easier, finally I'm going to post independently patches for each subsystem and the dts patch(es) will be postponed to subsequent merge window. The main purpose of this series is to add audio codec interface to the Exynos DRM driver, so HDMI audio can be properly supported, also on boards where HDMI is the only connector available for audio. Currently in mainline the ASoC simple-card is used for Odroid XU3, I decided to change it and use a dedicated ASoC machine driver, which allowed to implemement specific clock settings (EPLL and the I2S root clock adjusted to audio sample rates) and to ensure proper number of audio channels gets negotiated in multicodec system configuration. This series is based on v4.11-rc6, has been tested on Odroid XU3. Sylwester Nawrocki (7): clk: samsung: Add enable/disable operation for PLL36XX clocks clk: samsung: Add definitions of some audio related clocks clk: samsung: exynos542x: Add EPLL rate table drm: exynos: Add driver for HDMI audio interface ASoC: Add Odroid sound DT bindings documentation ASoC: samsung: Add Odroid ASoC machine driver ARM: dts: samsung: Switch to dedicated Odroid sound card binding .../devicetree/bindings/sound/samsung,odroid.txt | 57 ++++++ arch/arm/boot/dts/exynos4.dtsi | 1 + arch/arm/boot/dts/exynos5420.dtsi | 1 + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 59 ++++-- drivers/clk/samsung/clk-exynos5420.c | 31 ++- drivers/clk/samsung/clk-pll.c | 85 ++++---- drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_hdmi.c | 220 +++++++++++++++++---- include/dt-bindings/clock/exynos5420.h | 3 + sound/soc/samsung/Kconfig | 8 + sound/soc/samsung/Makefile | 2 + sound/soc/samsung/odroid.c | 219 ++++++++++++++++++++ 12 files changed, 599 insertions(+), 88 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroid.txt create mode 100644 sound/soc/samsung/odroid.c -- 1.9.1

5 25

[PATCH] drm/nouveau: use proper prototype in nouveau_pmops_runtime() definition
by Arnd Bergmann 09 Jun '17

09 Jun '17

There is a prototype for this function in the header, but the function itself lacks a 'void' in the argument list, causing a harmless warning when building with 'make W=1': drivers/gpu/drm/nouveau/nouveau_drm.c: In function 'nouveau_pmops_runtime': drivers/gpu/drm/nouveau/nouveau_drm.c:730:1: error: old-style function definition [-Werror=old-style-definition] Fixes: 321f5c5f2c49 ("drm/nouveau: replace multiple open-coded runpm support checks with function") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 7acd1cf8c5a6..90757af9bc73 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -727,7 +727,7 @@ nouveau_pmops_thaw(struct device *dev) } bool -nouveau_pmops_runtime() +nouveau_pmops_runtime(void) { if (nouveau_runtime_pm == -1) return nouveau_is_optimus() || nouveau_is_v1_dsm(); -- 2.9.0

1 0

Re: [PATCH v6 5/5] drm/amdgpu: resize VRAM BAR for CPU access v2
by Bjorn Helgaas 09 Jun '17

09 Jun '17

[+cc ADMGPU, DRM folks] On Tue, May 09, 2017 at 06:49:07PM +0200, Christian König wrote: > From: Christian König <christian.koenig(a)amd.com> > > Try to resize BAR0 to let CPU access all of VRAM. > > v2: rebased, style cleanups, disable mem decode before resize, > handle gmc_v9 as well, round size up to power of two. > > Signed-off-by: Christian König <christian.koenig(a)amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 37 ++++++++++++++++++++++++++++++ > drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 8 ++++--- > drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 8 ++++--- > drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 10 ++++---- > 5 files changed, 54 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 5310781..d6f5286 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -1884,6 +1884,7 @@ uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, > struct ttm_mem_reg *mem); > void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 base); > void amdgpu_gtt_location(struct amdgpu_device *adev, struct amdgpu_mc *mc); > +void amdgpu_resize_bar0(struct amdgpu_device *adev); > void amdgpu_ttm_set_active_vram_size(struct amdgpu_device *adev, u64 size); > int amdgpu_ttm_init(struct amdgpu_device *adev); > void amdgpu_ttm_fini(struct amdgpu_device *adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 2719c02..4e83a56 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -694,6 +694,43 @@ void amdgpu_gtt_location(struct amdgpu_device *adev, struct amdgpu_mc *mc) > mc->gtt_size >> 20, mc->gtt_start, mc->gtt_end); > } > > +/** > + * amdgpu_resize_bar0 - try to resize BAR0 > + * > + * @adev: amdgpu_device pointer > + * > + * Try to resize BAR0 to make all VRAM CPU accessible. > + */ > +void amdgpu_resize_bar0(struct amdgpu_device *adev) > +{ > + u64 space_needed = roundup_pow_of_two(adev->mc.real_vram_size); > + u32 rbar_size = order_base_2(((space_needed >> 20) | 1)) -1; > + u16 cmd; > + int r; > + > + /* Free the doorbell mapping, it most likely needs to move as well */ > + amdgpu_doorbell_fini(adev); > + pci_release_resource(adev->pdev, 2); > + > + /* Disable memory decoding while we change the BAR addresses and size */ > + pci_read_config_word(adev->pdev, PCI_COMMAND, &cmd); > + pci_write_config_word(adev->pdev, PCI_COMMAND, > + cmd & ~PCI_COMMAND_MEMORY); > + > + r = pci_resize_resource(adev->pdev, 0, rbar_size); > + if (r == -ENOSPC) > + DRM_INFO("Not enough PCI address space for a large BAR."); > + else if (r && r != -ENOTSUPP) > + DRM_ERROR("Problem resizing BAR0 (%d).", r); > + > + pci_write_config_word(adev->pdev, PCI_COMMAND, cmd); > + > + /* When the doorbell BAR isn't available we have no chance of > + * using the device. > + */ > + BUG_ON(amdgpu_doorbell_init(adev)); This amdgpu_doorbell_fini()/amdgpu_doorbell_init() thing doesn't look right. amdgpu_device_init() only calls amdgpu_doorbell_init() for "adev->asic_type >= CHIP_BONAIRE", but we call it unconditionally here. This is the call graph: amdgpu_device_init adev->rmmio_base = pci_resource_start(adev->pdev, 5) # 2 for < BONAIRE adev->rmmio = ioremap(adev->rmmio_base, ...) DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)adev->rmmio_base) if (adev->asic_type >= CHIP_BONAIRE) { amdgpu_doorbell_init adev->doorbell.base = pci_resource_start(adev->pdev, 2) adev->doorbell.ptr = ioremap(adev->doorbell.base, ...) } amdgpu_init gmc_v7_0_sw_init # gmc_v7_0_ip_funcs.sw_init gmc_v7_0_mc_init + amdgpu_resize_bar0 + amdgpu_doorbell_fini + pci_release_resource(adev->pdev, 2) + pci_resize_resource(adev->pdev, 0, size) + amdgpu_doorbell_init adev->mc.aper_base = pci_resource_start(adev->pdev, 0) If "asic_type < CHIP_BONAIRE", we ioremapped BAR 2 in amdgpu_device_init(), then we released the resource here and never updated the ioremap. >From the PCI core perspective, it would be much cleaner to do the BAR resize before the driver calls pci_enable_device(). If that could be done, there would be no need for this sort of shutdown/reinit stuff and we wouldn't have to worry about issues like these. The amdgpu init path is pretty complicated, so I don't know whether this is possible. I would also like to simplify the driver usage model and get the PCI_COMMAND_MEMORY twiddling into the PCI core instead of the driver. Ideally, the driver would do something like this: pci_resize_resource(adev->pdev, 0, rbar_size); pci_enable_device(adev->pdev); And the PCI core would be something along these lines: int pci_resize_resource(dev, bar, size) { if (pci_is_enabled(dev)) return -EBUSY; pci_disable_decoding(dev); # turn off MEM, IO decoding pci_release_resources(dev); # (all of them) err = pci_resize_bar(dev, bar, size); # change BAR size (only) if (err) return err; pci_assign_resources(dev); # reassign all "dev" resources return 0; } > +} > + > /* > * GPU helpers function. > */ > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c > index a9083a1..ae71524 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c > @@ -372,13 +372,15 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) > } > adev->mc.vram_width = numchan * chansize; > } > - /* Could aper size report 0 ? */ > - adev->mc.aper_base = pci_resource_start(adev->pdev, 0); > - adev->mc.aper_size = pci_resource_len(adev->pdev, 0); > /* size in MB on si */ > adev->mc.mc_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL; > adev->mc.real_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL; > > + if (!(adev->flags & AMD_IS_APU)) > + amdgpu_resize_bar0(adev); > + adev->mc.aper_base = pci_resource_start(adev->pdev, 0); > + adev->mc.aper_size = pci_resource_len(adev->pdev, 0); > + > #ifdef CONFIG_X86_64 > if (adev->flags & AMD_IS_APU) { > adev->mc.aper_base = ((u64)RREG32(mmMC_VM_FB_OFFSET)) << 22; > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c > index 4ac9978..1655de2 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c > @@ -534,13 +534,15 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev) > } > adev->mc.vram_width = numchan * chansize; > } > - /* Could aper size report 0 ? */ > - adev->mc.aper_base = pci_resource_start(adev->pdev, 0); > - adev->mc.aper_size = pci_resource_len(adev->pdev, 0); > /* size in MB on si */ > adev->mc.mc_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL; > adev->mc.real_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL; > > + if (!(adev->flags & AMD_IS_APU)) > + amdgpu_resize_bar0(adev); > + adev->mc.aper_base = pci_resource_start(adev->pdev, 0); > + adev->mc.aper_size = pci_resource_len(adev->pdev, 0); > + > #ifdef CONFIG_X86_64 > if (adev->flags & AMD_IS_APU) { > adev->mc.aper_base = ((u64)RREG32(mmMC_VM_FB_OFFSET)) << 22; > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > index b9f11fa..d65728a 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c > @@ -469,16 +469,18 @@ static int gmc_v9_0_mc_init(struct amdgpu_device *adev) > } > adev->mc.vram_width = numchan * chansize; > > - /* Could aper size report 0 ? */ > - adev->mc.aper_base = pci_resource_start(adev->pdev, 0); > - adev->mc.aper_size = pci_resource_len(adev->pdev, 0); > /* size in MB on si */ > adev->mc.mc_vram_size = > nbio_v6_1_get_memsize(adev) * 1024ULL * 1024ULL; > adev->mc.real_vram_size = adev->mc.mc_vram_size; > - adev->mc.visible_vram_size = adev->mc.aper_size; > + > + if (!(adev->flags & AMD_IS_APU)) > + amdgpu_resize_bar0(adev); > + adev->mc.aper_base = pci_resource_start(adev->pdev, 0); > + adev->mc.aper_size = pci_resource_len(adev->pdev, 0); > > /* In case the PCI BAR is larger than the actual amount of vram */ > + adev->mc.visible_vram_size = adev->mc.aper_size; > if (adev->mc.visible_vram_size > adev->mc.real_vram_size) > adev->mc.visible_vram_size = adev->mc.real_vram_size; > > -- > 2.7.4 >

4 7

[PATCH v2 0/4] Add RK3399 HDMI Support
by Mark Yao 09 Jun '17

09 Jun '17

RK3399 and RK3288 shared the same HDMI IP controller, only some light difference with GRF configure, and an external VPLL clock need to configure. base on Yakir's v1 thread: http://lkml.iu.edu/hypermail/linux/kernel/1607.1/01468.html Some Yakir's hdmi patches cause hdmi no display on my test, so I remove them on this thread. Tested on rk3399 evb board with kernel 4.12.0-rc1. Changes in v2: rebase to newest uptream, reuse hdmi_phy_configure_dwc_hdmi_3d_tx Mark Yao (2): drm: bridge: dw-hdmi: Export hdmi_phy_configure_dwc_hdmi_3d_tx drm/rockchip: dw_hdmi: add RK3399 HDMI support Yakir Yang (2): drm/rockchip: dw_hdmi: introduce the VPLL clock setting drm/rockchip: dw_hdmi: introduce the pclk for grf .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 3 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 3 +- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 112 ++++++++++++++++++--- include/drm/bridge/dw_hdmi.h | 3 + 4 files changed, 107 insertions(+), 14 deletions(-) -- 1.9.1

3 6

[PATCH] ARM: dts: exynos: Add the OF graph between fimd and dsi
by Hoegeun Kwon 09 Jun '17

09 Jun '17

It should be connected to OF graph between fimd and dsi. Add the OF graph between fimd and dsi. Signed-off-by: Hoegeun Kwon <hoegeun.kwon(a)samsung.com> --- arch/arm/boot/dts/exynos3250.dtsi | 26 ++++++++++++++++++++++++++ arch/arm/boot/dts/exynos4.dtsi | 26 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi index 590ee44..22d523f 100644 --- a/arch/arm/boot/dts/exynos3250.dtsi +++ b/arch/arm/boot/dts/exynos3250.dtsi @@ -311,6 +311,19 @@ iommus = <&sysmmu_fimd0>; samsung,sysreg = <&sys_reg>; status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + fimd_to_dsi: endpoint { + remote-endpoint = + <&dsi_to_fimd>; + }; + }; + }; }; dsi_0: dsi@11C80000 { @@ -326,6 +339,19 @@ #address-cells = <1>; #size-cells = <0>; status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dsi_to_fimd: endpoint { + remote-endpoint = + <&fimd_to_dsi>; + }; + }; + }; }; sysmmu_fimd0: sysmmu@11E20000 { diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 497a947..773d392 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -193,6 +193,19 @@ status = "disabled"; #address-cells = <1>; #size-cells = <0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dsi_to_fimd: endpoint { + remote-endpoint = + <&fimd_to_dsi>; + }; + }; + }; }; camera { @@ -715,6 +728,19 @@ iommus = <&sysmmu_fimd0>; samsung,sysreg = <&sys_reg>; status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + fimd_to_dsi: endpoint { + remote-endpoint = + <&dsi_to_fimd>; + }; + }; + }; }; tmu: tmu@100C0000 { -- 1.9.1

2 2

[PATCH 5/8] lib/interval_tree: Fast overlap detection
by Davidlohr Bueso 09 Jun '17

09 Jun '17

Allow interval trees to quickly check for overlaps to avoid unnecesary tree lookups in interval_tree_iter_first(). As of this patch, all interval tree flavors will require using a 'rb_root_cached' such that we can have the leftmost node easily available. While most users will make use of this feature, those with special functions (in addition to the generic insert, delete, search calls) will avoid using the cached option as they can do funky things with insertions -- for example, vma_interval_tree_insert_after(). Cc: David Airlie <airlied(a)linux.ie> Cc: dri-devel(a)lists.freedesktop.org Cc: "Michael S. Tsirkin" <mst(a)redhat.com> Cc: Jason Wang <jasowang(a)redhat.com> Cc: Doug Ledford <dledford(a)redhat.com> Cc: Christian Benvenuti <benve(a)cisco.com> Cc: linux-rdma(a)vger.kernel.org Signed-off-by: Davidlohr Bueso <dbueso(a)suse.de> --- This is part of the rbtree internal caching series: https://marc.info/?l=linux-kernel&m=149611025616685 drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- drivers/gpu/drm/drm_mm.c | 10 ++--- drivers/gpu/drm/drm_vma_manager.c | 2 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 6 +-- drivers/gpu/drm/radeon/radeon.h | 2 +- drivers/gpu/drm/radeon/radeon_mn.c | 8 ++-- drivers/gpu/drm/radeon/radeon_vm.c | 7 ++-- drivers/infiniband/core/umem_rbtree.c | 4 +- drivers/infiniband/core/uverbs_cmd.c | 2 +- drivers/infiniband/hw/hfi1/mmu_rb.c | 10 ++--- drivers/infiniband/hw/usnic/usnic_uiom.c | 6 +-- drivers/infiniband/hw/usnic/usnic_uiom.h | 2 +- .../infiniband/hw/usnic/usnic_uiom_interval_tree.c | 15 +++---- .../infiniband/hw/usnic/usnic_uiom_interval_tree.h | 12 +++--- drivers/vhost/vhost.c | 2 +- drivers/vhost/vhost.h | 2 +- fs/hugetlbfs/inode.c | 6 +-- fs/inode.c | 2 +- include/drm/drm_mm.h | 2 +- include/linux/fs.h | 4 +- include/linux/interval_tree.h | 8 ++-- include/linux/interval_tree_generic.h | 46 +++++++++++++++++----- include/linux/mm.h | 17 ++++---- include/linux/rmap.h | 4 +- include/rdma/ib_umem_odp.h | 11 ++++-- include/rdma/ib_verbs.h | 2 +- lib/interval_tree_test.c | 4 +- mm/interval_tree.c | 10 ++--- mm/memory.c | 4 +- mm/mmap.c | 10 ++--- mm/rmap.c | 4 +- 33 files changed, 139 insertions(+), 102 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c index 38f739fb727b..3f8aef21b9a6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c @@ -51,7 +51,7 @@ struct amdgpu_mn { /* objects protected by lock */ struct mutex lock; - struct rb_root objects; + struct rb_root_cached objects; }; struct amdgpu_mn_node { @@ -76,8 +76,8 @@ static void amdgpu_mn_destroy(struct work_struct *work) mutex_lock(&adev->mn_lock); mutex_lock(&rmn->lock); hash_del(&rmn->node); - rbtree_postorder_for_each_entry_safe(node, next_node, &rmn->objects, - it.rb) { + rbtree_postorder_for_each_entry_safe(node, next_node, + &rmn->objects.rb_root, it.rb) { list_for_each_entry_safe(bo, next_bo, &node->bos, mn_list) { bo->mn = NULL; list_del_init(&bo->mn_list); @@ -252,7 +252,7 @@ static struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev) rmn->mm = mm; rmn->mn.ops = &amdgpu_mn_ops; mutex_init(&rmn->lock); - rmn->objects = RB_ROOT; + rmn->objects = RB_ROOT_CACHED; r = __mmu_notifier_register(&rmn->mn, mm); if (r) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 83c172a6e938..ab73ace3d38a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -2150,7 +2150,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm) struct amd_sched_rq *rq; int r; - vm->va = RB_ROOT; + vm->va = RB_ROOT_CACHED; vm->client_id = atomic64_inc_return(&adev->vm_manager.client_counter); spin_lock_init(&vm->status_lock); INIT_LIST_HEAD(&vm->invalidated); @@ -2239,10 +2239,11 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) amd_sched_entity_fini(vm->entity.sched, &vm->entity); - if (!RB_EMPTY_ROOT(&vm->va)) { + if (!RB_EMPTY_ROOT(&vm->va.rb_root)) { dev_err(adev->dev, "still active bo inside vm\n"); } - rbtree_postorder_for_each_entry_safe(mapping, tmp, &vm->va, rb) { + rbtree_postorder_for_each_entry_safe(mapping, tmp, + &vm->va.rb_root, rb) { list_del(&mapping->list); amdgpu_vm_it_remove(mapping, &vm->va); kfree(mapping); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h index e1d951ece433..6b2e8309ca70 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h @@ -96,7 +96,7 @@ struct amdgpu_vm_pt { struct amdgpu_vm { /* tree of virtual addresses mapped */ - struct rb_root va; + struct rb_root_cached va; /* protecting invalidated */ spinlock_t status_lock; diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index f794089d30ac..21863f0afb87 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c @@ -169,7 +169,7 @@ INTERVAL_TREE_DEFINE(struct drm_mm_node, rb, struct drm_mm_node * __drm_mm_interval_first(const struct drm_mm *mm, u64 start, u64 last) { - return drm_mm_interval_tree_iter_first((struct rb_root *)&mm->interval_tree, + return drm_mm_interval_tree_iter_first((struct rb_root_cached *)&mm->interval_tree, start, last) ?: (struct drm_mm_node *)&mm->head_node; } EXPORT_SYMBOL(__drm_mm_interval_first); @@ -198,7 +198,7 @@ static void drm_mm_interval_tree_add_node(struct drm_mm_node *hole_node, link = &hole_node->rb.rb_right; } else { rb = NULL; - link = &mm->interval_tree.rb_node; + link = &mm->interval_tree.rb_root.rb_node; } while (*link) { @@ -214,7 +214,7 @@ static void drm_mm_interval_tree_add_node(struct drm_mm_node *hole_node, rb_link_node(&node->rb, rb, link); rb_insert_augmented(&node->rb, - &mm->interval_tree, + &mm->interval_tree.rb_root, &drm_mm_interval_tree_augment); } @@ -577,7 +577,7 @@ void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new) *new = *old; list_replace(&old->node_list, &new->node_list); - rb_replace_node(&old->rb, &new->rb, &old->mm->interval_tree); + rb_replace_node(&old->rb, &new->rb, &old->mm->interval_tree.rb_root); if (drm_mm_hole_follows(old)) { list_replace(&old->hole_stack, &new->hole_stack); @@ -863,7 +863,7 @@ void drm_mm_init(struct drm_mm *mm, u64 start, u64 size) mm->color_adjust = NULL; INIT_LIST_HEAD(&mm->hole_stack); - mm->interval_tree = RB_ROOT; + mm->interval_tree = RB_ROOT_CACHED; mm->holes_size = RB_ROOT; mm->holes_addr = RB_ROOT; diff --git a/drivers/gpu/drm/drm_vma_manager.c b/drivers/gpu/drm/drm_vma_manager.c index d9100b565198..28f1226576f8 100644 --- a/drivers/gpu/drm/drm_vma_manager.c +++ b/drivers/gpu/drm/drm_vma_manager.c @@ -147,7 +147,7 @@ struct drm_vma_offset_node *drm_vma_offset_lookup_locked(struct drm_vma_offset_m struct rb_node *iter; unsigned long offset; - iter = mgr->vm_addr_space_mm.interval_tree.rb_node; + iter = mgr->vm_addr_space_mm.interval_tree.rb_root.rb_node; best = NULL; while (likely(iter)) { diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c index 1a0ce1dc68f5..40cd8c32a153 100644 --- a/drivers/gpu/drm/i915/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c @@ -49,7 +49,7 @@ struct i915_mmu_notifier { spinlock_t lock; struct hlist_node node; struct mmu_notifier mn; - struct rb_root objects; + struct rb_root_cached objects; struct workqueue_struct *wq; }; @@ -123,7 +123,7 @@ static void i915_gem_userptr_mn_invalidate_range_start(struct mmu_notifier *_mn, struct interval_tree_node *it; LIST_HEAD(cancelled); - if (RB_EMPTY_ROOT(&mn->objects)) + if (RB_EMPTY_ROOT(&mn->objects.rb_root)) return; /* interval ranges are inclusive, but invalidate range is exclusive */ @@ -172,7 +172,7 @@ i915_mmu_notifier_create(struct mm_struct *mm) spin_lock_init(&mn->lock); mn->mn.ops = &i915_gem_userptr_notifier; - mn->objects = RB_ROOT; + mn->objects = RB_ROOT_CACHED; mn->wq = alloc_workqueue("i915-userptr-release", WQ_UNBOUND, 0); if (mn->wq == NULL) { kfree(mn); diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 342e3b1fb9c7..569915163b57 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -937,7 +937,7 @@ struct radeon_vm_id { struct radeon_vm { struct mutex mutex; - struct rb_root va; + struct rb_root_cached va; /* protecting invalidated and freed */ spinlock_t status_lock; diff --git a/drivers/gpu/drm/radeon/radeon_mn.c b/drivers/gpu/drm/radeon/radeon_mn.c index 896f2cf51e4e..1d62288b7ee3 100644 --- a/drivers/gpu/drm/radeon/radeon_mn.c +++ b/drivers/gpu/drm/radeon/radeon_mn.c @@ -50,7 +50,7 @@ struct radeon_mn { /* objects protected by lock */ struct mutex lock; - struct rb_root objects; + struct rb_root_cached objects; }; struct radeon_mn_node { @@ -75,8 +75,8 @@ static void radeon_mn_destroy(struct work_struct *work) mutex_lock(&rdev->mn_lock); mutex_lock(&rmn->lock); hash_del(&rmn->node); - rbtree_postorder_for_each_entry_safe(node, next_node, &rmn->objects, - it.rb) { + rbtree_postorder_for_each_entry_safe(node, next_node, + &rmn->objects.rb_root, it.rb) { interval_tree_remove(&node->it, &rmn->objects); list_for_each_entry_safe(bo, next_bo, &node->bos, mn_list) { @@ -205,7 +205,7 @@ static struct radeon_mn *radeon_mn_get(struct radeon_device *rdev) rmn->mm = mm; rmn->mn.ops = &radeon_mn_ops; mutex_init(&rmn->lock); - rmn->objects = RB_ROOT; + rmn->objects = RB_ROOT_CACHED; r = __mmu_notifier_register(&rmn->mn, mm); if (r) diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c index 5f68245579a3..f44777a6c2e8 100644 --- a/drivers/gpu/drm/radeon/radeon_vm.c +++ b/drivers/gpu/drm/radeon/radeon_vm.c @@ -1185,7 +1185,7 @@ int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm) vm->ids[i].last_id_use = NULL; } mutex_init(&vm->mutex); - vm->va = RB_ROOT; + vm->va = RB_ROOT_CACHED; spin_lock_init(&vm->status_lock); INIT_LIST_HEAD(&vm->invalidated); INIT_LIST_HEAD(&vm->freed); @@ -1232,10 +1232,11 @@ void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm) struct radeon_bo_va *bo_va, *tmp; int i, r; - if (!RB_EMPTY_ROOT(&vm->va)) { + if (!RB_EMPTY_ROOT(&vm->va.rb_root)) { dev_err(rdev->dev, "still active bo inside vm\n"); } - rbtree_postorder_for_each_entry_safe(bo_va, tmp, &vm->va, it.rb) { + rbtree_postorder_for_each_entry_safe(bo_va, tmp, + &vm->va.rb_root, it.rb) { interval_tree_remove(&bo_va->it, &vm->va); r = radeon_bo_reserve(bo_va->bo, false); if (!r) { diff --git a/drivers/infiniband/core/umem_rbtree.c b/drivers/infiniband/core/umem_rbtree.c index d176597b4d78..fc801920e341 100644 --- a/drivers/infiniband/core/umem_rbtree.c +++ b/drivers/infiniband/core/umem_rbtree.c @@ -72,7 +72,7 @@ INTERVAL_TREE_DEFINE(struct umem_odp_node, rb, u64, __subtree_last, /* @last is not a part of the interval. See comment for function * node_last. */ -int rbt_ib_umem_for_each_in_range(struct rb_root *root, +int rbt_ib_umem_for_each_in_range(struct rb_root_cached *root, u64 start, u64 last, umem_call_back cb, void *cookie) @@ -95,7 +95,7 @@ int rbt_ib_umem_for_each_in_range(struct rb_root *root, } EXPORT_SYMBOL(rbt_ib_umem_for_each_in_range); -struct ib_umem_odp *rbt_ib_umem_lookup(struct rb_root *root, +struct ib_umem_odp *rbt_ib_umem_lookup(struct rb_root_cached *root, u64 addr, u64 length) { struct umem_odp_node *node; diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index 0ad3b05405d8..f73d4153dbd0 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -117,7 +117,7 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file, ucontext->closing = 0; #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING - ucontext->umem_tree = RB_ROOT; + ucontext->umem_tree = RB_ROOT_CACHED; init_rwsem(&ucontext->umem_rwsem); ucontext->odp_mrs_count = 0; INIT_LIST_HEAD(&ucontext->no_private_counters); diff --git a/drivers/infiniband/hw/hfi1/mmu_rb.c b/drivers/infiniband/hw/hfi1/mmu_rb.c index ccbf52c8ff6f..1835447dcd73 100644 --- a/drivers/infiniband/hw/hfi1/mmu_rb.c +++ b/drivers/infiniband/hw/hfi1/mmu_rb.c @@ -54,7 +54,7 @@ struct mmu_rb_handler { struct mmu_notifier mn; - struct rb_root root; + struct rb_root_cached root; void *ops_arg; spinlock_t lock; /* protect the RB tree */ struct mmu_rb_ops *ops; @@ -111,7 +111,7 @@ int hfi1_mmu_rb_register(void *ops_arg, struct mm_struct *mm, if (!handlr) return -ENOMEM; - handlr->root = RB_ROOT; + handlr->root = RB_ROOT_CACHED; handlr->ops = ops; handlr->ops_arg = ops_arg; INIT_HLIST_NODE(&handlr->mn.hlist); @@ -152,9 +152,9 @@ void hfi1_mmu_rb_unregister(struct mmu_rb_handler *handler) INIT_LIST_HEAD(&del_list); spin_lock_irqsave(&handler->lock, flags); - while ((node = rb_first(&handler->root))) { + while ((node = rb_first_cached(&handler->root))) { rbnode = rb_entry(node, struct mmu_rb_node, node); - rb_erase(node, &handler->root); + rb_erase_cached(node, &handler->root); /* move from LRU list to delete list */ list_move(&rbnode->list, &del_list); } @@ -305,7 +305,7 @@ static void mmu_notifier_mem_invalidate(struct mmu_notifier *mn, { struct mmu_rb_handler *handler = container_of(mn, struct mmu_rb_handler, mn); - struct rb_root *root = &handler->root; + struct rb_root_cached *root = &handler->root; struct mmu_rb_node *node, *ptr = NULL; unsigned long flags; bool added = false; diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c index c49db7c33979..4381c0a9a873 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c @@ -227,7 +227,7 @@ static void __usnic_uiom_reg_release(struct usnic_uiom_pd *pd, vpn_last = vpn_start + npages - 1; spin_lock(&pd->lock); - usnic_uiom_remove_interval(&pd->rb_root, vpn_start, + usnic_uiom_remove_interval(&pd->root, vpn_start, vpn_last, &rm_intervals); usnic_uiom_unmap_sorted_intervals(&rm_intervals, pd); @@ -379,7 +379,7 @@ struct usnic_uiom_reg *usnic_uiom_reg_get(struct usnic_uiom_pd *pd, err = usnic_uiom_get_intervals_diff(vpn_start, vpn_last, (writable) ? IOMMU_WRITE : 0, IOMMU_WRITE, - &pd->rb_root, + &pd->root, &sorted_diff_intervals); if (err) { usnic_err("Failed disjoint interval vpn [0x%lx,0x%lx] err %d\n", @@ -395,7 +395,7 @@ struct usnic_uiom_reg *usnic_uiom_reg_get(struct usnic_uiom_pd *pd, } - err = usnic_uiom_insert_interval(&pd->rb_root, vpn_start, vpn_last, + err = usnic_uiom_insert_interval(&pd->root, vpn_start, vpn_last, (writable) ? IOMMU_WRITE : 0); if (err) { usnic_err("Failed insert interval vpn [0x%lx,0x%lx] err %d\n", diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.h b/drivers/infiniband/hw/usnic/usnic_uiom.h index 45ca7c1613a7..431efe4143f4 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.h +++ b/drivers/infiniband/hw/usnic/usnic_uiom.h @@ -55,7 +55,7 @@ struct usnic_uiom_dev { struct usnic_uiom_pd { struct iommu_domain *domain; spinlock_t lock; - struct rb_root rb_root; + struct rb_root_cached root; struct list_head devs; int dev_cnt; }; diff --git a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c index 42b4b4c4e452..d399523206c7 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c @@ -100,9 +100,9 @@ static int interval_cmp(void *priv, struct list_head *a, struct list_head *b) } static void -find_intervals_intersection_sorted(struct rb_root *root, unsigned long start, - unsigned long last, - struct list_head *list) +find_intervals_intersection_sorted(struct rb_root_cached *root, + unsigned long start, unsigned long last, + struct list_head *list) { struct usnic_uiom_interval_node *node; @@ -118,7 +118,7 @@ find_intervals_intersection_sorted(struct rb_root *root, unsigned long start, int usnic_uiom_get_intervals_diff(unsigned long start, unsigned long last, int flags, int flag_mask, - struct rb_root *root, + struct rb_root_cached *root, struct list_head *diff_set) { struct usnic_uiom_interval_node *interval, *tmp; @@ -175,7 +175,7 @@ void usnic_uiom_put_interval_set(struct list_head *intervals) kfree(interval); } -int usnic_uiom_insert_interval(struct rb_root *root, unsigned long start, +int usnic_uiom_insert_interval(struct rb_root_cached *root, unsigned long start, unsigned long last, int flags) { struct usnic_uiom_interval_node *interval, *tmp; @@ -246,8 +246,9 @@ int usnic_uiom_insert_interval(struct rb_root *root, unsigned long start, return err; } -void usnic_uiom_remove_interval(struct rb_root *root, unsigned long start, - unsigned long last, struct list_head *removed) +void usnic_uiom_remove_interval(struct rb_root_cached *root, + unsigned long start, unsigned long last, + struct list_head *removed) { struct usnic_uiom_interval_node *interval; diff --git a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h index c0b0b876ab90..1d7fc3226bca 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h +++ b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h @@ -48,12 +48,12 @@ struct usnic_uiom_interval_node { extern void usnic_uiom_interval_tree_insert(struct usnic_uiom_interval_node *node, - struct rb_root *root); + struct rb_root_cached *root); extern void usnic_uiom_interval_tree_remove(struct usnic_uiom_interval_node *node, - struct rb_root *root); + struct rb_root_cached *root); extern struct usnic_uiom_interval_node * -usnic_uiom_interval_tree_iter_first(struct rb_root *root, +usnic_uiom_interval_tree_iter_first(struct rb_root_cached *root, unsigned long start, unsigned long last); extern struct usnic_uiom_interval_node * @@ -63,7 +63,7 @@ usnic_uiom_interval_tree_iter_next(struct usnic_uiom_interval_node *node, * Inserts {start...last} into {root}. If there are overlaps, * nodes will be broken up and merged */ -int usnic_uiom_insert_interval(struct rb_root *root, +int usnic_uiom_insert_interval(struct rb_root_cached *root, unsigned long start, unsigned long last, int flags); /* @@ -71,7 +71,7 @@ int usnic_uiom_insert_interval(struct rb_root *root, * 'removed.' The caller is responsibile for freeing memory of nodes in * 'removed.' */ -void usnic_uiom_remove_interval(struct rb_root *root, +void usnic_uiom_remove_interval(struct rb_root_cached *root, unsigned long start, unsigned long last, struct list_head *removed); /* @@ -81,7 +81,7 @@ void usnic_uiom_remove_interval(struct rb_root *root, int usnic_uiom_get_intervals_diff(unsigned long start, unsigned long last, int flags, int flag_mask, - struct rb_root *root, + struct rb_root_cached *root, struct list_head *diff_set); /* Call this to free diff_set returned by usnic_uiom_get_intervals_diff */ void usnic_uiom_put_interval_set(struct list_head *intervals); diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 042030e5a035..80ea4b23e097 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1272,7 +1272,7 @@ static struct vhost_umem *vhost_umem_alloc(void) if (!umem) return NULL; - umem->umem_tree = RB_ROOT; + umem->umem_tree = RB_ROOT_CACHED; umem->numem = 0; INIT_LIST_HEAD(&umem->umem_list); diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index f55671d53f28..4e2e54cc4102 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -71,7 +71,7 @@ struct vhost_umem_node { }; struct vhost_umem { - struct rb_root umem_tree; + struct rb_root_cached umem_tree; struct list_head umem_list; int numem; }; diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 33b33ec2a090..5b13e23962a7 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -334,7 +334,7 @@ static void remove_huge_page(struct page *page) } static void -hugetlb_vmdelete_list(struct rb_root *root, pgoff_t start, pgoff_t end) +hugetlb_vmdelete_list(struct rb_root_cached *root, pgoff_t start, pgoff_t end) { struct vm_area_struct *vma; @@ -514,7 +514,7 @@ static int hugetlb_vmtruncate(struct inode *inode, loff_t offset) i_size_write(inode, offset); i_mmap_lock_write(mapping); - if (!RB_EMPTY_ROOT(&mapping->i_mmap)) + if (!RB_EMPTY_ROOT(&mapping->i_mmap.rb_root)) hugetlb_vmdelete_list(&mapping->i_mmap, pgoff, 0); i_mmap_unlock_write(mapping); remove_inode_hugepages(inode, offset, LLONG_MAX); @@ -539,7 +539,7 @@ static long hugetlbfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) inode_lock(inode); i_mmap_lock_write(mapping); - if (!RB_EMPTY_ROOT(&mapping->i_mmap)) + if (!RB_EMPTY_ROOT(&mapping->i_mmap.rb_root)) hugetlb_vmdelete_list(&mapping->i_mmap, hole_start >> PAGE_SHIFT, hole_end >> PAGE_SHIFT); diff --git a/fs/inode.c b/fs/inode.c index a25b9d5fb52e..afeedfc096bb 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -352,7 +352,7 @@ void address_space_init_once(struct address_space *mapping) init_rwsem(&mapping->i_mmap_rwsem); INIT_LIST_HEAD(&mapping->private_list); spin_lock_init(&mapping->private_lock); - mapping->i_mmap = RB_ROOT; + mapping->i_mmap = RB_ROOT_CACHED; } EXPORT_SYMBOL(address_space_init_once); diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h index 49b292e98fec..8d10fc97801c 100644 --- a/include/drm/drm_mm.h +++ b/include/drm/drm_mm.h @@ -172,7 +172,7 @@ struct drm_mm { * according to the (increasing) start address of the memory node. */ struct drm_mm_node head_node; /* Keep an interval_tree for fast lookup of drm_mm_nodes by address. */ - struct rb_root interval_tree; + struct rb_root_cached interval_tree; struct rb_root holes_size; struct rb_root holes_addr; diff --git a/include/linux/fs.h b/include/linux/fs.h index ecc301043abf..0756ecdc3cf5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -380,7 +380,7 @@ struct address_space { struct radix_tree_root page_tree; /* radix tree of all pages */ spinlock_t tree_lock; /* and lock protecting it */ atomic_t i_mmap_writable;/* count VM_SHARED mappings */ - struct rb_root i_mmap; /* tree of private and shared mappings */ + struct rb_root_cached i_mmap; /* tree of private and shared mappings */ struct rw_semaphore i_mmap_rwsem; /* protect tree, count, list */ /* Protected by tree_lock together with the radix tree */ unsigned long nrpages; /* number of total pages */ @@ -473,7 +473,7 @@ static inline void i_mmap_unlock_read(struct address_space *mapping) */ static inline int mapping_mapped(struct address_space *mapping) { - return !RB_EMPTY_ROOT(&mapping->i_mmap); + return !RB_EMPTY_ROOT(&mapping->i_mmap.rb_root); } /* diff --git a/include/linux/interval_tree.h b/include/linux/interval_tree.h index 724556aa3c95..202ee1283f4b 100644 --- a/include/linux/interval_tree.h +++ b/include/linux/interval_tree.h @@ -11,13 +11,15 @@ struct interval_tree_node { }; extern void -interval_tree_insert(struct interval_tree_node *node, struct rb_root *root); +interval_tree_insert(struct interval_tree_node *node, + struct rb_root_cached *root); extern void -interval_tree_remove(struct interval_tree_node *node, struct rb_root *root); +interval_tree_remove(struct interval_tree_node *node, + struct rb_root_cached *root); extern struct interval_tree_node * -interval_tree_iter_first(struct rb_root *root, +interval_tree_iter_first(struct rb_root_cached *root, unsigned long start, unsigned long last); extern struct interval_tree_node * diff --git a/include/linux/interval_tree_generic.h b/include/linux/interval_tree_generic.h index 58370e1862ad..f096423c8cbd 100644 --- a/include/linux/interval_tree_generic.h +++ b/include/linux/interval_tree_generic.h @@ -65,11 +65,13 @@ RB_DECLARE_CALLBACKS(static, ITPREFIX ## _augment, ITSTRUCT, ITRB, \ \ /* Insert / remove interval nodes from the tree */ \ \ -ITSTATIC void ITPREFIX ## _insert(ITSTRUCT *node, struct rb_root *root) \ +ITSTATIC void ITPREFIX ## _insert(ITSTRUCT *node, \ + struct rb_root_cached *root) \ { \ - struct rb_node **link = &root->rb_node, *rb_parent = NULL; \ + struct rb_node **link = &root->rb_root.rb_node, *rb_parent = NULL; \ ITTYPE start = ITSTART(node), last = ITLAST(node); \ ITSTRUCT *parent; \ + bool leftmost = true; \ \ while (*link) { \ rb_parent = *link; \ @@ -78,18 +80,22 @@ ITSTATIC void ITPREFIX ## _insert(ITSTRUCT *node, struct rb_root *root) \ parent->ITSUBTREE = last; \ if (start < ITSTART(parent)) \ link = &parent->ITRB.rb_left; \ - else \ + else { \ link = &parent->ITRB.rb_right; \ + leftmost = false; \ + } \ } \ \ node->ITSUBTREE = last; \ rb_link_node(&node->ITRB, rb_parent, link); \ - rb_insert_augmented(&node->ITRB, root, &ITPREFIX ## _augment); \ + rb_insert_augmented_cached(&node->ITRB, root, \ + leftmost, &ITPREFIX ## _augment); \ } \ \ -ITSTATIC void ITPREFIX ## _remove(ITSTRUCT *node, struct rb_root *root) \ +ITSTATIC void ITPREFIX ## _remove(ITSTRUCT *node, \ + struct rb_root_cached *root) \ { \ - rb_erase_augmented(&node->ITRB, root, &ITPREFIX ## _augment); \ + rb_erase_augmented_cached(&node->ITRB, root, &ITPREFIX ## _augment); \ } \ \ /* \ @@ -140,15 +146,35 @@ ITPREFIX ## _subtree_search(ITSTRUCT *node, ITTYPE start, ITTYPE last) \ } \ \ ITSTATIC ITSTRUCT * \ -ITPREFIX ## _iter_first(struct rb_root *root, ITTYPE start, ITTYPE last) \ +ITPREFIX ## _iter_first(struct rb_root_cached *root, \ + ITTYPE start, ITTYPE last) \ { \ - ITSTRUCT *node; \ + ITSTRUCT *node, *leftmost; \ \ - if (!root->rb_node) \ + if (!root->rb_root.rb_node) \ return NULL; \ - node = rb_entry(root->rb_node, ITSTRUCT, ITRB); \ + \ + /* \ + * Fastpath range intersection/overlap between A: [a0, a1] and \ + * B: [b0, b1] is given by: \ + * \ + * a0 <= b1 && b0 <= a1 \ + * \ + * ... where A holds the lock range and B holds the smallest \ + * 'start' and largest 'last' in the tree. For the later, we \ + * rely on the root node, which by augmented interval tree \ + * property, holds the largest value in its last-in-subtree. \ + * This allows mitigating some of the tree walk overhead for \ + * for non-intersecting ranges, maintained and consulted in O(1). \ + */ \ + node = rb_entry(root->rb_root.rb_node, ITSTRUCT, ITRB); \ if (node->ITSUBTREE < start) \ return NULL; \ + \ + leftmost = rb_entry(root->rb_leftmost, ITSTRUCT, ITRB); \ + if (ITSTART(leftmost) > last) \ + return NULL; \ + \ return ITPREFIX ## _subtree_search(node, start, last); \ } \ \ diff --git a/include/linux/mm.h b/include/linux/mm.h index c0b1759304ec..feb47006e2f5 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2020,13 +2020,13 @@ extern int nommu_shrink_inode_mappings(struct inode *, size_t, size_t); /* interval_tree.c */ void vma_interval_tree_insert(struct vm_area_struct *node, - struct rb_root *root); + struct rb_root_cached *root); void vma_interval_tree_insert_after(struct vm_area_struct *node, struct vm_area_struct *prev, - struct rb_root *root); + struct rb_root_cached *root); void vma_interval_tree_remove(struct vm_area_struct *node, - struct rb_root *root); -struct vm_area_struct *vma_interval_tree_iter_first(struct rb_root *root, + struct rb_root_cached *root); +struct vm_area_struct *vma_interval_tree_iter_first(struct rb_root_cached *root, unsigned long start, unsigned long last); struct vm_area_struct *vma_interval_tree_iter_next(struct vm_area_struct *node, unsigned long start, unsigned long last); @@ -2036,11 +2036,12 @@ struct vm_area_struct *vma_interval_tree_iter_next(struct vm_area_struct *node, vma; vma = vma_interval_tree_iter_next(vma, start, last)) void anon_vma_interval_tree_insert(struct anon_vma_chain *node, - struct rb_root *root); + struct rb_root_cached *root); void anon_vma_interval_tree_remove(struct anon_vma_chain *node, - struct rb_root *root); -struct anon_vma_chain *anon_vma_interval_tree_iter_first( - struct rb_root *root, unsigned long start, unsigned long last); + struct rb_root_cached *root); +struct anon_vma_chain * +anon_vma_interval_tree_iter_first(struct rb_root_cached *root, + unsigned long start, unsigned long last); struct anon_vma_chain *anon_vma_interval_tree_iter_next( struct anon_vma_chain *node, unsigned long start, unsigned long last); #ifdef CONFIG_DEBUG_VM_RB diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 43ef2c30cb0f..22c298c6cc26 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -55,7 +55,9 @@ struct anon_vma { * is serialized by a system wide lock only visible to * mm_take_all_locks() (mm_all_locks_mutex). */ - struct rb_root rb_root; /* Interval tree of private "related" vmas */ + + /* Interval tree of private "related" vmas */ + struct rb_root_cached rb_root; }; /* diff --git a/include/rdma/ib_umem_odp.h b/include/rdma/ib_umem_odp.h index fb67554aabd6..5eb7f5bc8248 100644 --- a/include/rdma/ib_umem_odp.h +++ b/include/rdma/ib_umem_odp.h @@ -111,22 +111,25 @@ int ib_umem_odp_map_dma_pages(struct ib_umem *umem, u64 start_offset, u64 bcnt, void ib_umem_odp_unmap_dma_pages(struct ib_umem *umem, u64 start_offset, u64 bound); -void rbt_ib_umem_insert(struct umem_odp_node *node, struct rb_root *root); -void rbt_ib_umem_remove(struct umem_odp_node *node, struct rb_root *root); +void rbt_ib_umem_insert(struct umem_odp_node *node, + struct rb_root_cached *root); +void rbt_ib_umem_remove(struct umem_odp_node *node, + struct rb_root_cached *root); typedef int (*umem_call_back)(struct ib_umem *item, u64 start, u64 end, void *cookie); /* * Call the callback on each ib_umem in the range. Returns the logical or of * the return values of the functions called. */ -int rbt_ib_umem_for_each_in_range(struct rb_root *root, u64 start, u64 end, +int rbt_ib_umem_for_each_in_range(struct rb_root_cached *root, + u64 start, u64 end, umem_call_back cb, void *cookie); /* * Find first region intersecting with address range. * Return NULL if not found */ -struct ib_umem_odp *rbt_ib_umem_lookup(struct rb_root *root, +struct ib_umem_odp *rbt_ib_umem_lookup(struct rb_root_cached *root, u64 addr, u64 length); static inline int ib_umem_mmu_notifier_retry(struct ib_umem *item, diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 0e480a5630d4..3b54b19a8eac 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1417,7 +1417,7 @@ struct ib_ucontext { struct pid *tgid; #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING - struct rb_root umem_tree; + struct rb_root_cached umem_tree; /* * Protects .umem_rbroot and tree, as well as odp_mrs_count and * mmu notifiers registration. diff --git a/lib/interval_tree_test.c b/lib/interval_tree_test.c index df495fe81421..0e343fd29570 100644 --- a/lib/interval_tree_test.c +++ b/lib/interval_tree_test.c @@ -19,14 +19,14 @@ __param(bool, search_all, false, "Searches will iterate all nodes in the tree"); __param(uint, max_endpoint, ~0, "Largest value for the interval's endpoint"); -static struct rb_root root = RB_ROOT; +static struct rb_root_cached root = RB_ROOT_CACHED; static struct interval_tree_node *nodes = NULL; static u32 *queries = NULL; static struct rnd_state rnd; static inline unsigned long -search(struct rb_root *root, unsigned long start, unsigned long last) +search(struct rb_root_cached *root, unsigned long start, unsigned long last) { struct interval_tree_node *node; unsigned long results = 0; diff --git a/mm/interval_tree.c b/mm/interval_tree.c index f2c2492681bf..b47664358796 100644 --- a/mm/interval_tree.c +++ b/mm/interval_tree.c @@ -28,7 +28,7 @@ INTERVAL_TREE_DEFINE(struct vm_area_struct, shared.rb, /* Insert node immediately after prev in the interval tree */ void vma_interval_tree_insert_after(struct vm_area_struct *node, struct vm_area_struct *prev, - struct rb_root *root) + struct rb_root_cached *root) { struct rb_node **link; struct vm_area_struct *parent; @@ -55,7 +55,7 @@ void vma_interval_tree_insert_after(struct vm_area_struct *node, node->shared.rb_subtree_last = last; rb_link_node(&node->shared.rb, &parent->shared.rb, link); - rb_insert_augmented(&node->shared.rb, root, + rb_insert_augmented(&node->shared.rb, &root->rb_root, &vma_interval_tree_augment); } @@ -74,7 +74,7 @@ INTERVAL_TREE_DEFINE(struct anon_vma_chain, rb, unsigned long, rb_subtree_last, static inline, __anon_vma_interval_tree) void anon_vma_interval_tree_insert(struct anon_vma_chain *node, - struct rb_root *root) + struct rb_root_cached *root) { #ifdef CONFIG_DEBUG_VM_RB node->cached_vma_start = avc_start_pgoff(node); @@ -84,13 +84,13 @@ void anon_vma_interval_tree_insert(struct anon_vma_chain *node, } void anon_vma_interval_tree_remove(struct anon_vma_chain *node, - struct rb_root *root) + struct rb_root_cached *root) { __anon_vma_interval_tree_remove(node, root); } struct anon_vma_chain * -anon_vma_interval_tree_iter_first(struct rb_root *root, +anon_vma_interval_tree_iter_first(struct rb_root_cached *root, unsigned long first, unsigned long last) { return __anon_vma_interval_tree_iter_first(root, first, last); diff --git a/mm/memory.c b/mm/memory.c index b1b97b490791..3b164eb979b2 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2593,7 +2593,7 @@ static void unmap_mapping_range_vma(struct vm_area_struct *vma, zap_page_range_single(vma, start_addr, end_addr - start_addr, details); } -static inline void unmap_mapping_range_tree(struct rb_root *root, +static inline void unmap_mapping_range_tree(struct rb_root_cached *root, struct zap_details *details) { struct vm_area_struct *vma; @@ -2657,7 +2657,7 @@ void unmap_mapping_range(struct address_space *mapping, details.last_index = ULONG_MAX; i_mmap_lock_write(mapping); - if (unlikely(!RB_EMPTY_ROOT(&mapping->i_mmap))) + if (unlikely(!RB_EMPTY_ROOT(&mapping->i_mmap.rb_root))) unmap_mapping_range_tree(&mapping->i_mmap, &details); i_mmap_unlock_write(mapping); } diff --git a/mm/mmap.c b/mm/mmap.c index 3bd5ecd20d4d..31482e1f008a 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -670,7 +670,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, struct mm_struct *mm = vma->vm_mm; struct vm_area_struct *next = vma->vm_next, *orig_vma = vma; struct address_space *mapping = NULL; - struct rb_root *root = NULL; + struct rb_root_cached *root = NULL; struct anon_vma *anon_vma = NULL; struct file *file = vma->vm_file; bool start_changed = false, end_changed = false; @@ -3279,7 +3279,7 @@ static DEFINE_MUTEX(mm_all_locks_mutex); static void vm_lock_anon_vma(struct mm_struct *mm, struct anon_vma *anon_vma) { - if (!test_bit(0, (unsigned long *) &anon_vma->root->rb_root.rb_node)) { + if (!test_bit(0, (unsigned long *) &anon_vma->rb_root.rb_root.rb_node)) { /* * The LSB of head.next can't change from under us * because we hold the mm_all_locks_mutex. @@ -3295,7 +3295,7 @@ static void vm_lock_anon_vma(struct mm_struct *mm, struct anon_vma *anon_vma) * anon_vma->root->rwsem. */ if (__test_and_set_bit(0, (unsigned long *) - &anon_vma->root->rb_root.rb_node)) + &anon_vma->root->rb_root.rb_root.rb_node)) BUG(); } } @@ -3397,7 +3397,7 @@ int mm_take_all_locks(struct mm_struct *mm) static void vm_unlock_anon_vma(struct anon_vma *anon_vma) { - if (test_bit(0, (unsigned long *) &anon_vma->root->rb_root.rb_node)) { + if (test_bit(0, (unsigned long *) &anon_vma->root->rb_root.rb_root.rb_node)) { /* * The LSB of head.next can't change to 0 from under * us because we hold the mm_all_locks_mutex. @@ -3411,7 +3411,7 @@ static void vm_unlock_anon_vma(struct anon_vma *anon_vma) * anon_vma->root->rwsem. */ if (!__test_and_clear_bit(0, (unsigned long *) - &anon_vma->root->rb_root.rb_node)) + &anon_vma->root->rb_root.rb_root.rb_node)) BUG(); anon_vma_unlock_write(anon_vma); } diff --git a/mm/rmap.c b/mm/rmap.c index ced14f1af6dc..ad479e5e081d 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -390,7 +390,7 @@ void unlink_anon_vmas(struct vm_area_struct *vma) * Leave empty anon_vmas on the list - we'll need * to free them outside the lock. */ - if (RB_EMPTY_ROOT(&anon_vma->rb_root)) { + if (RB_EMPTY_ROOT(&anon_vma->rb_root.rb_root)) { anon_vma->parent->degree--; continue; } @@ -424,7 +424,7 @@ static void anon_vma_ctor(void *data) init_rwsem(&anon_vma->rwsem); atomic_set(&anon_vma->refcount, 0); - anon_vma->rb_root = RB_ROOT; + anon_vma->rb_root = RB_ROOT_CACHED; } void __init anon_vma_init(void) -- 2.12.0

2 1

[git pull] drm fixes for 4.12-rc5
by Dave Airlie 09 Jun '17

09 Jun '17

Hi Linus, Bit more spread out fixes this time, fixes for 7 drivers + a couple of core fixes. i915 and vmwgfx are the main ones. The vmwgfx ones fix a bunch of regressions in their atomic rework, and a few fixes destined for stable. i915 has some 4.12 regressions and older things that need to be fixed in stable as well. nouveau also has some runtime pm fixes and a timer list handling fix, otherwise a couple of core and small driver regression fixes. Thanks, Dave, The following changes since commit 3c2993b8c6143d8a5793746a54eba8f86f95240f: Linux 4.12-rc4 (2017-06-04 16:47:43 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.12-rc5 for you to fetch changes up to 6e88007e224ce51969ccf9afeec645146c638816: Merge branch 'vmwgfx-fixes-4.12' of git://people.freedesktop.org/~thomash/linux into drm-fixes (2017-06-09 13:12:02 +1000) ---------------------------------------------------------------- intel, nouveau, rockchip, vmwgfx, imx, meson, mediatek and core fixes ---------------------------------------------------------------- Ben Skeggs (3): drm/nouveau: replace multiple open-coded runpm support checks with function drm/nouveau: enable autosuspend only when it'll actually be used drm/nouveau/tmr: fully separate alarm execution/pending lists Chris Wilson (4): drm/i915: Short-circuit i915_gem_wait_for_idle() if already idle drm/i915: Hold a wakeref for probing the ring registers drm/i915: Guard against i915_ggtt_disable_guc() being invoked unconditionally drm/i915: Fix logical inversion for gen4 quirking Colin Ian King (1): drm/vmwgfx: fix spelling mistake "exeeds" -> "exceeds" Dan Carpenter (2): drm/mediatek: fix a timeout loop drm/vmwgfx: Handle vmalloc() failure in vmw_local_fifo_reserve() Daniel Vetter (1): drm: Fix locking in drm_atomic_helper_resume Dave Airlie (7): Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-fixes Merge tag 'drm-misc-fixes-2017-06-02' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes Merge tag 'imx-drm-fixes-2017-06-08' of git://git.pengutronix.de/git/pza/linux into drm-fixes Merge branch 'mediatek-drm-fixes-4.12-rc1' of https://github.com/ckhu-mediatek/linux.git-tags into drm-fixes Merge tag 'drm-misc-fixes-2017-06-07' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2017-06-08' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes Merge branch 'vmwgfx-fixes-4.12' of git://people.freedesktop.org/~thomash/linux into drm-fixes Gustavo A. R. Silva (1): drm/nouveau/kms/nv50: add null check before pointer dereference Hans de Goede (1): drm: Fix oops + Xserver hang when unplugging USB drm devices Imre Deak (1): drm/i915: Prevent the system suspend complete optimization Jani Nikula (1): drm/i915: fix warning for unused variable John Stultz (1): drm: kirin: Fix drm_of_find_panel_or_bridge conversion Jon Bloomfield (1): drm/i915: Serialize GTT/Aperture accesses on BXT Kai Chen (1): drm/i915: Disable decoupled MMIO Leonard Crestez (1): drm/imx: imx-ldb: Accept drm_of_find_panel_or_bridge failure Lucas Stach (1): gpu: ipu-v3: pre: only use internal clock gating Maarten Lankhorst (1): drm/i915: Always recompute watermarks when distrust_bios_wm is set, v2. Marek Vasut (1): gpu: ipu-v3: Fix CSI selection for VDIC Mark yao (1): drm/rockchip: Correct vop out_mode configure Michal Wajdeczko (1): drm/i915/guc: Remove stale comment for q_fail Nagaraju, Vathsala (1): drm/i915/psr: disable psr2 for resolution greater than 32X20 Neil Armstrong (1): drm/meson: Fix driver bind when only CVBS is available Sinclair Yeh (5): drm/vmwgfx: Don't create proxy surface for cursor drm/vmwgfx: Make sure backup_handle is always valid drm/vmwgfx: Make sure to update STDU when FB is updated drm/vmwgfx: Fix large topology crash drm/vmwgfx: Remove unused legacy cursor functions Thomas Hellstrom (1): drm/vmwgfx: Bump driver minor and date Ville Syrjälä (3): drm/i915: Workaround VLV/CHV DSI scanline counter hardware fail drm/i915: Restore has_fbc=1 for ILK-M drm/i915: Fix 90/270 rotated coordinates for FBC Vladis Dronov (1): drm/vmwgfx: limit the number of mip levels in vmw_gb_surface_define_ioctl() YYS (1): drm/mediatek: fix mtk_hdmi_setup_vendor_specific_infoframe mistake drivers/gpu/drm/drm_atomic_helper.c | 11 ++ drivers/gpu/drm/drm_drv.c | 7 +- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 9 ++ drivers/gpu/drm/i915/i915_drv.h | 10 ++ drivers/gpu/drm/i915/i915_gem.c | 4 + drivers/gpu/drm/i915/i915_gem_gtt.c | 106 ++++++++++++++++++- drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- drivers/gpu/drm/i915/i915_pci.c | 3 +- drivers/gpu/drm/i915/intel_display.c | 9 ++ drivers/gpu/drm/i915/intel_engine_cs.c | 20 +++- drivers/gpu/drm/i915/intel_fbc.c | 19 ++-- drivers/gpu/drm/i915/intel_pm.c | 9 ++ drivers/gpu/drm/i915/intel_psr.c | 5 +- drivers/gpu/drm/i915/intel_sprite.c | 21 ++++ drivers/gpu/drm/i915/intel_uc.h | 2 - drivers/gpu/drm/imx/imx-ldb.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 15 ++- drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- drivers/gpu/drm/meson/meson_drv.c | 20 +++- .../gpu/drm/nouveau/include/nvkm/subdev/timer.h | 1 + drivers/gpu/drm/nouveau/nouveau_drm.c | 38 +++---- drivers/gpu/drm/nouveau/nouveau_drv.h | 3 +- drivers/gpu/drm/nouveau/nouveau_vga.c | 13 +-- drivers/gpu/drm/nouveau/nv50_display.c | 3 +- drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c | 7 +- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 12 --- drivers/gpu/drm/rockchip/cdn-dp-core.c | 9 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 ++ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 3 + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 115 +-------------------- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 15 --- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 27 ++++- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 23 +++-- drivers/gpu/ipu-v3/ipu-common.c | 15 +-- drivers/gpu/ipu-v3/ipu-pre.c | 13 +-- 39 files changed, 334 insertions(+), 257 deletions(-)

1 0

[lkp-robot] [drm] e1f8a89c4f: pft.faults_per_sec_per_cpu -77.9% regression
by kernel test robot 09 Jun '17

09 Jun '17

Greeting, FYI, we noticed a -77.9% regression of pft.faults_per_sec_per_cpu due to commit: commit: e1f8a89c4f33f5b32cfb047f07fdf6d38cda854a ("drm: introduce sync objects (v4)") git://people.freedesktop.org/~airlied/linux.git drm-syncobj-sem in testcase: pft on test machine: qemu-system-x86_64 -enable-kvm -cpu Penryn -smp 4 -m 2G with following parameters: iterations: 20x test-description: Pft is the page fault test micro benchmark. test-url: https://github.com/gormanm/pft Details are as below: --------------------------------------------------------------------------------------------------> To reproduce: git clone https://github.com/01org/lkp-tests.git cd lkp-tests bin/lkp qemu -k <bzImage> job-script # job-script is attached in this email testcase/path_params/tbox_group/run: pft/20x/vm-vp-2G v4.12-rc2 e1f8a89c4f33f5b32cfb047f07 ---------------- -------------------------- %stddev %change %stddev \ | \ 878620 ± 15% -77.9% 194209 ± 12% pft.faults_per_sec_per_cpu 7.16 ± 23% +257.2% 25.58 ± 12% pft.time.elapsed_time 7.16 ± 23% +257.2% 25.58 ± 12% pft.time.elapsed_time.max 1223 ± 10% +199.9% 3667 ± 15% pft.time.involuntary_context_switches 61828 ± 2% +10106.0% 6310202 ± 0% pft.time.minor_page_faults 145.40 ± 3% +20.6% 175.33 ± 5% pft.time.percent_of_cpu_this_job_got 9.37 ± 22% +345.2% 41.72 ± 15% pft.time.system_time 5.04 ± 11% -45.6% 2.74 ± 9% mpstat.cpu.usr% 131734 ± 12% +20.3% 158487 ± 5% softirqs.TIMER 1335 ± 11% +105.1% 2738 ± 19% vmstat.system.cs 5390 ± 4% -27.6% 3904 ± 38% slabinfo.kmalloc-96.active_objs 5420 ± 3% -21.5% 4252 ± 27% slabinfo.kmalloc-96.num_objs 68.30 ±209% +13218.2% 9096 ± 84% latency_stats.max.pipe_read.__vfs_read.vfs_read.SyS_read.entry_SYSCALL_64_fastpath 588552 ± 32% -74.2% 151873 ± 37% latency_stats.sum.ep_poll.SyS_epoll_wait.do_syscall_64.return_from_SYSCALL_64 74.20 ±203% +12326.8% 9220 ± 82% latency_stats.sum.pipe_read.__vfs_read.vfs_read.SyS_read.entry_SYSCALL_64_fastpath 160550 ± 14% -100.0% 0.00 ± -1% meminfo.AnonHugePages 204792 ± 0% -100.0% 0.00 ± -1% meminfo.CmaFree 204800 ± 0% -100.0% 0.00 ± -1% meminfo.CmaTotal 3041 ± 0% +13.4% 3449 ± 0% meminfo.KernelStack 51198 ± 0% -100.0% 0.00 ± -1% proc-vmstat.nr_free_cma 3033 ± 1% +13.6% 3446 ± 0% proc-vmstat.nr_kernel_stack 73394 ± 9% +8258.9% 6134982 ± 2% proc-vmstat.numa_hit 73394 ± 9% +8258.9% 6134982 ± 2% proc-vmstat.numa_local 67006 ± 9% +9043.7% 6126912 ± 2% proc-vmstat.pgfault 11161 ± 7% -100.0% 0.00 ± -1% proc-vmstat.thp_deferred_split_page 11217 ± 7% -100.0% 0.00 ± -1% proc-vmstat.thp_fault_alloc 7.16 ± 23% +257.2% 25.58 ± 12% time.elapsed_time 7.16 ± 23% +257.2% 25.58 ± 12% time.elapsed_time.max 1223 ± 10% +199.9% 3667 ± 15% time.involuntary_context_switches 61828 ± 2% +10106.0% 6310202 ± 0% time.minor_page_faults pft.faults_per_sec_per_cpu 1e+06 ++--------------------------------------*--------------------------+ 900000 ++ *.. .. | | * : .. | 800000 ++ : : : ...* | 700000 ++ ...* : : : *... | *... : : : : | 600000 ++ : : : : | 500000 ++ : : : : | 400000 ++ : : : : | | : : : : | 300000 ++ : : : : | 200000 O+ O : O : O : O : O O O | : : : : O O | 100000 ++ : : : : | 0 ++-----------*-------------*-------------------O-------------------+ [*] bisect-good sample [O] bisect-bad sample Disclaimer: Results have been estimated based on internal Intel analysis and are provided for informational purposes only. Any difference in system hardware or software design or configuration may affect actual performance. Thanks, Xiaolong

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2017