Skip to contentSkip to conversation

kfence: optimize timer scheduling

PATCH Applied Marco Elver 4 participants 12 messages Apr 21, 2021 – Sep 18, 2021

Subsystems (4)
lore
Share & tools
lore

Marco Elver

author maintainer
#0 lore raw

v2 cover kfence: optimize timer scheduling

We have observed that mostly-idle systems with KFENCE enabled wake up otherwise idle CPUs, preventing such to enter a lower power state. Debugging revealed that KFENCE spends too much active time in toggle_allocation_gate().

While the first version of KFENCE was using all the right bits to be scheduling optimal, and thus power efficient, by simply using wait_event() + wake_up(), that code was unfortunately removed.

As KFENCE was exposed to various different configs and tests, the scheduling optimal code slowly disappeared. First because of hung task warnings, and finally because of deadlocks when an allocation is made by timer code with debug objects enabled. Clearly, the "fixes" were not too friendly for devices that want to be power efficient.

Therefore, let's try a little harder to fix the hung task and deadlock problems that we have with wait_event() + wake_up(), while remaining as scheduling friendly and power efficient as possible.

Crucially, we need to defer the wake_up() to an irq_work, avoiding any potential for deadlock.

The result with this series is that on the devices where we observed a power regression, power usage returns back to baseline levels.

Changelog
---------

v2:
* Replace kfence_timer_waiting with simpler waitqueue_active() check.

v1: https://lkml.kernel.org/r/[email protected]

Marco Elver (3):
kfence: await for allocation using wait_event
kfence: maximize allocation wait timeout duration
kfence: use power-efficient work queue to run delayed work

 lib/Kconfig.kfence |  1 +
 mm/kfence/core.c   | 58 ++++++++++++++++++++++++++++++++--------------
 2 files changed, 42 insertions(+), 17 deletions(-)
Signature · 1 line
2.31.1.368.gbe11c130af-goog
author maintainer
#1 lore raw

PATCH v2 1/3 kfence: await for allocation using wait_event

On mostly-idle systems, we have observed that toggle_allocation_gate() is a cause of frequent wake-ups, preventing an otherwise idle CPU to go into a lower power state.

A late change in KFENCE's development, due to a potential deadlock [1], required changing the scheduling-friendly wait_event_timeout() and wake_up() to an open-coded wait-loop using schedule_timeout().
[1] https://lkml.kernel.org/r/[email protected]

To avoid unnecessary wake-ups, switch to using wait_event_timeout().

Unfortunately, we still cannot use a version with direct wake_up() in __kfence_alloc() due to the same potential for deadlock as in [1]. Instead, add a level of indirection via an irq_work that is scheduled if we determine that the kfence_timer requires a wake_up().

Fixes 0ce20dd84089 ("mm: add Kernel Electric-Fence infrastructure")

---
v2:
* Replace kfence_timer_waiting with simpler waitqueue_active() check.

---
 lib/Kconfig.kfence |  1 +
 mm/kfence/core.c   | 45 +++++++++++++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 16 deletions(-)
lib/Kconfig.kfence +1 -0
index 78f50ccb3b45..e641add33947 100644
@@ -7,6 +7,7 @@ menuconfig KFENCE
 	bool "KFENCE: low-overhead sampling-based memory safety error detector"
 	depends on HAVE_ARCH_KFENCE && (SLAB || SLUB)
 	select STACKTRACE
+	select IRQ_WORK
 	help
 	  KFENCE is a low-overhead sampling-based detector of heap out-of-bounds
 	  access, use-after-free, and invalid-free errors. KFENCE is designed
mm/kfence/core.c +29 -16

72 lines not on this page · raw message

Signature · 1 line
2.31.1.368.gbe11c130af-goog
author maintainer
#2 lore raw

PATCH v2 2/3 kfence: maximize allocation wait timeout duration

In reply to Marco Elver

The allocation wait timeout was initially added because of warnings due
to CONFIG_DETECT_HUNG_TASK=y [1]. While the 1 sec timeout is sufficient
to resolve the warnings (given the hung task timeout must be 1 sec or
larger) it may cause unnecessary wake-ups if the system is idle.
[1] https://lkml.kernel.org/r/CADYN=9J0DQhizAGB0-jz4HOBBh+05kMBXb4c0cXMS7Qi5NAJiw@mail.gmail.com

