gpu: nvgpu: Implement NVGPU_AS_IOCTL_GET_VA_REGIONS

Implement NVGPU_AS_IOCTL_GET_VA_REGIONS which returns a list of GPU VA
regions for different page sizes. This is required for the userspace
for safe fixed-address address space allocation.

Bug 1551752

Change-Id: I63ddde30935db2471bec498dae0caa870e89c1a5
Signed-off-by: Sami Kiminki <skiminki@nvidia.com>
Reviewed-on: http://git-master/r/590814
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

2 files changed, 31 insertions, 1 deletions

diff --git a/include/trace/events/gk20a.h b/include/trace/events/gk20a.h
index e94c5be6..84a525bd 100644
--- a/include/trace/events/gk20a.h
+++ b/include/trace/events/gk20a.h
@@ -237,6 +237,18 @@ TRACE_EVENT(gk20a_as_ioctl_unmap_buffer,
         TP_printk("name=%s ",  __entry->name)
 );
 
+TRACE_EVENT(gk20a_as_ioctl_get_va_regions,
+        TP_PROTO(const char *name),
+        TP_ARGS(name),
+        TP_STRUCT__entry(
+                         __field(const char *, name)
+                         ),
+        TP_fast_assign(
+                       __entry->name = name;
+                       ),
+        TP_printk("name=%s ",  __entry->name)
+);
+
 TRACE_EVENT(gk20a_mmu_fault,
             TP_PROTO(u32 fault_hi, u32 fault_lo,
                      u32 fault_info,
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h
index 42673820..97e791df 100644
--- a/include/uapi/linux/nvgpu.h
+++ b/include/uapi/linux/nvgpu.h
@@ -793,6 +793,22 @@ struct nvgpu_as_unmap_buffer_args {
         __u64 offset; /* in, byte address */
 };
 
+
+struct nvgpu_as_va_region {
+        __u64 offset;
+        __u32 page_size;
+        __u32 reserved;
+        __u64 pages;
+};
+
+struct nvgpu_as_get_va_regions_args {
+        __u64 buf_addr; /* Pointer to array of nvgpu_as_va_region:s.
+                         * Ignored if buf_size is 0 */
+        __u32 buf_size; /* in:  userspace buf size (in bytes)
+                           out: kernel buf size    (in bytes) */
+        __u32 reserved;
+};
+
 #define NVGPU_AS_IOCTL_BIND_CHANNEL \
         _IOWR(NVGPU_AS_IOCTL_MAGIC, 1, struct nvgpu_as_bind_channel_args)
 #define NVGPU32_AS_IOCTL_ALLOC_SPACE \
@@ -807,9 +823,11 @@ struct nvgpu_as_unmap_buffer_args {
         _IOWR(NVGPU_AS_IOCTL_MAGIC, 6, struct nvgpu_as_alloc_space_args)
 #define NVGPU_AS_IOCTL_MAP_BUFFER_EX \
         _IOWR(NVGPU_AS_IOCTL_MAGIC, 7, struct nvgpu_as_map_buffer_ex_args)
+#define NVGPU_AS_IOCTL_GET_VA_REGIONS \
+        _IOWR(NVGPU_AS_IOCTL_MAGIC, 8, struct nvgpu_as_get_va_regions_args)
 
 #define NVGPU_AS_IOCTL_LAST             \
-        _IOC_NR(NVGPU_AS_IOCTL_MAP_BUFFER_EX)
+        _IOC_NR(NVGPU_AS_IOCTL_GET_VA_REGIONS)
 #define NVGPU_AS_IOCTL_MAX_ARG_SIZE     \
         sizeof(struct nvgpu_as_map_buffer_ex_args)