aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@FreeBSD.org>2021-03-10 12:26:09 +0000
committerHans Petter Selasky <hselasky@FreeBSD.org>2021-03-23 10:54:01 +0000
commit3e4fe9ca73be69ecec948b49f9d2ea5379b385b1 (patch)
tree1734bfef9a4c6ed9879546c79e62ccf4f858732b
parent093204e2d032d53d9f29d412f6953c9315f0d405 (diff)
downloadsrc-3e4fe9ca73be69ecec948b49f9d2ea5379b385b1.tar.gz
src-3e4fe9ca73be69ecec948b49f9d2ea5379b385b1.zip
MFC dfb33cb0ef48:
Allocating the LinuxKPI current structure from a software interrupt thread must be done using the M_NOWAIT flag after 1ae20f7c70ea . Sponsored by: Mellanox Technologies // NVIDIA Networking (cherry picked from commit dfb33cb0ef48084da84072244e8ca486dfcf3a96)
-rw-r--r--sys/compat/linuxkpi/common/src/linux_compat.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c
index 707c5e47512e..5f7e2664bee1 100644
--- a/sys/compat/linuxkpi/common/src/linux_compat.c
+++ b/sys/compat/linuxkpi/common/src/linux_compat.c
@@ -1913,9 +1913,15 @@ linux_timer_callback_wrapper(void *context)
{
struct timer_list *timer;
- linux_set_current(curthread);
-
timer = context;
+
+ if (linux_set_current_flags(curthread, M_NOWAIT)) {
+ /* try again later */
+ callout_reset(&timer->callout, 1,
+ &linux_timer_callback_wrapper, timer);
+ return;
+ }
+
timer->function(timer->data);
}