Fix it by computing the timeout duration in terms of the current sysctl_hung_task_timeout_secs value.

---
 mm/kfence/core.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
mm/kfence/core.c +11 -1
index 235d726f88bc..9742649f3f88 100644
@@ -20,6 +20,7 @@
 #include <linux/moduleparam.h>
 #include <linux/random.h>
 #include <linux/rcupdate.h>
+#include <linux/sched/sysctl.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
@@ -621,7 +622,16 @@ static void toggle_allocation_gate(struct work_struct *work)
 	/* Enable static key, and await allocation to happen. */
 	static_branch_enable(&kfence_allocation_key);
 
-	wait_event_timeout(allocation_wait, atomic_read(&kfence_allocation_gate), HZ);
+	if (sysctl_hung_task_timeout_secs) {
+		/*
+		 * During low activity with no allocations we might wait a
+		 * while; let's avoid the hung task warning.
+		 */
+		wait_event_timeout(allocation_wait, atomic_read(&kfence_allocation_gate),
+				   sysctl_hung_task_timeout_secs * HZ / 2);
+	} else {
+		wait_event(allocation_wait, atomic_read(&kfence_allocation_gate));
+	}
 
 	/* Disable static key and reset timer. */
 	static_branch_disable(&kfence_allocation_key);
Signature · 1 line
2.31.1.368.gbe11c130af-goog
#3 lore raw

Re: [PATCH v2 2/3] kfence: maximize allocation wait timeout duration

Quoted 44 lines · Marco Elver

The allocation wait timeout was initially added because of warnings due
to CONFIG_DETECT_HUNG_TASK=y [1]. While the 1 sec timeout is sufficient
to resolve the warnings (given the hung task timeout must be 1 sec or
larger) it may cause unnecessary wake-ups if the system is idle.
[1] https://lkml.kernel.org/r/CADYN=9J0DQhizAGB0-jz4HOBBh+05kMBXb4c0cXMS7Qi5NAJiw@mail.gmail.com

Fix it by computing the timeout duration in terms of the current sysctl_hung_task_timeout_secs value.

---
  mm/kfence/core.c | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
mm/kfence/core.c +11 -1
index 235d726f88bc..9742649f3f88 100644
@@ -20,6 +20,7 @@
  #include <linux/moduleparam.h>
  #include <linux/random.h>
  #include <linux/rcupdate.h>
+#include <linux/sched/sysctl.h>
  #include <linux/seq_file.h>
  #include <linux/slab.h>
  #include <linux/spinlock.h>
@@ -621,7 +622,16 @@ static void toggle_allocation_gate(struct work_struct *work)
  	/* Enable static key, and await allocation to happen. */
  	static_branch_enable(&kfence_allocation_key);
 
-	wait_event_timeout(allocation_wait, atomic_read(&kfence_allocation_gate), HZ);
+	if (sysctl_hung_task_timeout_secs) {
+		/*
+		 * During low activity with no allocations we might wait a
+		 * while; let's avoid the hung task warning.
+		 */
+		wait_event_timeout(allocation_wait, atomic_read(&kfence_allocation_gate),
+				   sysctl_hung_task_timeout_secs * HZ / 2);
+	} else {
+		wait_event(allocation_wait, atomic_read(&kfence_allocation_gate));
+	}
 
  	/* Disable static key and reset timer. */
  	static_branch_disable(&kfence_allocation_key);
#4 lore raw

Re: [PATCH v2 2/3] kfence: maximize allocation wait timeout duration

Hi Marco,

We found kfence_test will fails  on ARM64 with this patch with/without  CONFIG_DETECT_HUNG_TASK,

Any thought ?

Quoted 47 lines · Kefeng Wang
Quoted 45 lines · Marco Elver

The allocation wait timeout was initially added because of warnings due
to CONFIG_DETECT_HUNG_TASK=y [1]. While the 1 sec timeout is sufficient
to resolve the warnings (given the hung task timeout must be 1 sec or
larger) it may cause unnecessary wake-ups if the system is idle.
[1] https://lkml.kernel.org/r/CADYN=9J0DQhizAGB0-jz4HOBBh+05kMBXb4c0cXMS7Qi5NAJiw@mail.gmail.com

Fix it by computing the timeout duration in terms of the current sysctl_hung_task_timeout_secs value.

---
  mm/kfence/core.c | 12 +++++++++++-

  1 file changed, 11 insertions(+), 1 deletion(-)
