msm: kgsl: Stop using memdesc->usermem
It shouldn't be illegal for memory descriptors to have multiple virtual
memory mappings under certain circumstances. If that is the case
tracking a single usermem address for each memdesc no longer makes much
sense. Get rid of the memdesc->usermem member and use an atomic counter
to track mappings instead.
Change-Id: Ic0dedbad31bafcd1019ccc8e68657cb7e3c72727
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Harshitha Sai Neelati <hsaine@codeaurora.org>
diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c
index fa4e605..632c1bb 100644
--- a/drivers/gpu/msm/kgsl.c
+++ b/drivers/gpu/msm/kgsl.c
@@ -265,6 +265,7 @@
kref_get(&entry->refcount);
}
+ atomic_set(&entry->map_count, 0);
return entry;
}
#ifdef CONFIG_DMA_SHARED_BUFFER
@@ -459,9 +460,6 @@
type = kgsl_memdesc_usermem_type(&entry->memdesc);
entry->priv->stats[type].cur -= entry->memdesc.size;
- if (type != KGSL_MEM_ENTRY_ION)
- entry->priv->gpumem_mapped -= entry->memdesc.mapsize;
-
spin_unlock(&entry->priv->mem_lock);
kgsl_mmu_put_gpuaddr(&entry->memdesc);
@@ -2124,7 +2122,7 @@
return true;
}
-static int memdesc_sg_virt(struct kgsl_memdesc *memdesc)
+static int memdesc_sg_virt(struct kgsl_memdesc *memdesc, unsigned long useraddr)
{
int ret = 0;
long npages = 0, i;
@@ -2147,13 +2145,13 @@
}
down_read(¤t->mm->mmap_sem);
- if (!check_vma(memdesc->useraddr, memdesc->size)) {
+ if (!check_vma(useraddr, memdesc->size)) {
up_read(¤t->mm->mmap_sem);
ret = -EFAULT;
goto out;
}
- npages = get_user_pages(memdesc->useraddr,
+ npages = get_user_pages(useraddr,
sglen, write, pages, NULL);
up_read(¤t->mm->mmap_sem);
@@ -2192,7 +2190,6 @@
entry->memdesc.pagetable = pagetable;
entry->memdesc.size = (uint64_t) size;
- entry->memdesc.useraddr = hostptr;
entry->memdesc.flags |= (uint64_t)KGSL_MEMFLAGS_USERMEM_ADDR;
if (kgsl_memdesc_use_cpu_map(&entry->memdesc)) {
@@ -2200,15 +2197,15 @@
/* Register the address in the database */
ret = kgsl_mmu_set_svm_region(pagetable,
- (uint64_t) entry->memdesc.useraddr, (uint64_t) size);
+ (uint64_t) hostptr, (uint64_t) size);
if (ret)
return ret;
- entry->memdesc.gpuaddr = (uint64_t) entry->memdesc.useraddr;
+ entry->memdesc.gpuaddr = (uint64_t) hostptr;
}
- return memdesc_sg_virt(&entry->memdesc);
+ return memdesc_sg_virt(&entry->memdesc, hostptr);
}
#ifdef CONFIG_DMA_SHARED_BUFFER
@@ -2293,8 +2290,7 @@
return ret;
}
- /* Setup the user addr/cache mode for cache operations */
- entry->memdesc.useraddr = hostptr;
+ /* Setup the cache mode for cache operations */
_setup_cache_mode(entry, vma);
up_read(¤t->mm->mmap_sem);
return 0;
@@ -3307,7 +3303,12 @@
param->flags = (unsigned int) entry->memdesc.flags;
param->size = (size_t) entry->memdesc.size;
param->mmapsize = (size_t) kgsl_memdesc_footprint(&entry->memdesc);
- param->useraddr = entry->memdesc.useraddr;
+ /*
+ * Entries can have multiple user mappings so thre isn't any one address
+ * we can report. Plus, the user should already know their mappings, so
+ * there isn't any value in reporting it back to them.
+ */
+ param->useraddr = 0;
kgsl_mem_entry_put(entry);
return result;
@@ -3776,9 +3777,6 @@
if (memdesc->gpuaddr)
return -EINVAL;
- if (memdesc->useraddr != 0)
- return -EINVAL;
-
pagetable = memdesc->pagetable;
/* Clear out any mappings */
@@ -4058,7 +4056,12 @@
param->flags = entry->memdesc.flags;
param->size = entry->memdesc.size;
param->va_len = kgsl_memdesc_footprint(&entry->memdesc);
- param->va_addr = (uint64_t) entry->memdesc.useraddr;
+ /*
+ * Entries can have multiple user mappings so thre isn't any one address
+ * we can report. Plus, the user should already know their mappings, so
+ * there isn't any value in reporting it back to them.
+ */
+ param->va_addr = 0;
kgsl_mem_entry_put(entry);
return 0;
@@ -4165,24 +4168,21 @@
if (kgsl_mem_entry_get(entry) == 0)
vma->vm_private_data = NULL;
+
+ atomic_inc(&entry->map_count);
}
static int
kgsl_gpumem_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
struct kgsl_mem_entry *entry = vma->vm_private_data;
- int ret;
if (!entry)
return VM_FAULT_SIGBUS;
if (!entry->memdesc.ops || !entry->memdesc.ops->vmfault)
return VM_FAULT_SIGBUS;
- ret = entry->memdesc.ops->vmfault(&entry->memdesc, vma, vmf);
- if ((ret == 0) || (ret == VM_FAULT_NOPAGE))
- entry->priv->gpumem_mapped += PAGE_SIZE;
-
- return ret;
+ return entry->memdesc.ops->vmfault(&entry->memdesc, vma, vmf);
}
static void
@@ -4193,7 +4193,13 @@
if (!entry)
return;
- entry->memdesc.useraddr = 0;
+ /*
+ * Remove the memdesc from the mapped stat once all the mappings have
+ * gone away
+ */
+ if (!atomic_dec_return(&entry->map_count))
+ entry->priv->gpumem_mapped -= entry->memdesc.size;
+
kgsl_mem_entry_put(entry);
}
@@ -4232,7 +4238,8 @@
}
}
- if (entry->memdesc.useraddr != 0) {
+ /* Don't allow ourselves to remap user memory */
+ if (entry->memdesc.flags & KGSL_MEMFLAGS_USERMEM_ADDR) {
ret = -EBUSY;
goto err_put;
}
@@ -4557,9 +4564,10 @@
vma->vm_file = file;
- entry->memdesc.useraddr = vma->vm_start;
+ if (atomic_inc_return(&entry->map_count) == 1)
+ entry->priv->gpumem_mapped += entry->memdesc.size;
- trace_kgsl_mem_mmap(entry);
+ trace_kgsl_mem_mmap(entry, vma->vm_start);
return 0;
}
diff --git a/drivers/gpu/msm/kgsl.h b/drivers/gpu/msm/kgsl.h
index 8456be7..75d2c40 100644
--- a/drivers/gpu/msm/kgsl.h
+++ b/drivers/gpu/msm/kgsl.h
@@ -205,11 +205,9 @@
* @pagetable: Pointer to the pagetable that the object is mapped in
* @hostptr: Kernel virtual address
* @hostptr_count: Number of threads using hostptr
- * @useraddr: User virtual address (if applicable)
* @gpuaddr: GPU virtual address
* @physaddr: Physical address of the memory object
* @size: Size of the memory object
- * @mapsize: Size of memory mapped in userspace
* @priv: Internal flags and settings
* @sgt: Scatter gather table for allocated pages
* @ops: Function hooks for the memdesc memory type
@@ -224,11 +222,9 @@
struct kgsl_pagetable *pagetable;
void *hostptr;
unsigned int hostptr_count;
- unsigned long useraddr;
uint64_t gpuaddr;
phys_addr_t physaddr;
uint64_t size;
- uint64_t mapsize;
unsigned int priv;
struct sg_table *sgt;
struct kgsl_memdesc_ops *ops;
@@ -286,6 +282,11 @@
struct work_struct work;
spinlock_t bind_lock;
struct rb_root bind_tree;
+ /*
+ * @map_count: Count how many vmas this object is mapped in - used for
+ * debugfs accounting
+ */
+ atomic_t map_count;
};
struct kgsl_device_private;
diff --git a/drivers/gpu/msm/kgsl_debugfs.c b/drivers/gpu/msm/kgsl_debugfs.c
index 834706a..00f60bb 100644
--- a/drivers/gpu/msm/kgsl_debugfs.c
+++ b/drivers/gpu/msm/kgsl_debugfs.c
@@ -152,7 +152,11 @@
flags[3] = get_alignflag(m);
flags[4] = get_cacheflag(m);
flags[5] = kgsl_memdesc_use_cpu_map(m) ? 'p' : '-';
- flags[6] = (m->useraddr) ? 'Y' : 'N';
+ /*
+ * Show Y if at least one vma has this entry
+ * mapped (could be multiple)
+ */
+ flags[6] = atomic_read(&entry->map_count) ? 'Y' : 'N';
flags[7] = kgsl_memdesc_is_secured(m) ? 's' : '-';
flags[8] = m->flags & KGSL_MEMFLAGS_SPARSE_PHYS ? 'P' : '-';
flags[9] = '\0';
@@ -163,12 +167,16 @@
kgsl_get_egl_counts(entry, &egl_surface_count,
&egl_image_count);
- seq_printf(s, "%pK %pK %16llu %5d %9s %10s %16s %5d %16llu %6d %6d",
+ seq_printf(s, "%pK %d %16llu %5d %9s %10s %16s %5d %16d %6d %6d",
(uint64_t *)(uintptr_t) m->gpuaddr,
- (unsigned long *) m->useraddr,
- m->size, entry->id, flags,
+ /*
+ * Show zero for the useraddr - we can't reliably track
+ * that value for multiple vmas anyway
+ */
+ 0, m->size, entry->id, flags,
memtype_str(usermem_type),
- usage, (m->sgt ? m->sgt->nents : 0), m->mapsize,
+ usage, (m->sgt ? m->sgt->nents : 0),
+ atomic_read(&entry->map_count),
egl_surface_count, egl_image_count);
if (entry->metadata[0] != 0)
@@ -239,7 +247,7 @@
if (ptr == SEQ_START_TOKEN) {
seq_printf(s, "%16s %16s %16s %5s %9s %10s %16s %5s %16s %6s %6s\n",
"gpuaddr", "useraddr", "size", "id", "flags", "type",
- "usage", "sglen", "mapsize", "eglsrf", "eglimg");
+ "usage", "sglen", "mapcount", "eglsrf", "eglimg");
return 0;
} else
return print_mem_entry(s, ptr);
diff --git a/drivers/gpu/msm/kgsl_sharedmem.c b/drivers/gpu/msm/kgsl_sharedmem.c
index 2313236..599fe9e 100644
--- a/drivers/gpu/msm/kgsl_sharedmem.c
+++ b/drivers/gpu/msm/kgsl_sharedmem.c
@@ -445,8 +445,6 @@
get_page(page);
vmf->page = page;
- memdesc->mapsize += PAGE_SIZE;
-
return 0;
}
@@ -577,8 +575,6 @@
else if (ret == -EFAULT)
return VM_FAULT_SIGBUS;
- memdesc->mapsize += PAGE_SIZE;
-
return VM_FAULT_NOPAGE;
}
diff --git a/drivers/gpu/msm/kgsl_trace.h b/drivers/gpu/msm/kgsl_trace.h
index c7690a1..82fc5f8 100644
--- a/drivers/gpu/msm/kgsl_trace.h
+++ b/drivers/gpu/msm/kgsl_trace.h
@@ -432,9 +432,9 @@
TRACE_EVENT(kgsl_mem_mmap,
- TP_PROTO(struct kgsl_mem_entry *mem_entry),
+ TP_PROTO(struct kgsl_mem_entry *mem_entry, unsigned long useraddr),
- TP_ARGS(mem_entry),
+ TP_ARGS(mem_entry, useraddr),
TP_STRUCT__entry(
__field(unsigned long, useraddr)
@@ -446,7 +446,7 @@
),
TP_fast_assign(
- __entry->useraddr = mem_entry->memdesc.useraddr;
+ __entry->useraddr = useraddr;
__entry->gpuaddr = mem_entry->memdesc.gpuaddr;
__entry->size = mem_entry->memdesc.size;
kgsl_get_memory_usage(__entry->usage, sizeof(__entry->usage),