DRM GPUVA Manager & Nouveau VM_BIND UAPI
Subsystems (6)
v3 cover DRM GPUVA Manager & Nouveau VM_BIND UAPI
This patch series provides a new UAPI for the Nouveau driver in order to support Vulkan features, such as sparse bindings and sparse residency.
Furthermore, with the DRM GPUVA manager it provides a new DRM core feature to keep track of GPU virtual address (VA) mappings in a more generic way.
The DRM GPUVA manager is indented to help drivers implement userspace-manageable GPU VA spaces in reference to the Vulkan API. In order to achieve this goal it serves the following purposes in this context.
1) Provide infrastructure to track GPU VA allocations and mappings, making use of the maple_tree.
2) Generically connect GPU VA mappings to their backing buffers, in particular DRM GEM objects.
3) Provide a common implementation to perform more complex mapping operations on the GPU VA space. In particular splitting and merging of GPU VA mappings, e.g. for intersecting mapping requests or partial unmap requests.
The new VM_BIND Nouveau UAPI build on top of the DRM GPUVA manager, itself providing the following new interfaces.
1) Initialize a GPU VA space via the new DRM_IOCTL_NOUVEAU_VM_INIT ioctl for UMDs to specify the portion of VA space managed by the kernel and userspace, respectively.
2) Allocate and free a VA space region as well as bind and unbind memory to the GPUs VA space via the new DRM_IOCTL_NOUVEAU_VM_BIND ioctl.
3) Execute push buffers with the new DRM_IOCTL_NOUVEAU_EXEC ioctl.
Both, DRM_IOCTL_NOUVEAU_VM_BIND and DRM_IOCTL_NOUVEAU_EXEC, make use of the DRM scheduler to queue jobs and support asynchronous processing with DRM syncobjs as synchronization mechanism.
By default DRM_IOCTL_NOUVEAU_VM_BIND does synchronous processing, DRM_IOCTL_NOUVEAU_EXEC supports asynchronous processing only.
The new VM_BIND UAPI for Nouveau makes also use of drm_exec (execution context for GEM buffers) by Christian König. Since the patch implementing drm_exec was not yet merged into drm-next it is part of this series, as well as a small fix for this patch, which was found while testing this series.
This patch series is also available at [1].
There is a Mesa NVK merge request by Dave Airlie [2] implementing the corresponding userspace parts for this series.
The Vulkan CTS test suite passes the sparse binding and sparse residency test cases for the new UAPI together with Dave's Mesa work.
There are also some test cases in the igt-gpu-tools project [3] for the new UAPI and hence the DRM GPU VA manager. However, most of them are testing the DRM GPU VA manager's logic through Nouveau's new UAPI and should be considered just as helper for implementation.
However, I absolutely intend to change those test cases to proper kunit test cases for the DRM GPUVA manager, once and if we agree on it's usefulness and design.
[1] https://gitlab.freedesktop.org/nouvelles/kernel/-/tree/new-uapi-drm-next /
https://gitlab.freedesktop.org/nouvelles/kernel/-/merge_requests/1
[2] https://gitlab.freedesktop.org/nouveau/mesa/-/merge_requests/150/
[3] https://gitlab.freedesktop.org/dakr/igt-gpu-tools/-/tree/wip_nouveau_vm_bind
Changes in V2:
==============
Nouveau:
- Reworked the Nouveau VM_BIND UAPI to avoid memory allocations in fence signalling critical sections. Updates to the VA space are split up in three separate stages, where only the 2. stage executes in a fence signalling critical section:
1. update the VA space, allocate new structures and page tables
2. (un-)map the requested memory bindings
3. free structures and page tables
- Separated generic job scheduler code from specific job implementations.
- Separated the EXEC and VM_BIND implementation of the UAPI.
- Reworked the locking parts of the nvkm/vmm RAW interface, such that (un-)map operations can be executed in fence signalling critical sections.
GPUVA Manager:
- made drm_gpuva_regions optional for users of the GPUVA manager
- allow NULL GEMs for drm_gpuva entries
- swichted from drm_mm to maple_tree for track drm_gpuva / drm_gpuva_region entries
- provide callbacks for users to allocate custom drm_gpuva_op structures to allow inheritance
- added user bits to drm_gpuva_flags
- added a prefetch operation type in order to support generating prefetch operations in the same way other operations generated
- hand the responsibility for mutual exclusion for a GEM's drm_gpuva list to the user; simplified corresponding (un-)link functions
Maple Tree:
- I added two maple tree patches to the series, one to support custom tree walk macros and one to hand the locking responsibility to the user of the GPUVA manager without pre-defined lockdep checks.
Changes in V3:
==============
Nouveau:
- Reworked the Nouveau VM_BIND UAPI to do the job cleanup (including page table cleanup) within a workqueue rather than the job_free() callback of the scheduler itself. A job_free() callback can stall the execution (run() callback) of the next job in the queue. Since the page table cleanup requires to take the same locks as need to be taken for page table allocation, doing it directly in the job_free() callback would still violate the fence signalling critical path.
- Separated Nouveau fence allocation and emit, such that we do not violate the fence signalling critical path in EXEC jobs.
- Implement "regions" (for handling sparse mappings through PDEs and dual page tables) within Nouveau.
- Drop the requirement for every mapping to be contained within a region.
- Add necassary synchronization of VM_BIND job operation sequences in order to work around limitations in page table handling. This will be addressed in a future re-work of Nouveau's page table handling.
- Fixed a couple of race conditions found through more testing. Thanks to Dave for consitently trying to break it. :-)
GPUVA Manager:
- Implement pre-allocation capabilities for tree modifications within fence signalling critical sections.
- Implement accessors to to apply tree modification while walking the GPUVA tree in order to actually support processing of drm_gpuva_ops through callbacks in fence signalling critical sections rather than through pre-allocated operation lists.
- Remove merging of GPUVAs; the kernel has limited to none knowlege about the semantics of mapping sequences. Hence, merging is purely speculative. It seems that gaining a significant (or at least a measurable) performance increase through merging is way more likely to happen when userspace is responsible for merging mappings up to the next larger page size if possible.
- Since merging was removed, regions pretty much loose their right to exist. They might still be useful for handling dual page tables or similar mechanisms, but since Nouveau seems to be the only driver having a need for this for now, regions were removed from the GPUVA manager.
- Fixed a couple of maple_tree related issues; thanks to Liam for helping me out.
TODO
====
Maple Tree:
- Maple tree uses the 'unsinged long' type for node entries. While this works for 64bit, it's incompatible with the DRM GPUVA Manager on 32bit, since the DRM GPUVA Manager uses the u64 type and so do drivers using it. While it's questionable whether a 32bit kernel and a > 32bit GPU address space make any sense, it creates tons of compiler warnings when compiling for 32bit. Maybe it makes sense to expand the maple tree API to let users decide which size to pick - other ideas / proposals are welcome.
Christian König (1):
drm: execution context for GEM buffers v3
Danilo Krummrich (14):
drm_exec: fix double dma_resv unlock
maple_tree: split up MA_STATE() macro
drm: manager to keep track of GPUs VA mappings
drm: debugfs: provide infrastructure to dump a DRM GPU VA space drm/nouveau: new VM_BIND uapi interfaces
drm/nouveau: get vmm via nouveau_cli_vmm() drm/nouveau: bo: initialize GEM GPU VA interface drm/nouveau: move usercopy helpers to nouveau_drv.h drm/nouveau: fence: separate fence alloc and emit drm/nouveau: fence: fail to emit when fence context is killed drm/nouveau: chan: provide nouveau_channel_kill() drm/nouveau: nvkm/vmm: implement raw ops to manage uvmm drm/nouveau: implement new VM_BIND uAPI
drm/nouveau: debugfs: implement DRM GPU VA debugfs
Documentation/gpu/driver-uapi.rst | 11 + Documentation/gpu/drm-mm.rst | 43 + drivers/gpu/drm/Kconfig | 6 + drivers/gpu/drm/Makefile | 3 + drivers/gpu/drm/drm_debugfs.c | 41 + drivers/gpu/drm/drm_exec.c | 248 +++ drivers/gpu/drm/drm_gem.c | 3 + drivers/gpu/drm/drm_gpuva_mgr.c | 1686 +++++++++++++++ drivers/gpu/drm/nouveau/Kbuild | 3 + drivers/gpu/drm/nouveau/Kconfig | 2 + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 9 +- drivers/gpu/drm/nouveau/include/nvif/if000c.h | 26 +- drivers/gpu/drm/nouveau/include/nvif/vmm.h | 19 +- .../gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 20 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 24 + drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 + drivers/gpu/drm/nouveau/nouveau_bo.c | 204 +- drivers/gpu/drm/nouveau/nouveau_bo.h | 2 +- drivers/gpu/drm/nouveau/nouveau_chan.c | 22 +- drivers/gpu/drm/nouveau/nouveau_chan.h | 1 + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 39 + drivers/gpu/drm/nouveau/nouveau_dmem.c | 9 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 27 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 94 +- drivers/gpu/drm/nouveau/nouveau_exec.c | 363 ++++ drivers/gpu/drm/nouveau/nouveau_exec.h | 42 + drivers/gpu/drm/nouveau/nouveau_fence.c | 23 +- drivers/gpu/drm/nouveau/nouveau_fence.h | 5 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 62 +- drivers/gpu/drm/nouveau/nouveau_mem.h | 5 + drivers/gpu/drm/nouveau/nouveau_prime.c | 2 +- drivers/gpu/drm/nouveau/nouveau_sched.c | 494 +++++ drivers/gpu/drm/nouveau/nouveau_sched.h | 116 ++ drivers/gpu/drm/nouveau/nouveau_svm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_uvmm.c | 1836 +++++++++++++++++ drivers/gpu/drm/nouveau/nouveau_uvmm.h | 98 + drivers/gpu/drm/nouveau/nouveau_vmm.c | 4 +- drivers/gpu/drm/nouveau/nvif/vmm.c | 100 +- .../gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 213 +- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 197 +- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 25 + .../drm/nouveau/nvkm/subdev/mmu/vmmgf100.c | 16 +- .../drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 16 +- .../gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c | 27 +- include/drm/drm_debugfs.h | 25 + include/drm/drm_drv.h | 6 + include/drm/drm_exec.h | 115 ++ include/drm/drm_gem.h | 75 + include/drm/drm_gpuva_mgr.h | 681 ++++++ include/linux/maple_tree.h | 7 +- include/uapi/drm/nouveau_drm.h | 209 ++ 51 files changed, 7065 insertions(+), 242 deletions(-) create mode 100644 drivers/gpu/drm/drm_exec.c create mode 100644 drivers/gpu/drm/drm_gpuva_mgr.c create mode 100644 drivers/gpu/drm/nouveau/nouveau_exec.c create mode 100644 drivers/gpu/drm/nouveau/nouveau_exec.h create mode 100644 drivers/gpu/drm/nouveau/nouveau_sched.c create mode 100644 drivers/gpu/drm/nouveau/nouveau_sched.h create mode 100644 drivers/gpu/drm/nouveau/nouveau_uvmm.c create mode 100644 drivers/gpu/drm/nouveau/nouveau_uvmm.h create mode 100644 include/drm/drm_exec.h create mode 100644 include/drm/drm_gpuva_mgr.h
base-commit: d36d68fd1925d33066d52468b7c7c6aca6521248
Signature · 1 line
2.39.2
PATCH v3 1/15 drm: execution context for GEM buffers v3
From: Christian König <[email protected]>
This adds the infrastructure for an execution context for GEM buffers which is similar to the existinc TTMs execbuf util and intended to replace it in the long term.
The basic functionality is that we abstracts the necessary loop to lock many different GEM buffers with automated deadlock and duplicate handling.
v2: drop xarray and use dynamic resized array instead, the locking
overhead is unecessary and measureable.
v3: drop duplicate tracking, radeon is really the only one needing that.
--- Documentation/gpu/drm-mm.rst | 12 ++ drivers/gpu/drm/Kconfig | 6 + drivers/gpu/drm/Makefile | 2 + drivers/gpu/drm/drm_exec.c | 249 +++++++++++++++++++++++++++++++++++ include/drm/drm_exec.h | 115 ++++++++++++++++ 5 files changed, 384 insertions(+) create mode 100644 drivers/gpu/drm/drm_exec.c create mode 100644 include/drm/drm_exec.h
Documentation/gpu/drm-mm.rst +12 -0
@@ -493,6 +493,18 @@ DRM Sync Objects .. kernel-doc:: drivers/gpu/drm/drm_syncobj.c :export: +DRM Execution context +===================== + +.. kernel-doc:: drivers/gpu/drm/drm_exec.c + :doc: Overview + +.. kernel-doc:: include/drm/drm_exec.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_exec.c + :export: + GPU Scheduler =============
drivers/gpu/drm/Kconfig +6 -0
@@ -201,6 +201,12 @@ config DRM_TTM GPU memory types. Will be enabled automatically if a device driver uses it. +config DRM_EXEC + tristate + depends on DRM + help + Execution context for command submissions + config DRM_BUDDY tristate depends on DRM
drivers/gpu/drm/Makefile +2 -0
@@ -78,6 +78,8 @@ obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o # # Memory-management helpers # +# +obj-$(CONFIG_DRM_EXEC) += drm_exec.o obj-$(CONFIG_DRM_BUDDY) += drm_buddy.o
drivers/gpu/drm/drm_exec.c new file +249 -0
249 lines not on this page · raw message
include/drm/drm_exec.h new file +115 -0
115 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH v3 2/15 drm_exec: fix double dma_resv unlock
In reply to Danilo Krummrich--- drivers/gpu/drm/drm_exec.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/drm_exec.c +0 -1
@@ -62,7 +62,6 @@ static void drm_exec_unlock_all(struct drm_exec *exec) }if (exec->prelocked) { -dma_resv_unlock (exec->prelocked->resv);drm_gem_object_put (exec->prelocked); exec->prelocked =NULL ; }
Signature · 1 line
2.39.2
PATCH v3 3/15 maple_tree: split up MA_STATE() macro
In reply to Danilo KrummrichSplit up the MA_STATE() macro such that components using the maple tree can easily inherit from struct ma_state and build custom tree walk macros to hide their internals from users.
Example:
struct sample_iterator {
struct ma_state mas;
struct sample_mgr *mgr;
};\#define SAMPLE_ITERATOR(name, __mgr, start) \
struct sample_iterator name = { \
.mas = MA_STATE_INIT(&(__mgr)->mt, start, 0), \
.mgr = __mgr, \
}\#define sample_iter_for_each_range(it__, entry__, end__) \ mas_for_each(&(it__).mas, entry__, end__)
--
struct sample *sample;SAMPLE_ITERATOR(si, min);
sample_iter_for_each_range(&si, sample, max) {
frob(mgr, sample);
}--- include/linux/maple_tree.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
include/linux/maple_tree.h +5 -2
@@ -423,8 +423,8 @@ struct ma_wr_state {#define MA_ERROR (err) \ ((struct maple_enode *)(((unsigned long)err << 2) | 2UL)) -#define MA_STATE (name, mt, first, end) \ - struct ma_state name = { \ +#define MA_STATE_INIT (mt, first, end) \ + { \ .tree = mt, \ .index = first, \ .last = end, \
@@ -435,6 +435,9 @@ struct ma_wr_state { .mas_flags = 0, \ } +#define MA_STATE (name, mt, first, end) \ + struct ma_state name = MA_STATE_INIT(mt, first, end) +#define MA_WR_STATE (name, ma_state, wr_entry) \ struct ma_wr_state name = { \ .mas = ma_state, \
Signature · 1 line
2.39.2
PATCH v3 4/15 drm: manager to keep track of GPUs VA mappings
In reply to Danilo KrummrichAdd infrastructure to keep track of GPU virtual address (VA) mappings with a decicated VA space manager implementation.
New UAPIs, motivated by Vulkan sparse memory bindings graphics drivers start implementing, allow userspace applications to request multiple and arbitrary GPU VA mappings of buffer objects. The DRM GPU VA manager is intended to serve the following purposes in this context.
1) Provide infrastructure to track GPU VA allocations and mappings, making use of the maple_tree.
2) Generically connect GPU VA mappings to their backing buffers, in particular DRM GEM objects.
3) Provide a common implementation to perform more complex mapping operations on the GPU VA space. In particular splitting and merging of GPU VA mappings, e.g. for intersecting mapping requests or partial unmap requests.
--- Documentation/gpu/drm-mm.rst | 31 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_gem.c | 3 + drivers/gpu/drm/drm_gpuva_mgr.c | 1686 +++++++++++++++++++++++++++++++ include/drm/drm_drv.h | 6 + include/drm/drm_gem.h | 75 ++ include/drm/drm_gpuva_mgr.h | 681 +++++++++++++ 7 files changed, 2483 insertions(+) create mode 100644 drivers/gpu/drm/drm_gpuva_mgr.c create mode 100644 include/drm/drm_gpuva_mgr.h
Documentation/gpu/drm-mm.rst +31 -0
@@ -466,6 +466,37 @@ DRM MM Range Allocator Function References .. kernel-doc:: drivers/gpu/drm/drm_mm.c :export: +DRM GPU VA Manager +================== + +Overview +-------- + +.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c + :doc: Overview + +Split and Merge +--------------- + +.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c + :doc: Split and Merge + +Locking +------- + +.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c + :doc: Locking + + +DRM GPU VA Manager Function References +-------------------------------------- + +.. kernel-doc:: include/drm/drm_gpuva_mgr.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_gpuva_mgr.c + :export: + DRM Buddy Allocator ===================
drivers/gpu/drm/Makefile +1 -0
@@ -45,6 +45,7 @@ drm-y := \ drm_vblank.o \ drm_vblank_work.o \ drm_vma_manager.o \ + drm_gpuva_mgr.o \ drm_writeback.o drm-$(CONFIG_DRM_LEGACY) += \ drm_agpsupport.o \
drivers/gpu/drm/drm_gem.c +3 -0
@@ -164,6 +164,9 @@ void drm_gem_private_object_init(struct drm_device *dev,if (!obj->resv) obj->resv = &obj->_resv; +if (drm_core_check_feature (dev,DRIVER_GEM_GPUVA )) +drm_gem_gpuva_init (obj); +drm_vma_node_reset (&obj->vma_node);INIT_LIST_HEAD (&obj->lru_node); }
drivers/gpu/drm/drm_gpuva_mgr.c new file +1686 -0
1,686 lines not on this page · raw message
include/drm/drm_drv.h +6 -0
@@ -104,6 +104,12 @@ enum drm_driver_feature {* acceleration should be handled by two drivers that are connected using auxiliary bus. */ DRIVER_COMPUTE_ACCEL =BIT (7 ), +/** +* @DRIVER_GEM_GPUVA: +* +* Driver supports user defined GPU VA bindings for GEM objects. +*/ + DRIVER_GEM_GPUVA = BIT(8),/* IMPORTANT: Below are all the legacy flags, add new ones above. */
include/drm/drm_gem.h +75 -0
91 lines not on this page · raw message
include/drm/drm_gpuva_mgr.h new file +681 -0
681 lines not on this page · raw message
Signature · 1 line
2.39.2
kernel test robot
build botRe: [PATCH drm-next v3 04/15] drm: manager to keep track of GPUs VA mappings
kernel test robot noticed the following build warnings:
Hi Danilo,
kernel test robot noticed the following build warnings:
[auto build test WARNING on d36d68fd1925d33066d52468b7c7c6aca6521248]
url: https://github.com/intel-lab-lkp/linux/commits/Danilo-Krummrich/drm-execution-context-for-GEM-buffers-v3/20230404-093042 base: d36d68fd1925d33066d52468b7c7c6aca6521248 patch link: https://lore.kernel.org/r/20230404012741.116502-5-dakr%40redhat.com patch subject: [PATCH drm-next v3 04/15] drm: manager to keep track of GPUs VA mappings config: mips-randconfig-r024-20230403 (https://download.01.org/0day-ci/archive/20230404/[email protected]/config) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project 67409911353323ca5edf2049ef0df54132fa1ca7)
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 mips cross compiling tool for clang build
# apt-get install binutils-mipsel-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/c25139e5a168ae8a3a3e5ca0b650c201e5f41367
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Danilo-Krummrich/drm-execution-context-for-GEM-buffers-v3/20230404-093042
git checkout c25139e5a168ae8a3a3e5ca0b650c201e5f41367
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=mips olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=mips SHELL=/bin/bash drivers/gpu/drm/ drivers/iio/light/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/drm_gpuva_mgr.c:1031:25: warning: variable 'prev' set but not used [-Wunused-but-set-variable]
struct drm_gpuva *va, *prev = NULL;
^1 warning generated.
vim +/prev +1031 drivers/gpu/drm/drm_gpuva_mgr.c
1023
1024 static int
1025 __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,
1026 struct drm_gpuva_fn_ops *ops, void *priv,
1027 u64 req_addr, u64 req_range,
1028 struct drm_gem_object *req_obj, u64 req_offset)
1029 {
1030 DRM_GPUVA_ITER(it, mgr, req_addr);
> 1031 struct drm_gpuva *va, *prev = NULL; 1032 u64 req_end = req_addr + req_range;
1033 int ret;
1034
1035 if (unlikely(!drm_gpuva_in_mm_range(mgr, req_addr, req_range)))
1036 return -EINVAL;
1037
1038 if (unlikely(drm_gpuva_in_kernel_node(mgr, req_addr, req_range)))
1039 return -EINVAL;
1040
1041 drm_gpuva_iter_for_each_range(va, it, req_end) {
1042 struct drm_gem_object *obj = va->gem.obj;
1043 u64 offset = va->gem.offset;
1044 u64 addr = va->va.addr;
1045 u64 range = va->va.range;
1046 u64 end = addr + range;
1047 bool merge = !!va->gem.obj;
1048
1049 if (addr == req_addr) {
1050 merge &= obj == req_obj &&
1051 offset == req_offset;
1052
1053 if (end == req_end) {
1054 ret = op_unmap_cb(ops, &it, priv, va, merge);
1055 if (ret)
1056 return ret;
1057 break;
1058 }
1059
1060 if (end < req_end) {
1061 ret = op_unmap_cb(ops, &it, priv, va, merge);
1062 if (ret)
1063 return ret;
1064 goto next;
1065 }
1066
1067 if (end > req_end) {
1068 struct drm_gpuva_op_map n = {
1069 .va.addr = req_end,
1070 .va.range = range - req_range,
1071 .gem.obj = obj,
1072 .gem.offset = offset + req_range,
1073 };
1074 struct drm_gpuva_op_unmap u = {
1075 .va = va,
1076 .keep = merge,
1077 };
1078
1079 ret = op_remap_cb(ops, &it, priv, NULL, &n, &u);
1080 if (ret)
1081 return ret;
1082 break;
1083 }
1084 } else if (addr < req_addr) {
1085 u64 ls_range = req_addr - addr;
1086 struct drm_gpuva_op_map p = {
1087 .va.addr = addr,
1088 .va.range = ls_range,
1089 .gem.obj = obj,
1090 .gem.offset = offset,
1091 };
1092 struct drm_gpuva_op_unmap u = { .va = va };
1093
1094 merge &= obj == req_obj &&
1095 offset + ls_range == req_offset;
1096 u.keep = merge;
1097
1098 if (end == req_end) {
1099 ret = op_remap_cb(ops, &it, priv, &p, NULL, &u);
1100 if (ret)
1101 return ret;
1102 break;
1103 }
1104
1105 if (end < req_end) {
1106 ret = op_remap_cb(ops, &it, priv, &p, NULL, &u);
1107 if (ret)
1108 return ret;
1109 goto next;
1110 }
1111
1112 if (end > req_end) {
1113 struct drm_gpuva_op_map n = {
1114 .va.addr = req_end,
1115 .va.range = end - req_end,
1116 .gem.obj = obj,
1117 .gem.offset = offset + ls_range +
1118 req_range,
1119 };
1120
1121 ret = op_remap_cb(ops, &it, priv, &p, &n, &u);
1122 if (ret)
1123 return ret;
1124 break;
1125 }
1126 } else if (addr > req_addr) {
1127 merge &= obj == req_obj &&
1128 offset == req_offset +
1129 (addr - req_addr);
1130
1131 if (end == req_end) {
1132 ret = op_unmap_cb(ops, &it, priv, va, merge);
1133 if (ret)
1134 return ret;
1135 break;
1136 }
1137
1138 if (end < req_end) {
1139 ret = op_unmap_cb(ops, &it, priv, va, merge);
1140 if (ret)
1141 return ret;
1142 goto next;
1143 }
1144
1145 if (end > req_end) {
1146 struct drm_gpuva_op_map n = {
1147 .va.addr = req_end,
1148 .va.range = end - req_end,
1149 .gem.obj = obj,
1150 .gem.offset = offset + req_end - addr,
1151 };
1152 struct drm_gpuva_op_unmap u = {
1153 .va = va,
1154 .keep = merge,
1155 };
1156
1157 ret = op_remap_cb(ops, &it, priv, NULL, &n, &u);
1158 if (ret)
1159 return ret;
1160 break;
1161 }
1162 }
1163 next:
1164 prev = va;
1165 }
1166
1167 return op_map_cb(ops, priv,
1168 req_addr, req_range,
1169 req_obj, req_offset);
1170 }
1171
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
Re: [PATCH drm-next v3 04/15] drm: manager to keep track of GPUs VA mappings
In reply to Danilo KrummrichQuoted 6 lines · On Tue, 4 Apr 2023 03:27:30 +0200 Danilo Krummrich <[email protected]> wrote:
drivers/gpu/drm/drm_gpuva_mgr.c new file +6
-0+/** +* drm_gpuva_prealloc_create - creates a preallocated node to store a +* &drm_gpuva entry. +* +* Returns: the &drm_gpuva_prealloc object on success, NULL on failure +*/
drivers/gpu/drm/drm_gpuva_mgr.c line 537
Quoted 10 lines
drivers/gpu/drm/drm_gpuva_mgr.c new file +10
-0+struct drm_gpuva_prealloc * +drm_gpuva_prealloc_create (void ) +{ +struct drm_gpuva_prealloc *pa; + + pa =kzalloc (sizeof (*pa),GFP_KERNEL ); +if (!pa) +return NULL ; + +if (mas_preallocate (&pa->mas,GFP_KERNEL )) {
mas_preallocate() needs a valid tree field to calculate the number of nodes to pre-allocate. I guess we're missing a MA_STATE_INIT() here, and we need to pass a gpuva_mgr object to this helper.
Quoted 7 lines
drivers/gpu/drm/drm_gpuva_mgr.c new file +7
-0+kfree (pa); +return NULL ; + } + +return pa; +} +EXPORT_SYMBOL (drm_gpuva_prealloc_create);
Re: [PATCH drm-next v3 04/15] drm: manager to keep track of GPUs VA mappings
In reply to Danilo KrummrichQuoted 23 lines · On Tue, 4 Apr 2023 03:27:30 +0200 Danilo Krummrich <[email protected]> wrote:
include/drm/drm_gpuva_mgr.h new file +23
-0+struct drm_gpuva_manager { +/** +* @name: the name of the DRM GPU VA space +*/ +const char *name; + +/** +* @mm_start: start of the VA space +*/ +u64 mm_start; + +/** +* @mm_range: length of the VA space +*/ +u64 mm_range; + +/** +* @mtree: the &maple_tree to track GPU VA mappings +*/ +struct maple_tree mtree; + +/** +* @kernel_alloc_node:
include/drm/drm_gpuva_mgr.h line 203
Quoted 10 lines
include/drm/drm_gpuva_mgr.h new file +10
-0+* +* &drm_gpuva representing the address space cutout reserved for +* the kernel +*/ +struct drm_gpuva kernel_alloc_node; + +/** +* @ops: &drm_gpuva_fn_ops providing the split/merge steps to drivers +*/ +struct drm_gpuva_fn_ops *ops;
Any reason for not making that a const object (same goes for all the functions being passed a drm_gpuva_fn_ops)?
Quoted 1 line
+};
PATCH v3 5/15 drm: debugfs: provide infrastructure to dump a DRM GPU VA space
In reply to Danilo KrummrichThis commit adds a function to dump a DRM GPU VA space and a macro for drivers to register the struct drm_info_list 'gpuvas' entry.
Most likely, most drivers might maintain one DRM GPU VA space per struct drm_file, but there might also be drivers not having a fixed relation between DRM GPU VA spaces and a DRM core infrastructure, hence we need the indirection via the driver iterating it's maintained DRM GPU VA spaces.
--- drivers/gpu/drm/drm_debugfs.c | 41 +++++++++++++++++++++++++++++++++++ include/drm/drm_debugfs.h | 25 +++++++++++++++++++++ 2 files changed, 66 insertions(+)
drivers/gpu/drm/drm_debugfs.c +41 -0
@@ -39,6 +39,7 @@#include <drm/drm_file.h> #include <drm/drm_gem.h> #include <drm/drm_managed.h> +#include <drm/drm_gpuva_mgr.h> #include "drm_crtc_internal.h" #include "drm_internal.h"
@@ -175,6 +176,46 @@ static const struct file_operations drm_debugfs_fops = { .release = single_release, }; +/** +* drm_debugfs_gpuva_info - dump the given DRM GPU VA space +* @m: pointer to the &seq_file to write +* @mgr: the &drm_gpuva_manager representing the GPU VA space +* +* Dumps the GPU VA mappings of a given DRM GPU VA manager. +* +* For each DRM GPU VA space drivers should call this function from their +* &drm_info_list's show callback. +* +* Returns: 0 on success, -ENODEV if the &mgr is not initialized +*/ +int drm_debugfs_gpuva_info (struct seq_file *m, +struct drm_gpuva_manager *mgr) +{ +DRM_GPUVA_ITER (it, mgr,0 ); +struct drm_gpuva *va, *kva = &mgr->kernel_alloc_node; + +if (!mgr->name) +return -ENODEV ; + +seq_printf (m,"DRM GPU VA space (%s) [0x%016llx;0x%016llx]\n" , + mgr->name, mgr->mm_start, mgr->mm_start + mgr->mm_range); +seq_printf (m,"Kernel reserved node [0x%016llx;0x%016llx]\n" , + kva->va.addr, kva->va.addr + kva->va.range); +seq_puts (m,"\n" ); +seq_puts (m," VAs | start | range | end | object | object offset\n" ); +seq_puts (m,"-------------------------------------------------------------------------------------------------------------\n" ); +drm_gpuva_iter_for_each (va, it) { +if (unlikely (va == &mgr->kernel_alloc_node)) +continue ; + +seq_printf (m," | 0x%016llx | 0x%016llx | 0x%016llx | 0x%016llx | 0x%016llx\n" , + va->va.addr, va->va.range, va->va.addr + va->va.range, + (u64 )va->gem.obj, va->gem.offset); + } + +return 0 ; +} +EXPORT_SYMBOL (drm_debugfs_gpuva_info);/** * drm_debugfs_create_files - Initialize a given set of debugfs files for DRM
include/drm/drm_debugfs.h +25 -0
@@ -34,6 +34,22 @@#include <linux/types.h> #include <linux/seq_file.h> + +#include <drm/drm_gpuva_mgr.h> + +/** +* DRM_DEBUGFS_GPUVA_INFO - &drm_info_list entry to dump a GPU VA space +* @show: the &drm_info_list's show callback +* @data: driver private data +* +* Drivers should use this macro to define a &drm_info_list entry to provide a +* debugfs file for dumping the GPU VA space regions and mappings. +* +* For each DRM GPU VA space drivers should call drm_debugfs_gpuva_info() from +* their @show callback. +*/ +#define DRM_DEBUGFS_GPUVA_INFO (show, data) {"gpuvas", show, DRIVER_GEM_GPUVA, data} +/** * struct drm_info_list - debugfs info list entry *
@@ -134,6 +150,9 @@ void drm_debugfs_add_file(struct drm_device *dev, const char *name,void drm_debugfs_add_files (struct drm_device *dev,const struct drm_debugfs_info *files,int count); + +int drm_debugfs_gpuva_info (struct seq_file *m, +struct drm_gpuva_manager *mgr);#else static inline void drm_debugfs_create_files(const struct drm_info_list *files, int count, struct dentry *root,
@@ -155,6 +174,12 @@ static inline void drm_debugfs_add_files(struct drm_device *dev, const struct drm_debugfs_info *files, int count) {} + +static inline int drm_debugfs_gpuva_info (struct seq_file *m, +struct drm_gpuva_manager *mgr) +{ +return 0 ; +}#endif #endif /* _DRM_DEBUGFS_H_ */
Signature · 1 line
2.39.2
kernel test robot
build botRe: [PATCH drm-next v3 05/15] drm: debugfs: provide infrastructure to dump a DRM GPU VA space
kernel test robot noticed the following build warnings:
Hi Danilo,
kernel test robot noticed the following build warnings:
[auto build test WARNING on d36d68fd1925d33066d52468b7c7c6aca6521248]
url: https://github.com/intel-lab-lkp/linux/commits/Danilo-Krummrich/drm-execution-context-for-GEM-buffers-v3/20230404-093042 base: d36d68fd1925d33066d52468b7c7c6aca6521248 patch link: https://lore.kernel.org/r/20230404012741.116502-6-dakr%40redhat.com patch subject: [PATCH drm-next v3 05/15] drm: debugfs: provide infrastructure to dump a DRM GPU VA space config: xtensa-allyesconfig (https://download.01.org/0day-ci/archive/20230404/[email protected]/config) compiler: xtensa-linux-gcc (GCC) 12.1.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/intel-lab-lkp/linux/commit/97d8731cc359143f6f790b1c4755d1055a72adb9
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Danilo-Krummrich/drm-execution-context-for-GEM-buffers-v3/20230404-093042 git checkout 97d8731cc359143f6f790b1c4755d1055a72adb9
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=xtensa olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=xtensa SHELL=/bin/bash drivers/gpu/drm/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
drivers/gpu/drm/drm_debugfs.c: In function 'drm_debugfs_gpuva_info':
>> drivers/gpu/drm/drm_debugfs.c:213:28: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
213 | (u64)va->gem.obj, va->gem.offset);
| ^vim +213 drivers/gpu/drm/drm_debugfs.c
178
179 /**
180 * drm_debugfs_gpuva_info - dump the given DRM GPU VA space
181 * @m: pointer to the &seq_file to write
182 * @mgr: the &drm_gpuva_manager representing the GPU VA space
183 *
184 * Dumps the GPU VA mappings of a given DRM GPU VA manager.
185 *
186 * For each DRM GPU VA space drivers should call this function from their
187 * &drm_info_list's show callback.
188 *
189 * Returns: 0 on success, -ENODEV if the &mgr is not initialized
190 */
191 int drm_debugfs_gpuva_info(struct seq_file *m,
192 struct drm_gpuva_manager *mgr)
193 {
194 DRM_GPUVA_ITER(it, mgr, 0);
195 struct drm_gpuva *va, *kva = &mgr->kernel_alloc_node;
196
197 if (!mgr->name)
198 return -ENODEV;
199
200 seq_printf(m, "DRM GPU VA space (%s) [0x%016llx;0x%016llx]\n",
201 mgr->name, mgr->mm_start, mgr->mm_start + mgr->mm_range);
202 seq_printf(m, "Kernel reserved node [0x%016llx;0x%016llx]\n",
203 kva->va.addr, kva->va.addr + kva->va.range);
204 seq_puts(m, "\n");
205 seq_puts(m, " VAs | start | range | end | object | object offset\n");
206 seq_puts(m, "-------------------------------------------------------------------------------------------------------------\n");
207 drm_gpuva_iter_for_each(va, it) {
208 if (unlikely(va == &mgr->kernel_alloc_node))
209 continue;
210
211 seq_printf(m, " | 0x%016llx | 0x%016llx | 0x%016llx | 0x%016llx | 0x%016llx\n",
212 va->va.addr, va->va.range, va->va.addr + va->va.range,
> 213 (u64)va->gem.obj, va->gem.offset);
214 }
215
216 return 0;
217 }
218 EXPORT_SYMBOL(drm_debugfs_gpuva_info);
219
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
kernel test robot
build botRe: [PATCH drm-next v3 05/15] drm: debugfs: provide infrastructure to dump a DRM GPU VA space
In reply to Danilo Krummrichkernel test robot noticed the following build warnings:
Hi Danilo,
kernel test robot noticed the following build warnings:
[auto build test WARNING on d36d68fd1925d33066d52468b7c7c6aca6521248]
url: https://github.com/intel-lab-lkp/linux/commits/Danilo-Krummrich/drm-execution-context-for-GEM-buffers-v3/20230404-093042 base: d36d68fd1925d33066d52468b7c7c6aca6521248 patch link: https://lore.kernel.org/r/20230404012741.116502-6-dakr%40redhat.com patch subject: [PATCH drm-next v3 05/15] drm: debugfs: provide infrastructure to dump a DRM GPU VA space config: nios2-randconfig-s053-20230403 (https://download.01.org/0day-ci/archive/20230404/[email protected]/config) compiler: nios2-linux-gcc (GCC) 12.1.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.4-39-gce1a6720-dirty
# https://github.com/intel-lab-lkp/linux/commit/97d8731cc359143f6f790b1c4755d1055a72adb9
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Danilo-Krummrich/drm-execution-context-for-GEM-buffers-v3/20230404-093042
git checkout 97d8731cc359143f6f790b1c4755d1055a72adb9
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=nios2 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=nios2 SHELL=/bin/bash drivers/gpu/drm/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/drm_debugfs.c:213:33: sparse: sparse: non size-preserving pointer to integer cast
vim +213 drivers/gpu/drm/drm_debugfs.c
178
179 /**
180 * drm_debugfs_gpuva_info - dump the given DRM GPU VA space
181 * @m: pointer to the &seq_file to write
182 * @mgr: the &drm_gpuva_manager representing the GPU VA space
183 *
184 * Dumps the GPU VA mappings of a given DRM GPU VA manager.
185 *
186 * For each DRM GPU VA space drivers should call this function from their
187 * &drm_info_list's show callback.
188 *
189 * Returns: 0 on success, -ENODEV if the &mgr is not initialized
190 */
191 int drm_debugfs_gpuva_info(struct seq_file *m,
192 struct drm_gpuva_manager *mgr)
193 {
194 DRM_GPUVA_ITER(it, mgr, 0);
195 struct drm_gpuva *va, *kva = &mgr->kernel_alloc_node;
196
197 if (!mgr->name)
198 return -ENODEV;
199
200 seq_printf(m, "DRM GPU VA space (%s) [0x%016llx;0x%016llx]\n",
201 mgr->name, mgr->mm_start, mgr->mm_start + mgr->mm_range);
202 seq_printf(m, "Kernel reserved node [0x%016llx;0x%016llx]\n",
203 kva->va.addr, kva->va.addr + kva->va.range);
204 seq_puts(m, "\n");
205 seq_puts(m, " VAs | start | range | end | object | object offset\n");
206 seq_puts(m, "-------------------------------------------------------------------------------------------------------------\n");
207 drm_gpuva_iter_for_each(va, it) {
208 if (unlikely(va == &mgr->kernel_alloc_node))
209 continue;
210
211 seq_printf(m, " | 0x%016llx | 0x%016llx | 0x%016llx | 0x%016llx | 0x%016llx\n",
212 va->va.addr, va->va.range, va->va.addr + va->va.range,
> 213 (u64)va->gem.obj, va->gem.offset);
214 }
215
216 return 0;
217 }
218 EXPORT_SYMBOL(drm_debugfs_gpuva_info);
219
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
PATCH v3 6/15 drm/nouveau: new VM_BIND uapi interfaces
In reply to Danilo KrummrichThis commit provides the interfaces for the new UAPI motivated by the Vulkan API. It allows user mode drivers (UMDs) to:
1) Initialize a GPU virtual address (VA) space via the new DRM_IOCTL_NOUVEAU_VM_INIT ioctl. UMDs can provide a kernel reserved VA area.
2) Bind and unbind GPU VA space mappings via the new DRM_IOCTL_NOUVEAU_VM_BIND ioctl.
3) Execute push buffers with the new DRM_IOCTL_NOUVEAU_EXEC ioctl.
Both, DRM_IOCTL_NOUVEAU_VM_BIND and DRM_IOCTL_NOUVEAU_EXEC support asynchronous processing with DRM syncobjs as synchronization mechanism.
The default DRM_IOCTL_NOUVEAU_VM_BIND is synchronous processing, DRM_IOCTL_NOUVEAU_EXEC supports asynchronous processing only.
--- Documentation/gpu/driver-uapi.rst | 8 ++ include/uapi/drm/nouveau_drm.h | 209 ++++++++++++++++++++++++++++++ 2 files changed, 217 insertions(+)
Documentation/gpu/driver-uapi.rst +8 -0
@@ -6,3 +6,11 @@ drm/i915 uAPI ============= .. kernel-doc:: include/uapi/drm/i915_drm.h + +drm/nouveau uAPI +================ + +VM_BIND / EXEC uAPI +------------------- + +.. kernel-doc:: include/uapi/drm/nouveau_drm.h
include/uapi/drm/nouveau_drm.h +209 -0
227 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH v3 7/15 drm/nouveau: get vmm via nouveau_cli_vmm()
In reply to Danilo KrummrichProvide a getter function for the client's current vmm context. Since we'll add a new (u)vmm context for UMD bindings in subsequent commits, this will keep the code clean.
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 9 +++++++++ drivers/gpu/drm/nouveau/nouveau_gem.c | 6 +++--- 4 files changed, 14 insertions(+), 5 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +1 -1
@@ -204,7 +204,7 @@ nouveau_bo_alloc(struct nouveau_cli *cli, u64 *size, int *align, u32 domain,struct nouveau_drm *drm = cli->drm;struct nouveau_bo *nvbo;struct nvif_mmu *mmu = &cli->mmu; -struct nvif_vmm *vmm = cli->svm.cli ? &cli->svm.vmm : &cli->vmm.vmm; +struct nvif_vmm *vmm = &nouveau_cli_vmm (cli)->vmm;int i, pi =-1 ;if (!*size) {
drivers/gpu/drm/nouveau/nouveau_chan.c +1 -1
@@ -148,7 +148,7 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device, chan->device = device; chan->drm = drm; - chan->vmm = cli->svm.cli ? &cli->svm : &cli->vmm; + chan->vmm =nouveau_cli_vmm (cli);atomic_set (&chan->killed,0 );/* allocate memory for dma push buffer */
drivers/gpu/drm/nouveau/nouveau_drv.h +9 -0
@@ -112,6 +112,15 @@ struct nouveau_cli_work {struct dma_fence_cb cb; }; +static inline struct nouveau_vmm * +nouveau_cli_vmm (struct nouveau_cli *cli) +{ +if (cli->svm.cli) +return &cli->svm; + +return &cli->vmm; +} +void nouveau_cli_work_queue (struct nouveau_cli *,struct dma_fence *,struct nouveau_cli_work *);
drivers/gpu/drm/nouveau/nouveau_gem.c +3 -3
@@ -103,7 +103,7 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv)struct nouveau_bo *nvbo =nouveau_gem_object (gem);struct nouveau_drm *drm =nouveau_bdev (nvbo->bo.bdev);struct device *dev = drm->dev->dev; -struct nouveau_vmm *vmm = cli->svm.cli ? &cli->svm : &cli->vmm; +struct nouveau_vmm *vmm =nouveau_cli_vmm (cli);struct nouveau_vma *vma;int ret;
@@ -180,7 +180,7 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv)struct nouveau_bo *nvbo =nouveau_gem_object (gem);struct nouveau_drm *drm =nouveau_bdev (nvbo->bo.bdev);struct device *dev = drm->dev->dev; -struct nouveau_vmm *vmm = cli->svm.cli ? &cli->svm : & cli->vmm; +struct nouveau_vmm *vmm =nouveau_cli_vmm (cli);struct nouveau_vma *vma;int ret;
@@ -269,7 +269,7 @@ nouveau_gem_info(struct drm_file *file_priv, struct drm_gem_object *gem, {struct nouveau_cli *cli =nouveau_cli (file_priv);struct nouveau_bo *nvbo =nouveau_gem_object (gem); -struct nouveau_vmm *vmm = cli->svm.cli ? &cli->svm : &cli->vmm; +struct nouveau_vmm *vmm =nouveau_cli_vmm (cli);struct nouveau_vma *vma;if (is_power_of_2 (nvbo->valid_domains))
Signature · 1 line
2.39.2
PATCH v3 8/15 drm/nouveau: bo: initialize GEM GPU VA interface
In reply to Danilo KrummrichInitialize the GEM's DRM GPU VA manager interface in preparation for the (u)vmm implementation, provided by subsequent commits, to make use of it.
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/nouveau/nouveau_bo.c +3 -0
@@ -215,11 +215,14 @@ nouveau_bo_alloc(struct nouveau_cli *cli, u64 *size, int *align, u32 domain, nvbo =kzalloc (sizeof (struct nouveau_bo ),GFP_KERNEL );if (!nvbo)return ERR_PTR (-ENOMEM ); +INIT_LIST_HEAD (&nvbo->head);INIT_LIST_HEAD (&nvbo->entry);INIT_LIST_HEAD (&nvbo->vma_list); nvbo->bo.bdev = &drm->ttm.bdev; +drm_gem_gpuva_init (&nvbo->bo.base); +/* This is confusing, and doesn't actually mean we want an uncached * mapping, but is what NOUVEAU_GEM_DOMAIN_COHERENT gets translated * into in nouveau_gem_new().
Signature · 1 line
2.39.2
PATCH v3 9/15 drm/nouveau: move usercopy helpers to nouveau_drv.h
In reply to Danilo KrummrichMove the usercopy helpers to a common driver header file to make it usable for the new API added in subsequent commits.
--- drivers/gpu/drm/nouveau/nouveau_drv.h | 26 ++++++++++++++++++++++++++ drivers/gpu/drm/nouveau/nouveau_gem.c | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-)
drivers/gpu/drm/nouveau/nouveau_drv.h +26 -0
@@ -130,6 +130,32 @@ nouveau_cli(struct drm_file *fpriv)return fpriv ? fpriv->driver_priv :NULL ; } +static inline void +u_free (void *addr) +{ +kvfree (addr); +} + +static inline void * +u_memcpya (uint64_t user,unsigned nmemb,unsigned size) +{ +void *mem; +void __user *userptr = (void __force __user *)(uintptr_t )user; + + size *= nmemb; + + mem =kvmalloc (size,GFP_KERNEL ); +if (!mem) +return ERR_PTR (-ENOMEM ); + +if (copy_from_user (mem, userptr, size)) { +u_free (mem); +return ERR_PTR (-EFAULT ); + } + +return mem; +} +#include <nvif/object.h> #include <nvif/parent.h>
drivers/gpu/drm/nouveau/nouveau_gem.c +0 -26
@@ -613,32 +613,6 @@ nouveau_gem_pushbuf_validate(struct nouveau_channel *chan,return 0 ; } -static inline void -u_free (void *addr) -{ -kvfree (addr); -} - -static inline void * -u_memcpya (uint64_t user,unsigned nmemb,unsigned size) -{ -void *mem; -void __user *userptr = (void __force __user *)(uintptr_t )user; - - size *= nmemb; - - mem =kvmalloc (size,GFP_KERNEL ); -if (!mem) -return ERR_PTR (-ENOMEM ); - -if (copy_from_user (mem, userptr, size)) { -u_free (mem); -return ERR_PTR (-EFAULT ); - } - -return mem; -} - static int nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli, struct drm_nouveau_gem_pushbuf *req,
Signature · 1 line
2.39.2
PATCH v3 10/15 drm/nouveau: fence: separate fence alloc and emit
In reply to Danilo KrummrichThe new (VM_BIND) UAPI exports DMA fences through DRM syncobjs. Hence, in order to emit fences within DMA fence signalling critical sections (e.g. as typically done in the DRM GPU schedulers run_job() callback) we need to separate fence allocation and fence emitting.
--- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 9 ++++- drivers/gpu/drm/nouveau/nouveau_bo.c | 52 +++++++++++++++---------- drivers/gpu/drm/nouveau/nouveau_chan.c | 6 ++- drivers/gpu/drm/nouveau/nouveau_dmem.c | 9 +++-- drivers/gpu/drm/nouveau/nouveau_fence.c | 16 +++----- drivers/gpu/drm/nouveau/nouveau_fence.h | 3 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 5 ++- 7 files changed, 59 insertions(+), 41 deletions(-)
drivers/gpu/drm/nouveau/dispnv04/crtc.c +8 -1
@@ -1122,11 +1122,18 @@ nv04_page_flip_emit(struct nouveau_channel *chan,PUSH_NVSQ (push,NV_SW ,NV_SW_PAGE_FLIP ,0x00000000 );PUSH_KICK (push); - ret =nouveau_fence_new (chan, false, pfence); + ret =nouveau_fence_new (pfence);if (ret) goto fail; + ret =nouveau_fence_emit (*pfence, chan); +if (ret) + goto fail_fence_unref; +return 0 ; + +fail_fence_unref: +nouveau_fence_unref (pfence); fail:spin_lock_irqsave (&dev->event_lock, flags);list_del (&s->head);
drivers/gpu/drm/nouveau/nouveau_bo.c +31 -21
60 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_chan.c +4 -2
@@ -62,9 +62,11 @@ nouveau_channel_idle(struct nouveau_channel *chan)struct nouveau_fence *fence =NULL ;int ret; - ret =nouveau_fence_new (chan, false, &fence); + ret =nouveau_fence_new (&fence);if (!ret) { - ret =nouveau_fence_wait (fence, false, false); + ret =nouveau_fence_emit (fence, chan); +if (!ret) + ret =nouveau_fence_wait (fence, false, false);nouveau_fence_unref (&fence); }
drivers/gpu/drm/nouveau/nouveau_dmem.c +6 -3
@@ -209,7 +209,8 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf) goto done; } -nouveau_fence_new (dmem->migrate.chan, false, &fence); +if (!nouveau_fence_new (&fence)) +nouveau_fence_emit (fence, dmem->migrate.chan);migrate_vma_pages (&args);nouveau_dmem_fence_done (&fence);dma_unmap_page (drm->dev->dev, dma_addr,PAGE_SIZE ,DMA_BIDIRECTIONAL );
@@ -402,7 +403,8 @@ nouveau_dmem_evict_chunk(struct nouveau_dmem_chunk *chunk) } } -nouveau_fence_new (chunk->drm->dmem->migrate.chan, false, &fence); +if (!nouveau_fence_new (&fence)) +nouveau_fence_emit (fence, chunk->drm->dmem->migrate.chan);migrate_device_pages (src_pfns, dst_pfns, npages);nouveau_dmem_fence_done (&fence);migrate_device_finalize (src_pfns, dst_pfns, npages);
@@ -675,7 +677,8 @@ static void nouveau_dmem_migrate_chunk(struct nouveau_drm *drm, addr +=PAGE_SIZE ; } -nouveau_fence_new (drm->dmem->migrate.chan, false, &fence); +if (!nouveau_fence_new (&fence)) +nouveau_fence_emit (fence, chunk->drm->dmem->migrate.chan);migrate_vma_pages (args);nouveau_dmem_fence_done (&fence);nouveau_pfns_map (svmm, args->vma->vm_mm, args->start, pfns, i);
drivers/gpu/drm/nouveau/nouveau_fence.c +5 -11
@@ -210,6 +210,9 @@ nouveau_fence_emit(struct nouveau_fence *fence, struct nouveau_channel *chan)struct nouveau_fence_priv *priv = (void *)chan->drm->fence;int ret; +if (unlikely (!chan->fence)) +return -ENODEV ; + fence->channel = chan; fence->timeout = jiffies + (15 *HZ );
@@ -396,25 +399,16 @@ nouveau_fence_unref(struct nouveau_fence **pfence) }int -nouveau_fence_new (struct nouveau_channel *chan,bool sysmem, -struct nouveau_fence **pfence) +nouveau_fence_new (struct nouveau_fence **pfence) {struct nouveau_fence *fence; -int ret =0 ; - -if (unlikely (!chan->fence)) -return -ENODEV ; fence =kzalloc (sizeof (*fence),GFP_KERNEL );if (!fence)return -ENOMEM ; - ret =nouveau_fence_emit (fence, chan); -if (ret) -nouveau_fence_unref (&fence); - *pfence = fence; -return ret; +return 0 ; }static const char *nouveau_fence_get_get_driver_name (struct dma_fence *fence)
drivers/gpu/drm/nouveau/nouveau_fence.h +1 -2
@@ -17,8 +17,7 @@ struct nouveau_fence {unsigned long timeout; }; -int nouveau_fence_new (struct nouveau_channel *,bool sysmem, -struct nouveau_fence **); +int nouveau_fence_new (struct nouveau_fence **);void nouveau_fence_unref (struct nouveau_fence **);int nouveau_fence_emit (struct nouveau_fence *,struct nouveau_channel *);
drivers/gpu/drm/nouveau/nouveau_gem.c +4 -1
@@ -867,8 +867,11 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, } } - ret =nouveau_fence_new (chan, false, &fence); + ret =nouveau_fence_new (&fence); +if (!ret) + ret =nouveau_fence_emit (fence, chan);if (ret) { +nouveau_fence_unref (&fence);NV_PRINTK (err, cli,"error fencing pushbuf: %d\n" , ret);WIND_RING (chan); goto out;
Signature · 1 line
2.39.2
kernel test robot
build botRe: [PATCH drm-next v3 10/15] drm/nouveau: fence: separate fence alloc and emit
kernel test robot noticed the following build errors:
Hi Danilo,
kernel test robot noticed the following build errors:
[auto build test ERROR on d36d68fd1925d33066d52468b7c7c6aca6521248]
url: https://github.com/intel-lab-lkp/linux/commits/Danilo-Krummrich/drm-execution-context-for-GEM-buffers-v3/20230404-093042 base: d36d68fd1925d33066d52468b7c7c6aca6521248 patch link: https://lore.kernel.org/r/20230404012741.116502-11-dakr%40redhat.com patch subject: [PATCH drm-next v3 10/15] drm/nouveau: fence: separate fence alloc and emit config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20230404/[email protected]/config) compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
reproduce (this is a W=1 build):
# https://github.com/intel-lab-lkp/linux/commit/7fc592f2771fec5cc29fbbfbb9a2b524e02a0e93
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Danilo-Krummrich/drm-execution-context-for-GEM-buffers-v3/20230404-093042 git checkout 7fc592f2771fec5cc29fbbfbb9a2b524e02a0e93
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=x86_64 olddefconfig
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/drm/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
drivers/gpu/drm/nouveau/nouveau_dmem.c: In function 'nouveau_dmem_migrate_chunk':
>> drivers/gpu/drm/nouveau/nouveau_dmem.c:681:43: error: 'chunk' undeclared (first use in this function)
681 | nouveau_fence_emit(fence, chunk->drm->dmem->migrate.chan);
| ^~~~~ drivers/gpu/drm/nouveau/nouveau_dmem.c:681:43: note: each undeclared identifier is reported only once for each function it appears in
vim +/chunk +681 drivers/gpu/drm/nouveau/nouveau_dmem.c
664
665 static void nouveau_dmem_migrate_chunk(struct nouveau_drm *drm,
666 struct nouveau_svmm *svmm, struct migrate_vma *args,
667 dma_addr_t *dma_addrs, u64 *pfns)
668 {
669 struct nouveau_fence *fence;
670 unsigned long addr = args->start, nr_dma = 0, i;
671
672 for (i = 0; addr < args->end; i++) {
673 args->dst[i] = nouveau_dmem_migrate_copy_one(drm, svmm,
674 args->src[i], dma_addrs + nr_dma, pfns + i);
675 if (!dma_mapping_error(drm->dev->dev, dma_addrs[nr_dma]))
676 nr_dma++;
677 addr += PAGE_SIZE;
678 }
679
680 if (!nouveau_fence_new(&fence))
> 681 nouveau_fence_emit(fence, chunk->drm->dmem->migrate.chan);
682 migrate_vma_pages(args);
683 nouveau_dmem_fence_done(&fence);
684 nouveau_pfns_map(svmm, args->vma->vm_mm, args->start, pfns, i);
685
686 while (nr_dma--) {
687 dma_unmap_page(drm->dev->dev, dma_addrs[nr_dma], PAGE_SIZE,
688 DMA_BIDIRECTIONAL);
689 }
690 migrate_vma_finalize(args);
691 }
692
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
PATCH v3 11/15 drm/nouveau: fence: fail to emit when fence context is killed
In reply to Danilo KrummrichThe new VM_BIND UAPI implementation introduced in subsequent commits will allow asynchronous jobs processing push buffers and emitting fences.
If a fence context is killed, e.g. due to a channel fault, jobs which are already queued for execution might still emit new fences. In such a case a job would hang forever.
To fix that, fail to emit a new fence on a killed fence context with -ENODEV to unblock the job.
--- drivers/gpu/drm/nouveau/nouveau_fence.c | 7 +++++++ drivers/gpu/drm/nouveau/nouveau_fence.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_fence.c +7 -0
@@ -96,6 +96,7 @@ nouveau_fence_context_kill(struct nouveau_fence_chan *fctx, int error)if (nouveau_fence_signal (fence))nvif_event_block (&fctx->event); } + fctx->killed =1 ;spin_unlock_irqrestore (&fctx->lock, flags); }
@@ -229,6 +230,12 @@ nouveau_fence_emit(struct nouveau_fence *fence, struct nouveau_channel *chan)dma_fence_get (&fence->base);spin_lock_irq (&fctx->lock); +if (unlikely (fctx->killed)) { +spin_unlock_irq (&fctx->lock); +dma_fence_put (&fence->base); +return -ENODEV ; + } +if (nouveau_fence_update (chan, fctx))nvif_event_block (&fctx->event);
drivers/gpu/drm/nouveau/nouveau_fence.h +1 -1
@@ -44,7 +44,7 @@ struct nouveau_fence_chan {char name[32 ];struct nvif_event event; -int notify_ref, dead; +int notify_ref, dead, killed; };struct nouveau_fence_priv {
Signature · 1 line
2.39.2
PATCH v3 12/15 drm/nouveau: chan: provide nouveau_channel_kill()
In reply to Danilo KrummrichThe new VM_BIND UAPI implementation introduced in subsequent commits will allow asynchronous jobs processing push buffers and emitting fences.
If a job times out, we need a way to recover from this situation. For now, simply kill the channel to unblock all hung up jobs and signal userspace that the device is dead on the next EXEC or VM_BIND ioctl.
--- drivers/gpu/drm/nouveau/nouveau_chan.c | 14 +++++++++++--- drivers/gpu/drm/nouveau/nouveau_chan.h | 1 + 2 files changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/nouveau/nouveau_chan.c +11 -3
@@ -40,6 +40,14 @@ MODULE_PARM_DESC(vram_pushbuf, "Create DMA push buffers in VRAM");int nouveau_vram_pushbuf;module_param_named (vram_pushbuf, nouveau_vram_pushbuf, int,0400 ); +void +nouveau_channel_kill (struct nouveau_channel *chan) +{ +atomic_set (&chan->killed,1 ); +if (chan->fence) +nouveau_fence_context_kill (chan->fence, -ENODEV ); +} +static int nouveau_channel_killed (struct nvif_event *event,void *repv,u32 repc) {
@@ -47,9 +55,9 @@ nouveau_channel_killed(struct nvif_event *event, void *repv, u32 repc)struct nouveau_cli *cli = (void *)chan->user.client;NV_PRINTK (warn, cli,"channel %d killed!\n" , chan->chid); -atomic_set (&chan->killed,1 ); -if (chan->fence) -nouveau_fence_context_kill (chan->fence, -ENODEV ); + +if (unlikely (!atomic_read (&chan->killed))) +nouveau_channel_kill (chan);return NVIF_EVENT_DROP ; }
drivers/gpu/drm/nouveau/nouveau_chan.h +1 -0
@@ -65,6 +65,7 @@ int nouveau_channel_new(struct nouveau_drm *, struct nvif_device *, bool priv, u32 vram, u32 gart, struct nouveau_channel **); void nouveau_channel_del(struct nouveau_channel **);int nouveau_channel_idle (struct nouveau_channel *); +void nouveau_channel_kill (struct nouveau_channel *);extern int nouveau_vram_pushbuf;
Signature · 1 line
2.39.2
PATCH v3 13/15 drm/nouveau: nvkm/vmm: implement raw ops to manage uvmm
In reply to Danilo KrummrichThe new VM_BIND UAPI uses the DRM GPU VA manager to manage the VA space. Hence, we a need a way to manipulate the MMUs page tables without going through the internal range allocator implemented by nvkm/vmm.
This patch adds a raw interface for nvkm/vmm to pass the resposibility for managing the address space and the corresponding map/unmap/sparse operations to the upper layers.
--- drivers/gpu/drm/nouveau/include/nvif/if000c.h | 26 ++- drivers/gpu/drm/nouveau/include/nvif/vmm.h | 19 +- .../gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 20 +- drivers/gpu/drm/nouveau/nouveau_svm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_vmm.c | 4 +- drivers/gpu/drm/nouveau/nvif/vmm.c | 100 +++++++- .../gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 213 ++++++++++++++++-- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 197 ++++++++++++---- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 25 ++ .../drm/nouveau/nvkm/subdev/mmu/vmmgf100.c | 16 +- .../drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 16 +- .../gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c | 27 ++- 12 files changed, 566 insertions(+), 99 deletions(-)
drivers/gpu/drm/nouveau/include/nvif/if000c.h +25 -1
@@ -3,7 +3,10 @@struct nvif_vmm_v0 {__u8 version;__u8 page_nr; -__u8 managed; +#define NVIF_VMM_V0_TYPE_UNMANAGED 0x00 +#define NVIF_VMM_V0_TYPE_MANAGED 0x01 +#define NVIF_VMM_V0_TYPE_RAW 0x02 +__u8 type;__u8 pad03[5 ];__u64 addr;__u64 size;
@@ -17,6 +20,7 @@ struct nvif_vmm_v0 {#define NVIF_VMM_V0_UNMAP 0x04#define NVIF_VMM_V0_PFNMAP 0x05#define NVIF_VMM_V0_PFNCLR 0x06 +#define NVIF_VMM_V0_RAW 0x07#define NVIF_VMM_V0_MTHD (i) ((i) + 0x80)struct nvif_vmm_page_v0 {
@@ -66,6 +70,26 @@ struct nvif_vmm_unmap_v0 {__u64 addr; }; +struct nvif_vmm_raw_v0 { +__u8 version; +#define NVIF_VMM_RAW_V0_GET 0x0 +#define NVIF_VMM_RAW_V0_PUT 0x1 +#define NVIF_VMM_RAW_V0_MAP 0x2 +#define NVIF_VMM_RAW_V0_UNMAP 0x3 +#define NVIF_VMM_RAW_V0_SPARSE 0x4 +__u8 op; +__u8 sparse; +__u8 ref; +__u8 shift; +__u32 argc; +__u8 pad01[7 ]; +__u64 addr; +__u64 size; +__u64 offset; +__u64 memory; +__u64 argv; +}; +struct nvif_vmm_pfnmap_v0 {__u8 version;__u8 page;
drivers/gpu/drm/nouveau/include/nvif/vmm.h +17 -2
@@ -4,6 +4,12 @@struct nvif_mem ;struct nvif_mmu ; +enum nvif_vmm_type { +UNMANAGED , +MANAGED , +RAW , +}; +enum nvif_vmm_get {ADDR ,PTES ,
@@ -30,8 +36,9 @@ struct nvif_vmm {int page_nr; }; -int nvif_vmm_ctor (struct nvif_mmu *,const char *name,s32 oclass,bool managed, -u64 addr,u64 size,void *argv,u32 argc,struct nvif_vmm *); +int nvif_vmm_ctor (struct nvif_mmu *,const char *name,s32 oclass, +enum nvif_vmm_type ,u64 addr,u64 size,void *argv,u32 argc, +struct nvif_vmm *);void nvif_vmm_dtor (struct nvif_vmm *);int nvif_vmm_get (struct nvif_vmm *,enum nvif_vmm_get ,bool sparse,u8 page,u8 align,u64 size,struct nvif_vma *);
@@ -39,4 +46,12 @@ void nvif_vmm_put(struct nvif_vmm *, struct nvif_vma *);int nvif_vmm_map (struct nvif_vmm *,u64 addr,u64 size,void *argv,u32 argc,struct nvif_mem *,u64 offset);int nvif_vmm_unmap (struct nvif_vmm *,u64 ); + +int nvif_vmm_raw_get (struct nvif_vmm *vmm,u64 addr,u64 size,u8 shift); +int nvif_vmm_raw_put (struct nvif_vmm *vmm,u64 addr,u64 size,u8 shift); +int nvif_vmm_raw_map (struct nvif_vmm *vmm,u64 addr,u64 size,u8 shift, +void *argv,u32 argc,struct nvif_mem *mem,u64 offset); +int nvif_vmm_raw_unmap (struct nvif_vmm *vmm,u64 addr,u64 size, +u8 shift,bool sparse); +int nvif_vmm_raw_sparse (struct nvif_vmm *vmm,u64 addr,u64 size,bool ref);#endif
drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h +19 -1
@@ -17,6 +17,7 @@ struct nvkm_vma { bool part:1; /* Region was split from an allocated region by map(). */ bool busy:1; /* Region busy (for temporarily preventing user access). */ bool mapped:1; /* Region contains valid pages. */ + bool no_comp:1; /* Force no memory compression. */struct nvkm_memory *memory;/* Memory currently mapped into VMA. */ struct nvkm_tags *tags;/* Compression tag reference. */ };
@@ -27,10 +28,26 @@ struct nvkm_vmm {const char *name;u32 debug;struct kref kref; -struct mutex mutex; + +struct { +struct mutex vmm; +struct mutex ref; +struct mutex map; + } mutex;u64 start;u64 limit; +struct { +struct { +u64 addr; +u64 size; + } p; +struct { +u64 addr; +u64 size; + } n; +bool raw; + } managed;struct nvkm_vmm_pt *pd;struct list_head join;
@@ -70,6 +87,7 @@ struct nvkm_vmm_map {const struct nvkm_vmm_page *page; +bool no_comp;struct nvkm_tags *tags;u64 next;u64 type;
drivers/gpu/drm/nouveau/nouveau_svm.c +1 -1
@@ -350,7 +350,7 @@ nouveau_svmm_init(struct drm_device *dev, void *data,* VMM instead of the standard one. */ ret = nvif_vmm_ctor(&cli->mmu, "svmVmm", - cli->vmm.vmm.object.oclass, true, + cli->vmm.vmm.object.oclass, MANAGED, args->unmanaged_addr, args->unmanaged_size, &(struct gp100_vmm_v0) { .fault_replay = true,
drivers/gpu/drm/nouveau/nouveau_vmm.c +2 -2
@@ -128,8 +128,8 @@ nouveau_vmm_fini(struct nouveau_vmm *vmm)int nouveau_vmm_init (struct nouveau_cli *cli,s32 oclass,struct nouveau_vmm *vmm) { -int ret =nvif_vmm_ctor (&cli->mmu,"drmVmm" , oclass, false,PAGE_SIZE , -0 ,NULL ,0 , &vmm->vmm); +int ret =nvif_vmm_ctor (&cli->mmu,"drmVmm" , oclass,UNMANAGED , +PAGE_SIZE ,0 ,NULL ,0 , &vmm->vmm);if (ret)return ret;
drivers/gpu/drm/nouveau/nvif/vmm.c +97 -3
120 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c +195 -18
324 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c +152 -45
306 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h +25 -0
@@ -163,6 +163,7 @@ int nvkm_vmm_new_(const struct nvkm_vmm_func *, struct nvkm_mmu *, u32 pd_header, bool managed, u64 addr, u64 size, struct lock_class_key *, const char *name, struct nvkm_vmm **); +struct nvkm_vma *nvkm_vma_new (u64 addr,u64 size);struct nvkm_vma *nvkm_vmm_node_search (struct nvkm_vmm *,u64 addr);struct nvkm_vma *nvkm_vmm_node_split (struct nvkm_vmm *,struct nvkm_vma *,u64 addr,u64 size);
@@ -173,6 +174,30 @@ void nvkm_vmm_put_locked(struct nvkm_vmm *, struct nvkm_vma *);void nvkm_vmm_unmap_locked (struct nvkm_vmm *,struct nvkm_vma *,bool pfn);void nvkm_vmm_unmap_region (struct nvkm_vmm *,struct nvkm_vma *); +int nvkm_vmm_raw_get (struct nvkm_vmm *vmm,u64 addr,u64 size,u8 refd); +void nvkm_vmm_raw_put (struct nvkm_vmm *vmm,u64 addr,u64 size,u8 refd); +void nvkm_vmm_raw_unmap (struct nvkm_vmm *vmm,u64 addr,u64 size, +bool sparse,u8 refd); +int nvkm_vmm_raw_sparse (struct nvkm_vmm *,u64 addr,u64 size,bool ref); + +static inline bool +nvkm_vmm_in_managed_range (struct nvkm_vmm *vmm,u64 start,u64 size) +{ +u64 p_start = vmm->managed.p.addr; +u64 p_end = p_start + vmm->managed.p.size; +u64 n_start = vmm->managed.n.addr; +u64 n_end = n_start + vmm->managed.n.size; +u64 end = start + size; + +if (start >= p_start && end <= p_end) +return true; + +if (start >= n_start && end <= n_end) +return true; + +return false; +} +#define NVKM_VMM_PFN_ADDR 0xfffffffffffff000ULL#define NVKM_VMM_PFN_ADDR_SHIFT 12#define NVKM_VMM_PFN_APER 0x00000000000000f0ULL
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgf100.c +9 -7
@@ -287,15 +287,17 @@ gf100_vmm_valid(struct nvkm_vmm *vmm, void *argv, u32 argc,return -EINVAL ; } - ret =nvkm_memory_tags_get (memory, device, tags, - nvkm_ltc_tags_clear, - &map->tags); -if (ret) { -VMM_DEBUG (vmm,"comp %d" , ret); -return ret; +if (!map->no_comp) { + ret =nvkm_memory_tags_get (memory, device, tags, + nvkm_ltc_tags_clear, + &map->tags); +if (ret) { +VMM_DEBUG (vmm,"comp %d" , ret); +return ret; + } } -if (map->tags->mn) { +if (!map->no_comp && map->tags->mn) {u64 tags = map->tags->mn->offset + (map->offset >>17 );if (page->shift ==17 || !gm20x) { map->type |= tags <<44 ;
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c +9 -7
@@ -453,15 +453,17 @@ gp100_vmm_valid(struct nvkm_vmm *vmm, void *argv, u32 argc,return -EINVAL ; } - ret =nvkm_memory_tags_get (memory, device, tags, - nvkm_ltc_tags_clear, - &map->tags); -if (ret) { -VMM_DEBUG (vmm,"comp %d" , ret); -return ret; +if (!map->no_comp) { + ret =nvkm_memory_tags_get (memory, device, tags, + nvkm_ltc_tags_clear, + &map->tags); +if (ret) { +VMM_DEBUG (vmm,"comp %d" , ret); +return ret; + } } -if (map->tags->mn) { +if (!map->no_comp && map->tags->mn) { tags = map->tags->mn->offset + (map->offset >>16 ); map->ctag |= ((1ULL << page->shift) >>16 ) <<36 ; map->type |= tags <<36 ;
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c +15 -12
@@ -296,19 +296,22 @@ nv50_vmm_valid(struct nvkm_vmm *vmm, void *argv, u32 argc,return -EINVAL ; } - ret =nvkm_memory_tags_get (memory, device, tags,NULL , - &map->tags); -if (ret) { -VMM_DEBUG (vmm,"comp %d" , ret); -return ret; - } +if (!map->no_comp) { + ret =nvkm_memory_tags_get (memory, device, tags,NULL , + &map->tags); +if (ret) { +VMM_DEBUG (vmm,"comp %d" , ret); +return ret; + } -if (map->tags->mn) { -u32 tags = map->tags->mn->offset + (map->offset >>16 ); - map->ctag |= (u64 )comp <<49 ; - map->type |= (u64 )comp <<47 ; - map->type |= (u64 )tags <<49 ; - map->next |= map->ctag; +if (map->tags->mn) { +u32 tags = map->tags->mn->offset + + (map->offset >>16 ); + map->ctag |= (u64 )comp <<49 ; + map->type |= (u64 )comp <<47 ; + map->type |= (u64 )tags <<49 ; + map->next |= map->ctag; + } } }
Signature · 1 line
2.39.2
kernel test robot
build botRe: [PATCH drm-next v3 13/15] drm/nouveau: nvkm/vmm: implement raw ops to manage uvmm
kernel test robot noticed the following build warnings:
Hi Danilo,
kernel test robot noticed the following build warnings:
[auto build test WARNING on d36d68fd1925d33066d52468b7c7c6aca6521248]
url: https://github.com/intel-lab-lkp/linux/commits/Danilo-Krummrich/drm-execution-context-for-GEM-buffers-v3/20230404-093042 base: d36d68fd1925d33066d52468b7c7c6aca6521248 patch link: https://lore.kernel.org/r/20230404012741.116502-14-dakr%40redhat.com patch subject: [PATCH drm-next v3 13/15] drm/nouveau: nvkm/vmm: implement raw ops to manage uvmm config: arc-randconfig-r043-20230403 (https://download.01.org/0day-ci/archive/20230404/[email protected]/config) compiler: arc-elf-gcc (GCC) 12.1.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/intel-lab-lkp/linux/commit/ff73c969805aef784d47f6bedea6c15c8548d0bf
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Danilo-Krummrich/drm-execution-context-for-GEM-buffers-v3/20230404-093042 git checkout ff73c969805aef784d47f6bedea6c15c8548d0bf
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arc olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bash drivers/gpu/drm/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
In file included from drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h:4,
from drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.h:5, from drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c:22:
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c: In function 'nvkm_uvmm_mthd_raw_map':
>> drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c:422:31: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
422 | (void *)args->argv, args->argc);
| ^
drivers/gpu/drm/nouveau/include/nvkm/core/memory.h:66:43: note: in definition of macro 'nvkm_memory_map'
66 | (p)->func->map((p),(o),(vm),(va),(av),(ac))
| ^~vim +422 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c
388
389 static int
390 nvkm_uvmm_mthd_raw_map(struct nvkm_uvmm *uvmm, struct nvif_vmm_raw_v0 *args)
391 {
392 struct nvkm_client *client = uvmm->object.client;
393 struct nvkm_vmm *vmm = uvmm->vmm;
394 struct nvkm_vma vma = {
395 .addr = args->addr,
396 .size = args->size,
397 .used = true,
398 .mapref = false,
399 .no_comp = true,
400 };
401 struct nvkm_memory *memory;
402 u64 handle = args->memory;
403 u8 refd;
404 int ret;
405
406 if (!nvkm_vmm_in_managed_range(vmm, args->addr, args->size))
407 return -EINVAL;
408
409 ret = nvkm_uvmm_page_index(uvmm, args->size, args->shift, &refd);
410 if (ret)
411 return ret;
412
413 vma.page = vma.refd = refd;
414
415 memory = nvkm_umem_search(client, args->memory);
416 if (IS_ERR(memory)) {
417 VMM_DEBUG(vmm, "memory %016llx %ld\n", handle, PTR_ERR(memory));
418 return PTR_ERR(memory);
419 }
420
421 ret = nvkm_memory_map(memory, args->offset, vmm, &vma,
> 422 (void *)args->argv, args->argc);
423
424 nvkm_memory_unref(&vma.memory);
425 nvkm_memory_unref(&memory);
426 return ret;
427 }
428
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
PATCH v3 14/15 drm/nouveau: implement new VM_BIND uAPI
In reply to Danilo KrummrichThis commit provides the implementation for the new uapi motivated by the Vulkan API. It allows user mode drivers (UMDs) to:
1) Initialize a GPU virtual address (VA) space via the new DRM_IOCTL_NOUVEAU_VM_INIT ioctl for UMDs to specify the portion of VA space managed by the kernel and userspace, respectively.
2) Allocate and free a VA space region as well as bind and unbind memory to the GPUs VA space via the new DRM_IOCTL_NOUVEAU_VM_BIND ioctl. UMDs can request the named operations to be processed either synchronously or asynchronously. It supports DRM syncobjs (incl. timelines) as synchronization mechanism. The management of the GPU VA mappings is implemented with the DRM GPU VA manager.
3) Execute push buffers with the new DRM_IOCTL_NOUVEAU_EXEC ioctl. The execution happens asynchronously. It supports DRM syncobj (incl. timelines) as synchronization mechanism. DRM GEM object locking is handled with drm_exec.
Both, DRM_IOCTL_NOUVEAU_VM_BIND and DRM_IOCTL_NOUVEAU_EXEC, use the DRM GPU scheduler for the asynchronous paths.
--- Documentation/gpu/driver-uapi.rst | 3 + drivers/gpu/drm/nouveau/Kbuild | 3 + drivers/gpu/drm/nouveau/Kconfig | 2 + drivers/gpu/drm/nouveau/nouveau_abi16.c | 24 + drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 + drivers/gpu/drm/nouveau/nouveau_bo.c | 147 +- drivers/gpu/drm/nouveau/nouveau_bo.h | 2 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 27 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 59 +- drivers/gpu/drm/nouveau/nouveau_exec.c | 363 +++++ drivers/gpu/drm/nouveau/nouveau_exec.h | 42 + drivers/gpu/drm/nouveau/nouveau_gem.c | 25 +- drivers/gpu/drm/nouveau/nouveau_mem.h | 5 + drivers/gpu/drm/nouveau/nouveau_prime.c | 2 +- drivers/gpu/drm/nouveau/nouveau_sched.c | 494 ++++++ drivers/gpu/drm/nouveau/nouveau_sched.h | 116 ++ drivers/gpu/drm/nouveau/nouveau_uvmm.c | 1836 +++++++++++++++++++++++ drivers/gpu/drm/nouveau/nouveau_uvmm.h | 98 ++ 18 files changed, 3184 insertions(+), 65 deletions(-) create mode 100644 drivers/gpu/drm/nouveau/nouveau_exec.c create mode 100644 drivers/gpu/drm/nouveau/nouveau_exec.h create mode 100644 drivers/gpu/drm/nouveau/nouveau_sched.c create mode 100644 drivers/gpu/drm/nouveau/nouveau_sched.h create mode 100644 drivers/gpu/drm/nouveau/nouveau_uvmm.c create mode 100644 drivers/gpu/drm/nouveau/nouveau_uvmm.h
Documentation/gpu/driver-uapi.rst +3 -0
@@ -13,4 +13,7 @@ drm/nouveau uAPI VM_BIND / EXEC uAPI ------------------- +.. kernel-doc:: drivers/gpu/drm/nouveau/nouveau_exec.c + :doc: Overview + .. kernel-doc:: include/uapi/drm/nouveau_drm.h
drivers/gpu/drm/nouveau/Kbuild +3 -0
@@ -47,6 +47,9 @@ nouveau-y += nouveau_prime.o nouveau-y += nouveau_sgdma.o nouveau-y += nouveau_ttm.o nouveau-y += nouveau_vmm.o +nouveau-y += nouveau_exec.o +nouveau-y += nouveau_sched.o +nouveau-y += nouveau_uvmm.o # DRM - modesetting nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
drivers/gpu/drm/nouveau/Kconfig +2 -0
@@ -10,6 +10,8 @@ config DRM_NOUVEAU select DRM_KMS_HELPER select DRM_TTM select DRM_TTM_HELPER + select DRM_EXEC + select DRM_SCHED select I2C select I2C_ALGOBIT select BACKLIGHT_CLASS_DEVICE if DRM_NOUVEAU_BACKLIGHT
drivers/gpu/drm/nouveau/nouveau_abi16.c +24 -0
@@ -35,6 +35,7 @@#include "nouveau_chan.h" #include "nouveau_abi16.h" #include "nouveau_vmm.h" +#include "nouveau_sched.h" static struct nouveau_abi16 *nouveau_abi16 (struct drm_file *file_priv)
@@ -125,6 +126,17 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16, {struct nouveau_abi16_ntfy *ntfy, *temp; +/* When a client exits without waiting for it's queued up jobs to +* finish it might happen that we fault the channel. This is due to +* drm_file_free() calling drm_gem_release() before the postclose() +* callback. Hence, we can't tear down this scheduler entity before +* uvmm mappings are unmapped. Currently, we can't detect this case. +* +* However, this should be rare and harmless, since the channel isn't +* needed anymore. +*/ +nouveau_sched_entity_fini (&chan->sched_entity); +/* wait for all activity to stop before cleaning up */ if (chan->chan)nouveau_channel_idle (chan->chan);
@@ -261,6 +273,13 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)if (!drm->channel)return nouveau_abi16_put (abi16, -ENODEV ); +/* If uvmm wasn't initialized until now disable it completely to prevent +* userspace from mixing up UAPIs. +* +* The client lock is already acquired by nouveau_abi16_get(). +*/ +__nouveau_cli_uvmm_disable (cli); + device = &abi16->device; engine =NV_DEVICE_HOST_RUNLIST_ENGINES_GR ;
@@ -304,6 +323,11 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)if (ret) goto done; + ret =nouveau_sched_entity_init (&chan->sched_entity, &drm->sched, + drm->sched_wq); +if (ret) + goto done; + init->channel = chan->chan->chid;if (device->info.family >=NV_DEVICE_INFO_V0_TESLA )
drivers/gpu/drm/nouveau/nouveau_abi16.h +1 -0
@@ -26,6 +26,7 @@ struct nouveau_abi16_chan {struct nouveau_bo *ntfy;struct nouveau_vma *ntfy_vma;struct nvkm_mm heap; +struct nouveau_sched_entity sched_entity; };struct nouveau_abi16 {
drivers/gpu/drm/nouveau/nouveau_bo.c +92 -55
186 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_bo.h +1 -1
@@ -73,7 +73,7 @@ extern struct ttm_device_funcs nouveau_bo_driver;void nouveau_bo_move_init (struct nouveau_drm *);struct nouveau_bo *nouveau_bo_alloc (struct nouveau_cli *,u64 *size,int *align, -u32 domain,u32 tile_mode,u32 tile_flags); +u32 domain,u32 tile_mode,u32 tile_flags,bool internal);int nouveau_bo_init (struct nouveau_bo *,u64 size,int align,u32 domain,struct sg_table *sg,struct dma_resv *robj); int nouveau_bo_new(struct nouveau_cli *, u64 size, int align, u32 domain,
drivers/gpu/drm/nouveau/nouveau_drm.c +25 -2
@@ -68,6 +68,9 @@#include "nouveau_platform.h" #include "nouveau_svm.h" #include "nouveau_dmem.h" +#include "nouveau_exec.h" +#include "nouveau_uvmm.h" +#include "nouveau_sched.h" DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0, "DRM_UT_CORE",
@@ -190,6 +193,8 @@ nouveau_cli_fini(struct nouveau_cli *cli)WARN_ON (!list_empty (&cli->worker));usif_client_fini (cli); +nouveau_uvmm_fini (&cli->uvmm); +nouveau_sched_entity_fini (&cli->sched_entity);nouveau_vmm_fini (&cli->svm);nouveau_vmm_fini (&cli->vmm);nvif_mmu_dtor (&cli->mmu);
@@ -295,6 +300,12 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname, } cli->mem = &mems[ret]; + + ret =nouveau_sched_entity_init (&cli->sched_entity, &drm->sched, + drm->sched_wq); +if (ret) + goto done; +return 0 ; done:if (ret)
@@ -548,10 +559,14 @@ nouveau_drm_device_init(struct drm_device *dev)nvif_parent_ctor (&nouveau_parent, &drm->parent); drm->master.base.object.parent = &drm->parent; - ret =nouveau_cli_init (drm,"DRM-master" , &drm->master); + ret =nouveau_sched_init (drm);if (ret) goto fail_alloc; + ret =nouveau_cli_init (drm,"DRM-master" , &drm->master); +if (ret) + goto fail_sched; + ret =nouveau_cli_init (drm,"DRM" , &drm->client);if (ret) goto fail_master;
@@ -608,7 +623,6 @@ nouveau_drm_device_init(struct drm_device *dev) }return 0 ; - fail_dispinit:nouveau_display_destroy (dev); fail_dispctor:
@@ -621,6 +635,8 @@ nouveau_drm_device_init(struct drm_device *dev)nouveau_cli_fini (&drm->client); fail_master:nouveau_cli_fini (&drm->master); +fail_sched: +nouveau_sched_fini (drm); fail_alloc:nvif_parent_dtor (&drm->parent);kfree (drm);
@@ -672,6 +688,8 @@ nouveau_drm_device_fini(struct drm_device *dev) }mutex_unlock (&drm->clients_lock); +nouveau_sched_fini (drm); +nouveau_cli_fini (&drm->client);nouveau_cli_fini (&drm->master);nvif_parent_dtor (&drm->parent);
@@ -1173,6 +1191,9 @@ nouveau_ioctls[] = {DRM_IOCTL_DEF_DRV (NOUVEAU_GEM_CPU_PREP , nouveau_gem_ioctl_cpu_prep,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (NOUVEAU_GEM_CPU_FINI , nouveau_gem_ioctl_cpu_fini,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (NOUVEAU_GEM_INFO , nouveau_gem_ioctl_info,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (NOUVEAU_VM_INIT , nouveau_uvmm_ioctl_vm_init,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (NOUVEAU_VM_BIND , nouveau_uvmm_ioctl_vm_bind,DRM_RENDER_ALLOW ), + DRM_IOCTL_DEF_DRV(NOUVEAU_EXEC, nouveau_exec_ioctl_exec, DRM_RENDER_ALLOW), };long
@@ -1220,6 +1241,8 @@ nouveau_driver_fops = {static struct drm_driver driver_stub = { .driver_features =DRIVER_GEM | +DRIVER_SYNCOBJ |DRIVER_SYNCOBJ_TIMELINE | +DRIVER_GEM_GPUVA |DRIVER_MODESET |DRIVER_RENDER , .open = nouveau_drm_open,
drivers/gpu/drm/nouveau/nouveau_drv.h +57 -2
99 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_exec.c new file +363 -0
363 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_exec.h new file +42 -0
42 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_gem.c +21 -4
@@ -120,7 +120,11 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv) goto out; } - ret =nouveau_vma_new (nvbo, vmm, &vma); +/* only create a VMA on binding */ +if (!nouveau_cli_uvmm (cli)) + ret =nouveau_vma_new (nvbo, vmm, &vma); +else + ret =0 ;pm_runtime_mark_last_busy (dev);pm_runtime_put_autosuspend (dev); out:
@@ -187,6 +191,9 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv)if (vmm->vmm.object.oclass <NVIF_CLASS_VMM_NV50 )return ; +if (nouveau_cli_uvmm (cli)) +return ; + ret =ttm_bo_reserve (&nvbo->bo, false, false,NULL );if (ret)return ;
@@ -231,7 +238,7 @@ nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain, domain |=NOUVEAU_GEM_DOMAIN_CPU ; nvbo =nouveau_bo_alloc (cli, &size, &align, domain, tile_mode, - tile_flags); + tile_flags, false);if (IS_ERR (nvbo))return PTR_ERR (nvbo);
@@ -279,13 +286,15 @@ nouveau_gem_info(struct drm_file *file_priv, struct drm_gem_object *gem,else rep->domain =NOUVEAU_GEM_DOMAIN_VRAM ; rep->offset = nvbo->offset; -if (vmm->vmm.object.oclass >=NVIF_CLASS_VMM_NV50 ) { +if (vmm->vmm.object.oclass >=NVIF_CLASS_VMM_NV50 && + !nouveau_cli_uvmm (cli)) { vma =nouveau_vma_find (nvbo, vmm);if (!vma)return -EINVAL ; rep->offset = vma->addr; - } + }else + rep->offset =0 ; rep->size = nvbo->bo.base.size; rep->map_handle =drm_vma_node_offset_addr (&nvbo->bo.base.vma_node);
@@ -310,6 +319,11 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data,struct nouveau_bo *nvbo =NULL ;int ret =0 ; +/* If uvmm wasn't initialized until now disable it completely to prevent +* userspace from mixing up UAPIs. +*/ +nouveau_cli_uvmm_disable (cli); + ret =nouveau_gem_new (cli, req->info.size, req->align, req->info.domain, req->info.tile_mode, req->info.tile_flags, &nvbo);
@@ -715,6 +729,9 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,if (unlikely (!abi16))return -ENOMEM ; +if (unlikely (nouveau_cli_uvmm (cli))) +return -ENOSYS ; +list_for_each_entry (temp, &abi16->channels, head) {if (temp->chan->chid == req->channel) { chan = temp->chan;
drivers/gpu/drm/nouveau/nouveau_mem.h +5 -0
@@ -35,4 +35,9 @@ int nouveau_mem_vram(struct ttm_resource *, bool contig, u8 page);int nouveau_mem_host (struct ttm_resource *,struct ttm_tt *);void nouveau_mem_fini (struct nouveau_mem *);int nouveau_mem_map (struct nouveau_mem *,struct nvif_vmm *,struct nvif_vma *); +int +nouveau_mem_map_fixed (struct nouveau_mem *mem, +struct nvif_vmm *vmm, +u8 kind,u64 addr, +u64 offset,u64 range);#endif
drivers/gpu/drm/nouveau/nouveau_prime.c +1 -1
@@ -50,7 +50,7 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev,dma_resv_lock (robj,NULL ); nvbo =nouveau_bo_alloc (&drm->client, &size, &align, -NOUVEAU_GEM_DOMAIN_GART ,0 ,0 ); +NOUVEAU_GEM_DOMAIN_GART ,0 ,0 , true);if (IS_ERR (nvbo)) { obj =ERR_CAST (nvbo); goto unlock;
drivers/gpu/drm/nouveau/nouveau_sched.c new file +494 -0
494 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_sched.h new file +116 -0
116 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_uvmm.c new file +1836 -0
1,446 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_uvmm.h new file +98 -0
98 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.39.2
Part of the diff is not shown here. View the raw message.
PATCH v3 15/15 drm/nouveau: debugfs: implement DRM GPU VA debugfs
In reply to Danilo KrummrichProvide the driver indirection iterating over all DRM GPU VA spaces to enable the common 'gpuvas' debugfs file for dumping DRM GPU VA spaces.
--- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+)
drivers/gpu/drm/nouveau/nouveau_debugfs.c +39 -0
@@ -202,6 +202,44 @@ nouveau_debugfs_pstate_open(struct inode *inode, struct file *file)return single_open (file, nouveau_debugfs_pstate_get, inode->i_private); } +static void +nouveau_debugfs_gpuva_regions (struct seq_file *m,struct nouveau_uvmm *uvmm) +{ +MA_STATE (mas, &uvmm->region_mt,0 ,0 ); +struct nouveau_uvma_region *reg; + +seq_puts (m," VA regions | start | range | end \n" ); +seq_puts (m,"----------------------------------------------------------------------------\n" ); +mas_for_each (&mas, reg,ULONG_MAX ) +seq_printf (m," | 0x%016llx | 0x%016llx | 0x%016llx\n" , + reg->va.addr, reg->va.range, reg->va.addr + reg->va.range); +} + +static int +nouveau_debugfs_gpuva (struct seq_file *m,void *data) +{ +struct drm_info_node *node = (struct drm_info_node *) m->private; +struct nouveau_drm *drm =nouveau_drm (node->minor->dev); +struct nouveau_cli *cli; + +mutex_lock (&drm->clients_lock); +list_for_each_entry (cli, &drm->clients, head) { +struct nouveau_uvmm *uvmm =nouveau_cli_uvmm (cli); + +if (!uvmm) +continue ; + +nouveau_uvmm_lock (uvmm); +drm_debugfs_gpuva_info (m, &uvmm->umgr); +seq_puts (m,"\n" ); +nouveau_debugfs_gpuva_regions (m, uvmm); +nouveau_uvmm_unlock (uvmm); + } +mutex_unlock (&drm->clients_lock); + +return 0 ; +} +static const struct file_operations nouveau_pstate_fops = { .owner =THIS_MODULE , .open = nouveau_debugfs_pstate_open,
@@ -213,6 +251,7 @@ static const struct file_operations nouveau_pstate_fops = {static struct drm_info_list nouveau_debugfs_list[] = { {"vbios.rom" , nouveau_debugfs_vbios_image,0 ,NULL }, {"strap_peek" , nouveau_debugfs_strap_peek,0 ,NULL }, +DRM_DEBUGFS_GPUVA_INFO (nouveau_debugfs_gpuva,NULL ), };#define NOUVEAU_DEBUGFS_ENTRIES ARRAY_SIZE(nouveau_debugfs_list)
Signature · 1 line
2.39.2