mm/kfence/core.c +11 -0
index 235d726f88bc..9742649f3f88 100644
@@ -20,6 +20,7 @@
   #include <linux/moduleparam.h>
   #include <linux/random.h>
   #include <linux/rcupdate.h>
+#include <linux/sched/sysctl.h>
   #include <linux/seq_file.h>
   #include <linux/slab.h>
   #include <linux/spinlock.h>
@@ -621,7 +622,16 @@ static void toggle_allocation_gate(struct 
 work_struct *work)
       /* Enable static key, and await allocation to happen. */
       static_branch_enable(&kfence_allocation_key);
   -    wait_event_timeout(allocation_wait, atomic_read(&kfence_allocation_gate), HZ);
+    if (sysctl_hung_task_timeout_secs) {
+        /*
+         * During low activity with no allocations we might wait a
+         * while; let's avoid the hung task warning.
+         */
+        wait_event_timeout(allocation_wait, 
 atomic_read(&kfence_allocation_gate),
+                   sysctl_hung_task_timeout_secs * HZ / 2);
+    } else {
+        wait_event(allocation_wait, 
 atomic_read(&kfence_allocation_gate));
+    }

        /* Disable static key and reset timer. */ static_branch_disable(&kfence_allocation_key);

author maintainer
#5 lore raw

Re: [PATCH v2 2/3] kfence: maximize allocation wait timeout duration

Quoted 6 lines · Kefeng Wang

Hi Marco,

We found kfence_test will fails on ARM64 with this patch with/without CONFIG_DETECT_HUNG_TASK,

Any thought ?

Please share log and instructions to reproduce if possible. Also, if possible, please share bisection log that led you to this patch.

I currently do not see how this patch would cause that, it only increases the timeout duration.

I know that under QEMU TCG mode, there are occasionally timeouts in the test simply due to QEMU being extremely slow or other weirdness.

#6 lore raw

Re: [PATCH v2 2/3] kfence: maximize allocation wait timeout duration

Quoted 10 lines · Marco Elver
Quoted 6 lines · Kefeng Wang

Hi Marco,

We found kfence_test will fails on ARM64 with this patch with/without CONFIG_DETECT_HUNG_TASK,

Any thought ?

Please share log and instructions to reproduce if possible. Also, if possible, please share bisection log that led you to this patch.

Quoted 8 lines

I currently do not see how this patch would cause that, it only increases the timeout duration.

I know that under QEMU TCG mode, there are occasionally timeouts in the test simply due to QEMU being extremely slow or other weirdness.

.

Hi Marco,

There are some of the results of the current test:
1. Using qemu-kvm on arm64 machine, all testcase can pass.
2. Using qemu-system-aarch64 on x86_64 machine, randomly some testcases fail.
3. Using qemu-system-aarch64 on x86_64, but removing the judgment of kfence_allocation_key in kfence_alloc(), all testcase can pass.

I add some printing to the kernel and get very strange results.
I add a new variable kfence_allocation_key_gate to track the state of kfence_allocation_key. As shown in the following code, theoretically, if kfence_allocation_key_gate is zero, then kfence_allocation_key must be enabled, so the value of variable error in kfence_alloc() should always be zero. In fact, all the passed testcases fit this point. But as shown in the following failed log, although kfence_allocation_key has been enabled, it's still check failed here.

So I think static_key might be problematic in my qemu environment.
The change of timeout is not a problem but caused us to observe this problem. I tried changing the wait_event to a loop. I set timeout to HZ and re-enable/disabled in each loop, then the failed testcase disappears.

[    3.463519]     # Subtest: kfence
[    3.463629]     1..25
[    3.465548]     # test_out_of_bounds_read: test_alloc: size=128, gfp=cc0, policy=left, cache=0
[    3.561001] kfence: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~enabled~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[    3.561934] kfence: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~disabled~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[    3.665449] kfence: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~enabled~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[   13.464796] --------------kfence_allocation_key check failed 13839286 times----------------
[   13.467482] kfence: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~disabled~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[   13.469166]     # test_out_of_bounds_read: ASSERTION FAILED at mm/kfence/kfence_test.c:308
[   13.469166]     Expected false to be true, but is false
[   13.469166]
[   13.469166] failed to allocate from KFENCE
[   13.473592]     not ok 1 - test_out_of_bounds_read
include/linux/kfence.h +11 -2
index 3fe6dd8a18c1..e72889606e82 100644
@@ -25,6 +25,7 @@ extern char *__kfence_pool;
 #ifdef CONFIG_KFENCE_STATIC_KEYS
 #include <linux/static_key.h>
 DECLARE_STATIC_KEY_FALSE(kfence_allocation_key);
