The branch main has been updated by hselasky:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=dfb33cb0ef48084da84072244e8ca486dfcf3a96

commit dfb33cb0ef48084da84072244e8ca486dfcf3a96
Author:     Hans Petter Selasky <hsela...@freebsd.org>
AuthorDate: 2021-03-10 12:26:09 +0000
Commit:     Hans Petter Selasky <hsela...@freebsd.org>
CommitDate: 2021-03-10 12:27:40 +0000

    Allocating the LinuxKPI current structure from a software interrupt thread
    must be done using the M_NOWAIT flag after 1ae20f7c70ea .
    
    MFC after:      1 week
    Sponsored by:   Mellanox Technologies // NVIDIA Networking
---
 sys/compat/linuxkpi/common/src/linux_compat.c | 10 ++++++++--
 1 file 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);
 }
 
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"

Reply via email to