[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v3 07/49] binder: dynamically allocate the android-binder shrinker



Use new APIs to dynamically allocate the android-binder shrinker.

Signed-off-by: Qi Zheng <zhengqi.arch@xxxxxxxxxxxxx>
---
 drivers/android/binder_alloc.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
index e3db8297095a..62675cedd38e 100644
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@ -1053,11 +1053,7 @@ binder_shrink_scan(struct shrinker *shrink, struct 
shrink_control *sc)
                            NULL, sc->nr_to_scan);
 }
 
-static struct shrinker binder_shrinker = {
-       .count_objects = binder_shrink_count,
-       .scan_objects = binder_shrink_scan,
-       .seeks = DEFAULT_SEEKS,
-};
+static struct shrinker *binder_shrinker;
 
 /**
  * binder_alloc_init() - called by binder_open() for per-proc initialization
@@ -1077,19 +1073,30 @@ void binder_alloc_init(struct binder_alloc *alloc)
 
 int binder_alloc_shrinker_init(void)
 {
-       int ret = list_lru_init(&binder_alloc_lru);
+       int ret;
 
-       if (ret == 0) {
-               ret = register_shrinker(&binder_shrinker, "android-binder");
-               if (ret)
-                       list_lru_destroy(&binder_alloc_lru);
+       ret = list_lru_init(&binder_alloc_lru);
+       if (ret)
+               return ret;
+
+       binder_shrinker = shrinker_alloc(0, "android-binder");
+       if (!binder_shrinker) {
+               list_lru_destroy(&binder_alloc_lru);
+               return -ENOMEM;
        }
-       return ret;
+
+       binder_shrinker->count_objects = binder_shrink_count;
+       binder_shrinker->scan_objects = binder_shrink_scan;
+       binder_shrinker->seeks = DEFAULT_SEEKS;
+
+       shrinker_register(binder_shrinker);
+
+       return 0;
 }
 
 void binder_alloc_shrinker_exit(void)
 {
-       unregister_shrinker(&binder_shrinker);
+       shrinker_free(binder_shrinker);
        list_lru_destroy(&binder_alloc_lru);
 }
 
-- 
2.30.2




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.