+extern atomic_t kfence_allocation_key_gate;
 #else
 #include <linux/atomic.h>
 extern atomic_t kfence_allocation_gate;
@@ -116,12 +117,20 @@ void *__kfence_alloc(struct kmem_cache *s, size_t size, gfp_t flags);
  */
 static __always_inline void *kfence_alloc(struct kmem_cache *s, size_t size, gfp_t flags)
 {
+       static int error;
 #ifdef CONFIG_KFENCE_STATIC_KEYS
-       if (static_branch_unlikely(&kfence_allocation_key))
+       if (static_branch_unlikely(&kfence_allocation_key)) {
 #else
-       if (unlikely(!atomic_read(&kfence_allocation_gate)))
+       if (unlikely(!atomic_read(&kfence_allocation_gate))) {
 #endif
+               if (error) {
+                       pr_info("--------------kfence_allocation_key check failed %d times----------------\n", error);
+                       error = 0;
+               }
                return __kfence_alloc(s, size, flags);
+       }
+       if (!atomic_read(&kfence_allocation_key_gate))
+               error++;
        return NULL;
 }
mm/kfence/core.c +7 -1
index 7a97db8bc8e7..637c2efa6133 100644
@@ -100,6 +100,7 @@ static DEFINE_RAW_SPINLOCK(kfence_freelist_lock); /* Lock protecting freelist. *
 #ifdef CONFIG_KFENCE_STATIC_KEYS
 /* The static key to set up a KFENCE allocation. */
 DEFINE_STATIC_KEY_FALSE(kfence_allocation_key);
+atomic_t kfence_allocation_key_gate = ATOMIC_INIT(1);
 #endif
 
 /* Gates the allocation, ensuring only one succeeds in a given period. */
@@ -624,7 +625,9 @@ static void toggle_allocation_gate(struct work_struct *work)
 #ifdef CONFIG_KFENCE_STATIC_KEYS
        /* Enable static key, and await allocation to happen. */
        static_branch_enable(&kfence_allocation_key);
-
+       if (static_branch_unlikely(&kfence_allocation_key))
+               pr_info("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~enabled~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n");
+       atomic_set(&kfence_allocation_key_gate, 0);
        if (sysctl_hung_task_timeout_secs) {
                /*
                 * During low activity with no allocations we might wait a
@@ -637,7 +640,10 @@ static void toggle_allocation_gate(struct work_struct *work)
        }
 
        /* Disable static key and reset timer. */
+       atomic_set(&kfence_allocation_key_gate, 1);
        static_branch_disable(&kfence_allocation_key);
+       if (!static_branch_unlikely(&kfence_allocation_key))
+                       pr_info("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~disabled~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n");
 #endif
        queue_delayed_work(system_unbound_wq, &kfence_timer,
                           msecs_to_jiffies(kfence_sample_interval));

thanks,

author maintainer
#7 lore raw

Re: [PATCH v2 2/3] kfence: maximize allocation wait timeout duration

Quoted 35 lines · Liu Shixin
Quoted 7 lines · Marco Elver
Quoted 6 lines · Kefeng Wang

Hi Marco,

We found kfence_test will fails on ARM64 with this patch with/without CONFIG_DETECT_HUNG_TASK,

Any thought ?

Quoted 10 lines

Please share log and instructions to reproduce if possible. Also, if possible, please share bisection log that led you to this patch.

I currently do not see how this patch would cause that, it only increases the timeout duration.

I know that under QEMU TCG mode, there are occasionally timeouts in the test simply due to QEMU being extremely slow or other weirdness.

Hi Marco,

There are some of the results of the current test:
1. Using qemu-kvm on arm64 machine, all testcase can pass.
2. Using qemu-system-aarch64 on x86_64 machine, randomly some testcases fail.
3. Using qemu-system-aarch64 on x86_64, but removing the judgment of kfence_allocation_key in kfence_alloc(), all testcase can pass.

I add some printing to the kernel and get very strange results.
I add a new variable kfence_allocation_key_gate to track the state of kfence_allocation_key. As shown in the following code, theoretically, if kfence_allocation_key_gate is zero, then kfence_allocation_key must be enabled, so the value of variable error in kfence_alloc() should always be zero. In fact, all the passed testcases fit this point. But as shown in the following failed log, although kfence_allocation_key has been enabled, it's still check failed here.

Quoted 4 lines

So I think static_key might be problematic in my qemu environment.
The change of timeout is not a problem but caused us to observe this problem. I tried changing the wait_event to a loop. I set timeout to HZ and re-enable/disabled in each loop, then the failed testcase disappears.

Nice analysis, thanks! What I gather is that static_keys/jump_labels are somehow broken in QEMU.

This does remind me that I found a bug in QEMU that might be relevant:
https://bugs.launchpad.net/qemu/+bug/1920934
Looks like it was never fixed. :-/

The failures I encountered caused the kernel to crash, but never saw the kfence test to fail due to that (never managed to get that far). Though the bug I saw was on x86 TCG mode, and I never tried arm64. If you can, try to build a QEMU with ASan and see if you also get the same use-after-free bug.

Unless we observe the problem on a real machine, I think for now we can conclude with fairly high confidence that QEMU TCG still has issues and cannot be fully trusted here (see bug above).

Thanks,
-- Marco

author maintainer
#8 lore raw

Re: [PATCH v2 2/3] kfence: maximize allocation wait timeout duration

Quoted 45 lines · Marco Elver
Quoted 35 lines · Liu Shixin
Quoted 7 lines · Marco Elver
Quoted 6 lines · Kefeng Wang

Hi Marco,

We found kfence_test will fails on ARM64 with this patch with/without CONFIG_DETECT_HUNG_TASK,

Any thought ?

Quoted 10 lines

Please share log and instructions to reproduce if possible. Also, if possible, please share bisection log that led you to this patch.

I currently do not see how this patch would cause that, it only increases the timeout duration.

I know that under QEMU TCG mode, there are occasionally timeouts in the test simply due to QEMU being extremely slow or other weirdness.

Hi Marco,

There are some of the results of the current test:
1. Using qemu-kvm on arm64 machine, all testcase can pass.
2. Using qemu-system-aarch64 on x86_64 machine, randomly some testcases fail.
3. Using qemu-system-aarch64 on x86_64, but removing the judgment of kfence_allocation_key in kfence_alloc(), all testcase can pass.

I add some printing to the kernel and get very strange results.
I add a new variable kfence_allocation_key_gate to track the state of kfence_allocation_key. As shown in the following code, theoretically, if kfence_allocation_key_gate is zero, then kfence_allocation_key must be enabled, so the value of variable error in kfence_alloc() should always be zero. In fact, all the passed testcases fit this point. But as shown in the following failed log, although kfence_allocation_key has been enabled, it's still check failed here.

Quoted 4 lines

So I think static_key might be problematic in my qemu environment.
The change of timeout is not a problem but caused us to observe this problem. I tried changing the wait_event to a loop. I set timeout to HZ and re-enable/disabled in each loop, then the failed testcase disappears.

Nice analysis, thanks! What I gather is that static_keys/jump_labels are somehow broken in QEMU.

Quoted 7 lines

This does remind me that I found a bug in QEMU that might be relevant:
https://bugs.launchpad.net/qemu/+bug/1920934
Looks like it was never fixed. :-/

The failures I encountered caused the kernel to crash, but never saw the kfence test to fail due to that (never managed to get that far). Though the bug I saw was on x86 TCG mode, and I never tried arm64. If

[ ... that is, I didn't try running QEMU-ASan in arm64 TCG mode ... of course I use QEMU arm64 to test. ;-) ]

Quoted 9 lines

you can, try to build a QEMU with ASan and see if you also get the same use-after-free bug.

Unless we observe the problem on a real machine, I think for now we can conclude with fairly high confidence that QEMU TCG still has issues and cannot be fully trusted here (see bug above).

Thanks,
-- Marco

#9 lore raw

RE: [PATCH v2 2/3] kfence: maximize allocation wait timeout duration

In reply to Kefeng Wang

From: Kefeng Wang

Quoted 7 lines

Sent: 16 September 2021 02:21

We found kfence_test will fails  on ARM64 with this patch with/without CONFIG_DETECT_HUNG_TASK,

Any thought ?

...

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

      /* Enable static key, and await allocation to happen. */ static_branch_enable(&kfence_allocation_key);
  -    wait_event_timeout(allocation_wait, atomic_read(&kfence_allocation_gate), HZ); +    if (sysctl_hung_task_timeout_secs) {
+        /*
+         * During low activity with no allocations we might wait a
+         * while; let's avoid the hung task warning.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

+         */
+        wait_event_timeout(allocation_wait, atomic_read(&kfence_allocation_gate), +                   sysctl_hung_task_timeout_secs * HZ / 2);
+    } else {
+        wait_event(allocation_wait, atomic_read(&kfence_allocation_gate)); +    }
        /* Disable static key and reset timer. */ static_branch_disable(&kfence_allocation_key);

It has replaced a wait_event_timeout() with a wait_event().

That probably isn't intended.
Although I'd expect their to be some test for the wait being signalled or timing out.

David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)

author maintainer
#10 lore raw

Re: [PATCH v2 2/3] kfence: maximize allocation wait timeout duration

Quoted 26 lines · David Laight

From: Kefeng Wang

Quoted 7 lines

Sent: 16 September 2021 02:21

We found kfence_test will fails on ARM64 with this patch with/without CONFIG_DETECT_HUNG_TASK,

Any thought ?

...

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
      /* Enable static key, and await allocation to happen. */
      static_branch_enable(&kfence_allocation_key);

- wait_event_timeout(allocation_wait, atomic_read(&kfence_allocation_gate), HZ);

mm/kfence/core.c +4 -0
+    if (sysctl_hung_task_timeout_secs) {
+        /*
+         * During low activity with no allocations we might wait a
+         * while; let's avoid the hung task warning.
Quoted 8 lines
Quoted 8 lines

mm/kfence/core.c static void toggle_allocation_gate(struct work_struct *work) · line 637

Quoted 8 lines
mm/kfence/core.c +6 -0
+         */
+        wait_event_timeout(allocation_wait, atomic_read(&kfence_allocation_gate),
+                   sysctl_hung_task_timeout_secs * HZ / 2);
+    } else {
+        wait_event(allocation_wait, atomic_read(&kfence_allocation_gate));
+    }
        /* Disable static key and reset timer. */
      static_branch_disable(&kfence_allocation_key);
Quoted 5 lines

It has replaced a wait_event_timeout() with a wait_event().

That probably isn't intended.
Although I'd expect their to be some test for the wait being signalled or timing out.

It is intended -- there's a wake_up() for this. See the whole patch series for explanation.

The whole reason we had the timeout was to avoid the hung task warnings, but we can do better if there is no hung task warning enabled.

author maintainer
#11 lore raw

PATCH v2 3/3 kfence: use power-efficient work queue to run delayed work

In reply to Marco Elver

Use the power-efficient work queue, to avoid the pathological case where we keep pinning ourselves on the same possibly idle CPU on systems that want to be power-efficient [1].
[1] https://lwn.net/Articles/731052/

---
 mm/kfence/core.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
mm/kfence/core.c +3 -2
index 9742649f3f88..e18fbbd5d9b4 100644
@@ -636,7 +636,8 @@ static void toggle_allocation_gate(struct work_struct *work)
 	/* Disable static key and reset timer. */
 	static_branch_disable(&kfence_allocation_key);
 #endif
-	schedule_delayed_work(&kfence_timer, msecs_to_jiffies(kfence_sample_interval));
+	queue_delayed_work(system_power_efficient_wq, &kfence_timer,
+			   msecs_to_jiffies(kfence_sample_interval));
 }
 static DECLARE_DELAYED_WORK(kfence_timer, toggle_allocation_gate);
 
@@ -665,7 +666,7 @@ void __init kfence_init(void)
 	}
 
 	WRITE_ONCE(kfence_enabled, true);
-	schedule_delayed_work(&kfence_timer, 0);
+	queue_delayed_work(system_power_efficient_wq, &kfence_timer, 0);
 	pr_info("initialized - using %lu bytes for %d objects at 0x%p-0x%p\n", KFENCE_POOL_SIZE,
 		CONFIG_KFENCE_NUM_OBJECTS, (void *)__kfence_pool,
 		(void *)(__kfence_pool + KFENCE_POOL_SIZE));
Signature · 1 line
2.31.1.368.gbe11c130af-goog