Skip to contentSkip to conversation

staging: android: check the return value of register_shrinker

PATCH Superseded Xiongwei Song 2 participants 3 messages Jan 4, 2018 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: android: check the return value of register_shrinker

register_shrinker call is made in ashmem_init, it may return error code, so we need to check it.

---
 drivers/staging/android/ashmem.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/android/ashmem.c +7 -1
index 4e8947923904..0b23c3e25cd4 100644
@@ -854,12 +854,18 @@ static int __init ashmem_init(void)
 		goto out_free2;
 	}
 
-	register_shrinker(&ashmem_shrinker);
+	ret = register_shrinker(&ashmem_shrinker);
+	if (unlikely(ret)) {
+		pr_err("failed to register shrinker!\n");
+		goto out_demisc;
+	}
 
 	pr_info("initialized\n");
 
 	return 0;
 
+out_demisc:
+	misc_deregister(&ashmem_misc);
 out_free2:
 	kmem_cache_destroy(ashmem_range_cachep);
 out_free1:
Signature · 1 line
2.15.1
#1 lore raw
Quoted 13 lines · Xiongwei Song

register_shrinker call is made in ashmem_init, it may return error code, so we need to check it.

---
 drivers/staging/android/ashmem.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/android/ashmem.c +0 -0
index 4e8947923904..0b23c3e25cd4 100644

drivers/staging/android/ashmem.c static int __init ashmem_init(void) · line 858

Quoted 6 lines
drivers/staging/android/ashmem.c +2 -1
@@ -854,12 +854,18 @@ static int __init ashmem_init(void)
 		goto out_free2;
 	}
 
-	register_shrinker(&ashmem_shrinker);
+	ret = register_shrinker(&ashmem_shrinker);
+	if (unlikely(ret)) {

Don't add the unlikely() here. It hurts readability and this is not a fast path. I know the other callers all have it... :/

regards,
dan carpenter

#2 lore raw

2018-01-04 22:55 GMT+08:00 Dan Carpenter <[email protected]>:

Quoted 17 lines · Xiongwei Song
Quoted 16 lines

register_shrinker call is made in ashmem_init, it may return error code, so we need to check it.

---
 drivers/staging/android/ashmem.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/android/ashmem.c +0 -0
index 4e8947923904..0b23c3e25cd4 100644
@@ -854,12 +854,18 @@ static int __init ashmem_init(void)
              goto out_free2;
      }
 
Quoted 6 lines

drivers/staging/android/ashmem.c static int __init ashmem_init(void) · line 858

Quoted 3 lines
drivers/staging/android/ashmem.c +2 -1
-     register_shrinker(&ashmem_shrinker);
+     ret = register_shrinker(&ashmem_shrinker);
+     if (unlikely(ret)) {

Don't add the unlikely() here. It hurts readability and this is not a fast path. I know the other callers all have it... :/

OK. Thanks for your suggestion. I'll send v2 out.

Thanks,
Xiongwei

Quoted 26 lines

regards,
dan carpenter