Skip to contentSkip to conversation

drm/ttm: handle OOM in ttm_tt_swapout

PATCH In review Maarten Maathuis 3 participants 4 messages Feb 20, 2010 – Feb 23, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/ttm: handle OOM in ttm_tt_swapout

- Without this change I get a general protection fault.
- Also use PTR_ERR where applicable.

---
 drivers/gpu/drm/ttm/ttm_tt.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_tt.c +11 -7
index 9c2b1cc..5b5c320 100644
@@ -467,7 +467,7 @@ static int ttm_tt_swapin(struct ttm_tt *ttm)
 	void *from_virtual;
 	void *to_virtual;
 	int i;
-	int ret;
+	int ret = -ENOMEM;
 
 	if (ttm->page_flags & TTM_PAGE_FLAG_USER) {
 		ret = ttm_tt_set_user(ttm, ttm->tsk, ttm->start,
@@ -486,8 +486,10 @@ static int ttm_tt_swapin(struct ttm_tt *ttm)
 
 	for (i = 0; i < ttm->num_pages; ++i) {
 		from_page = read_mapping_page(swap_space, i, NULL);
-		if (IS_ERR(from_page))
+		if (IS_ERR(from_page)) {
+			ret = PTR_ERR(from_page);
 			goto out_err;
+		}
 		to_page = __ttm_tt_get_page(ttm, i);
 		if (unlikely(to_page == NULL))
 			goto out_err;
@@ -510,7 +512,7 @@ static int ttm_tt_swapin(struct ttm_tt *ttm)
 	return 0;
 out_err:
 	ttm_tt_free_alloced_pages(ttm);
-	return -ENOMEM;
+	return ret;
 }
 
 int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
@@ -522,6 +524,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
 	void *from_virtual;
 	void *to_virtual;
 	int i;
+	int ret = -ENOMEM;
 
 	BUG_ON(ttm->state != tt_unbound && ttm->state != tt_unpopulated);
 	BUG_ON(ttm->caching_state != tt_cached);
@@ -544,7 +547,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
 						0);
 		if (unlikely(IS_ERR(swap_storage))) {
 			printk(KERN_ERR "Failed allocating swap storage.\n");
-			return -ENOMEM;
+			return PTR_ERR(swap_storage);
 		}
 	} else
 		swap_storage = persistant_swap_storage;
@@ -556,9 +559,10 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
 		if (unlikely(from_page == NULL))
 			continue;
 		to_page = read_mapping_page(swap_space, i, NULL);
-		if (unlikely(to_page == NULL))
+		if (unlikely(IS_ERR(to_page))) {
+			ret = PTR_ERR(to_page);
 			goto out_err;
-
+		}
 		preempt_disable();
 		from_virtual = kmap_atomic(from_page, KM_USER0);
 		to_virtual = kmap_atomic(to_page, KM_USER1);
@@ -582,5 +586,5 @@ out_err:
 	if (!persistant_swap_storage)
 		fput(swap_storage);
 
-	return -ENOMEM;
+	return ret;
 }
Signature · 10 lines
1.7.0


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · Maarten Maathuis

- Without this change I get a general protection fault.
- Also use PTR_ERR where applicable.

I just want to make sure I understand, but really the only bit of this patch that matters is:

drivers/gpu/drm/ttm/ttm_tt.c int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage) · line 562

Quoted 6 lines
drivers/gpu/drm/ttm/ttm_tt.c +1 -1
@@ -556,9 +559,10 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
                if (unlikely(from_page == NULL))
                        continue;
                to_page = read_mapping_page(swap_space, i, NULL);
-               if (unlikely(to_page == NULL))
+               if (unlikely(IS_ERR(to_page))) {

^^ these two lines where we are testing for NULL but should be checking for an error?

drivers/gpu/drm/ttm/ttm_tt.c int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage) · line 565

Quoted 4 lines
drivers/gpu/drm/ttm/ttm_tt.c +2 -1
+                       ret = PTR_ERR(to_page);
                        goto out_err;
-
+               }

If that is true and the rest is just nice cleanups then I'm okay with it,.

I'll need Thomas's ack on this also.

Dave.

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--

#2 lore raw
Quoted 7 lines · Dave Airlie
Quoted 2 lines · Maarten Maathuis

- Without this change I get a general protection fault.
- Also use PTR_ERR where applicable.

I just want to make sure I understand, but really the only bit of this patch that matters is:

Quoted 9 lines

drivers/gpu/drm/ttm/ttm_tt.c int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage) · line 562

Quoted 6 lines
drivers/gpu/drm/ttm/ttm_tt.c +1 -1
@@ -556,9 +559,10 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
                if (unlikely(from_page == NULL))
                        continue;
                to_page = read_mapping_page(swap_space, i, NULL);
-               if (unlikely(to_page == NULL))
+               if (unlikely(IS_ERR(to_page))) {

^^ these two lines where we are testing for NULL but should be checking for an error?

Yes, that's the critical bit. As you can see we were already doing this for ttm_tt_swapin.

Quoted 6 lines

drivers/gpu/drm/ttm/ttm_tt.c int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage) · line 565

Quoted 5 lines
drivers/gpu/drm/ttm/ttm_tt.c +2 -1
+                       ret = PTR_ERR(to_page);
                        goto out_err;
-
+               }
Quoted 7 lines

If that is true and the rest is just nice cleanups then I'm okay with it,.

I'll need Thomas's ack on this also.

Dave.

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--

#3 lore raw
Quoted 22 lines · Maarten Maathuis
Quoted 9 lines · Dave Airlie
Quoted 3 lines · Maarten Maathuis

- Without this change I get a general protection fault.
- Also use PTR_ERR where applicable.

I just want to make sure I understand, but really the only bit of this patch that matters is:

Quoted 10 lines

drivers/gpu/drm/ttm/ttm_tt.c int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage) · line 563

Quoted 7 lines
drivers/gpu/drm/ttm/ttm_tt.c +1 -1
@@ -556,9 +559,10 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
               if (unlikely(from_page == NULL))
                       continue;
               to_page = read_mapping_page(swap_space, i, NULL);
-               if (unlikely(to_page == NULL))
+               if (unlikely(IS_ERR(to_page))) {
 

^^ these two lines where we are testing for NULL but should be checking for an error?

Quoted 17 lines

Yes, that's the critical bit. As you can see we were already doing this for ttm_tt_swapin.

Quoted 13 lines

drivers/gpu/drm/ttm/ttm_tt.c int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)

Quoted 5 lines
drivers/gpu/drm/ttm/ttm_tt.c +2 -1
+                       ret = PTR_ERR(to_page);
                       goto out_err;
-
+               }
 

If that is true and the rest is just nice cleanups then I'm okay with it,.

I'll need Thomas's ack on this also.

Dave.

/Thomas

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--