msm: kgsl: Fix context reference counting
Get rid of kgsl_find_context. Use instead kgsl_context_get that does
correct RCU read locking around the itr_find and increases the
reference count on the context before returning it. This eliminates
the chance that a context will be destroyed while somebody is still
using it. Of course increased use of kgsl_context_get is accompanied
by kgsl_context_put in all the right places.
Change-Id: Ic0dedbad73d497fd9b451aefad8e5b28d33b829d
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 9f4bb88..f0ce8f9 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -315,14 +315,15 @@
return kgsl_mmu_device_setstate(&device->mmu, flags);
num_iommu_units = kgsl_mmu_get_num_iommu_units(&device->mmu);
- context = idr_find(&device->context_idr, context_id);
+ context = kgsl_context_get(device, context_id);
+
if (context == NULL)
return;
adreno_ctx = context->devctxt;
if (kgsl_mmu_enable_clk(&device->mmu,
KGSL_IOMMU_CONTEXT_USER))
- return;
+ goto done;
cmds += __adreno_add_idle_indirect_cmds(cmds,
device->mmu.setstate_memory.gpuaddr +
@@ -440,6 +441,8 @@
KGSL_DRV_ERR(device, "Temp command buffer overflow\n");
BUG();
}
+done:
+ kgsl_context_put(context);
}
static void adreno_gpummu_setstate(struct kgsl_device *device,
@@ -467,7 +470,7 @@
* easier to filter out the mmu accesses from the dump
*/
if (!kgsl_cff_dump_enable && adreno_dev->drawctxt_active) {
- context = idr_find(&device->context_idr, context_id);
+ context = kgsl_context_get(device, context_id);
if (context == NULL)
return;
adreno_ctx = context->devctxt;
@@ -547,6 +550,8 @@
adreno_ringbuffer_issuecmds(device, adreno_ctx,
KGSL_CMD_FLAGS_PMODE,
&link[0], sizedwords);
+
+ kgsl_context_put(context);
} else {
kgsl_mmu_device_setstate(&device->mmu, flags);
}
@@ -1360,6 +1365,8 @@
* since thats the guilty party, if fault tolerance failed then
* mark all as guilty
*/
+
+ rcu_read_lock();
while ((context = idr_get_next(&device->context_idr, &next))) {
struct adreno_context *adreno_context = context->devctxt;
if (ft_status) {
@@ -1378,6 +1385,7 @@
}
next = next + 1;
}
+ rcu_read_unlock();
}
static void adreno_set_max_ts_for_bad_ctxs(struct kgsl_device *device)
@@ -1388,6 +1396,7 @@
struct adreno_context *temp_adreno_context;
int next = 0;
+ rcu_read_lock();
while ((context = idr_get_next(&device->context_idr, &next))) {
temp_adreno_context = context->devctxt;
if (temp_adreno_context->flags & CTXT_FLAGS_GPU_HANG) {
@@ -1402,6 +1411,7 @@
}
next = next + 1;
}
+ rcu_read_unlock();
}
static void adreno_destroy_ft_data(struct adreno_ft_data *ft_data)
@@ -1819,7 +1829,8 @@
struct adreno_context *last_active_ctx = adreno_dev->drawctxt_active;
unsigned int long_ib = 0;
- context = idr_find(&device->context_idr, ft_data->context_id);
+ context = kgsl_context_get(device, ft_data->context_id);
+
if (context == NULL) {
KGSL_FT_ERR(device, "Last context unknown id:%d\n",
ft_data->context_id);
@@ -1996,17 +2007,21 @@
/* ringbuffer now has data from the last valid context id,
* so restore the active_ctx to the last valid context */
if (ft_data->last_valid_ctx_id) {
- struct kgsl_context *last_ctx =
- idr_find(&device->context_idr,
- ft_data->last_valid_ctx_id);
+ struct kgsl_context *last_ctx = kgsl_context_get(device,
+ ft_data->last_valid_ctx_id);
+
if (last_ctx)
adreno_dev->drawctxt_active = last_ctx->devctxt;
+
+ kgsl_context_put(last_ctx);
}
done:
/* Turn off iommu clocks */
if (KGSL_MMU_TYPE_IOMMU == kgsl_mmu_get_mmutype())
kgsl_mmu_disable_clk_on_ts(&device->mmu, 0, false);
+
+ kgsl_context_put(context);
return ret;
}
@@ -2463,7 +2478,9 @@
struct kgsl_context *context;
struct adreno_context *adreno_context = NULL;
int next = 0;
+ struct kgsl_memdesc *desc = NULL;
+ rcu_read_lock();
while (1) {
context = idr_get_next(&device->context_idr, &next);
if (context == NULL)
@@ -2473,20 +2490,19 @@
if (kgsl_mmu_pt_equal(&device->mmu, adreno_context->pagetable,
pt_base)) {
- struct kgsl_memdesc *desc;
-
desc = &adreno_context->gpustate;
if (kgsl_gpuaddr_in_memdesc(desc, gpuaddr, size))
- return desc;
+ break;
desc = &adreno_context->context_gmem_shadow.gmemshadow;
if (kgsl_gpuaddr_in_memdesc(desc, gpuaddr, size))
- return desc;
+ break;
}
next = next + 1;
+ desc = NULL;
}
-
- return NULL;
+ rcu_read_unlock();
+ return desc;
}
struct kgsl_memdesc *adreno_find_region(struct kgsl_device *device,
@@ -3134,7 +3150,8 @@
case IOCTL_KGSL_DRAWCTXT_SET_BIN_BASE_OFFSET:
binbase = data;
- context = kgsl_find_context(dev_priv, binbase->drawctxt_id);
+ context = kgsl_context_get_owner(dev_priv,
+ binbase->drawctxt_id);
if (context) {
adreno_drawctxt_set_bin_base_offset(
dev_priv->device, context, binbase->offset);
@@ -3145,6 +3162,8 @@
"device_id=%d\n",
binbase->drawctxt_id, dev_priv->device->id);
}
+
+ kgsl_context_put(context);
break;
default: