diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2021-03-10 12:26:09 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2021-03-23 11:46:02 +0000 |
| commit | af3a80bcdd204aaf9e9b7642cf81e4dfdb5a789e (patch) | |
| tree | ad72feea6d5ffddbe72f4be0dde3f501d3bd4ed3 | |
| parent | eab581fa61b535328ea525036c6e9a45bf54f474 (diff) | |
| download | src-af3a80bcdd204aaf9e9b7642cf81e4dfdb5a789e.tar.gz src-af3a80bcdd204aaf9e9b7642cf81e4dfdb5a789e.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.c | 10 |
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 f120856dd23d..e758a5590bc9 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -1901,9 +1901,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); } |