mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v2] staging: tidspbridge: protect dmm_map properly
@ 2010-12-20 18:43 Felipe Contreras
  2010-12-21 14:06 ` Ohad Ben-Cohen
  0 siblings, 1 reply; 18+ messages in thread
From: Felipe Contreras @ 2010-12-20 18:43 UTC (permalink / raw)
  To: linux-main, linux-omap, Greg KH, Omar Ramirez Luna
  Cc: Ohad Ben-Cohen, Fernando Guzman Lugo, Nishanth Menon,
	Ameya Palande, Hari Kanigeri, Felipe Contreras

We need to protect not only the dmm_map list, but the individual
map_obj's, otherwise, we might be building the scatter-gather list with
garbage. So, use the existing proc_lock for that.

I observed race conditions which caused kernel panics while running
stress tests. This patch fixes those.

Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com>
---
 drivers/staging/tidspbridge/rmgr/proc.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index b47d7aa..e2fe165 100644
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -781,12 +781,14 @@ int proc_begin_dma(void *hprocessor, void *pmpu_addr, u32 ul_size,
 							(u32)pmpu_addr,
 							ul_size, dir);
 
+	mutex_lock(&proc_lock);
+
 	/* find requested memory are in cached mapping information */
 	map_obj = find_containing_mapping(pr_ctxt, (u32) pmpu_addr, ul_size);
 	if (!map_obj) {
 		pr_err("%s: find_containing_mapping failed\n", __func__);
 		status = -EFAULT;
-		goto err_out;
+		goto no_map;
 	}
 
 	if (memory_give_ownership(map_obj, (u32) pmpu_addr, ul_size, dir)) {
@@ -795,6 +797,8 @@ int proc_begin_dma(void *hprocessor, void *pmpu_addr, u32 ul_size,
 		status = -EFAULT;
 	}
 
+no_map:
+	mutex_unlock(&proc_lock);
 err_out:
 
 	return status;
@@ -819,21 +823,24 @@ int proc_end_dma(void *hprocessor, void *pmpu_addr, u32 ul_size,
 							(u32)pmpu_addr,
 							ul_size, dir);
 
+	mutex_lock(&proc_lock);
+
 	/* find requested memory are in cached mapping information */
 	map_obj = find_containing_mapping(pr_ctxt, (u32) pmpu_addr, ul_size);
 	if (!map_obj) {
 		pr_err("%s: find_containing_mapping failed\n", __func__);
 		status = -EFAULT;
-		goto err_out;
+		goto no_map;
 	}
 
 	if (memory_regain_ownership(map_obj, (u32) pmpu_addr, ul_size, dir)) {
 		pr_err("%s: InValid address parameters %p %x\n",
 		       __func__, pmpu_addr, ul_size);
 		status = -EFAULT;
-		goto err_out;
 	}
 
+no_map:
+	mutex_unlock(&proc_lock);
 err_out:
 	return status;
 }
@@ -1726,9 +1733,8 @@ int proc_un_map(void *hprocessor, void *map_addr,
 		    (p_proc_object->hbridge_context, va_align, size_align);
 	}
 
-	mutex_unlock(&proc_lock);
 	if (status)
-		goto func_end;
+		goto unmap_failed;
 
 	/*
 	 * A successful unmap should be followed by removal of map_obj
@@ -1737,6 +1743,9 @@ int proc_un_map(void *hprocessor, void *map_addr,
 	 */
 	remove_mapping_information(pr_ctxt, (u32) map_addr, size_align);
 
+unmap_failed:
+	mutex_unlock(&proc_lock);
+
 func_end:
 	dev_dbg(bridge, "%s: hprocessor: 0x%p map_addr: 0x%p status: 0x%x\n",
 		__func__, hprocessor, map_addr, status);
-- 
1.7.3.3


^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2010-12-29 10:06 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-20 18:43 [PATCH v2] staging: tidspbridge: protect dmm_map properly Felipe Contreras
2010-12-21 14:06 ` Ohad Ben-Cohen
2010-12-21 16:44   ` Felipe Contreras
2010-12-27 10:29     ` Ohad Ben-Cohen
2010-12-27 13:55       ` Felipe Contreras
2010-12-28  6:33         ` Ohad Ben-Cohen
2010-12-28 10:36           ` Felipe Contreras
2010-12-28 10:56             ` Ohad Ben-Cohen
2010-12-28 12:12               ` Felipe Contreras
2010-12-28 12:18                 ` Ohad Ben-Cohen
2010-12-28 12:24                   ` Felipe Contreras
2010-12-28 12:37                     ` Ohad Ben-Cohen
2010-12-29  9:39                       ` Felipe Contreras
2010-12-29  9:46                         ` Ohad Ben-Cohen
2010-12-29 10:06                           ` Felipe Contreras
2010-12-28 14:48                 ` Ohad Ben-Cohen
2010-12-29  9:42                   ` Felipe Contreras
2010-12-29  9:51                     ` Ohad Ben-Cohen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®