Disable pristine-tar option in gbp.conf, since there is no pristine-tar branch.

[bcachefs-tools-debian] / linux / shrinker.c

diff --git a/linux/shrinker.c b/linux/shrinker.c
index dae3d29337349821b1257b5f39659949570b4b6d..ca34ebc7e02f09ef46f0c168b57cc5ade4ac142b 100644 (file)
--- a/linux/shrinker.c
+++ b/linux/shrinker.c
@@ -13,6 +13,16 @@
 static LIST_HEAD(shrinker_list);
 static DEFINE_MUTEX(shrinker_lock);
 
+void shrinker_free(struct shrinker *s)
+{
+       if (s->list.next) {
+               mutex_lock(&shrinker_lock);
+               list_del(&s->list);
+               mutex_unlock(&shrinker_lock);
+       }
+       free(s);
+}
+
 struct shrinker *shrinker_alloc(unsigned int flags, const char *fmt, ...)
 {
        return calloc(sizeof(struct shrinker), 1);
@@ -26,28 +36,6 @@ int shrinker_register(struct shrinker *shrinker)
        return 0;
 }
 
-void unregister_shrinker(struct shrinker *shrinker)
-{
-       mutex_lock(&shrinker_lock);
-       list_del(&shrinker->list);
-       mutex_unlock(&shrinker_lock);
-}
-
-struct meminfo {
-       u64             total;
-       u64             available;
-};
-
-void si_meminfo(struct sysinfo *val)
-{
-       long page_size = sysconf(_SC_PAGESIZE);
-       memset(val, 0, sizeof(*val));
-       val->mem_unit = 1;
-
-       val->totalram = sysconf(_SC_PHYS_PAGES) * page_size;
-       val->freeram  = sysconf(_SC_AVPHYS_PAGES) * page_size;
-}
-
 static void run_shrinkers_allocation_failed(gfp_t gfp_mask)
 {
        struct shrinker *shrinker;
@@ -69,7 +57,6 @@ void run_shrinkers(gfp_t gfp_mask, bool allocation_failed)
 {
        struct shrinker *shrinker;
        struct sysinfo info;
-       struct mallinfo2 malloc_info = mallinfo2();
        s64 want_shrink;
 
        if (!(gfp_mask & GFP_KERNEL))
@@ -86,16 +73,11 @@ void run_shrinkers(gfp_t gfp_mask, bool allocation_failed)
 
        si_meminfo(&info);
 
-       if (info.totalram && info.totalram >> 4 < info.freeram) {
-               /* freeram goes up when system swaps, use malloced data instead */
-               want_shrink = -malloc_info.arena + (info.totalram / 10 * 8);
-
-               if (want_shrink <= 0)
-                       return;
-       } else {
-               /* We want to play nice with other apps keep 6% avaliable, free 3% */
-               want_shrink = (info.totalram >> 5);
-       }
+       /* Aim for 6% of physical RAM free without anything in swap */
+       want_shrink = (info.totalram >> 4) - info.freeram
+                       + info.totalswap - info.freeswap;
+       if (want_shrink <= 0)
+               return;
 
        mutex_lock(&shrinker_lock);
        list_for_each_entry(shrinker, &shrinker_list, list) {
@@ -142,6 +124,11 @@ static void shrinker_thread_init(void)
        BUG_ON(IS_ERR(shrinker_task));
 }
 
+#if 0
+/*
+ * We seem to be hitting a rare segfault when shutting down the shrinker thread.
+ * Disabling this is going to cause some harmless warnings about memory leaks:
+ */
 __attribute__((destructor(103)))
 static void shrinker_thread_exit(void)
 {
@@ -150,3 +137,4 @@ static void shrinker_thread_exit(void)
 
        shrinker_task = NULL;
 }
+#endif