commit 0688e64bc600 ("NFS: Allow signal interruption of NFS4ERR_DELAYed operations") introduces nfs4_delay_interruptible which also needs an _unsafe version to avoid the following call trace for the same reason explained in commit 416ad3c9c006 ("freezer: add unsafe versions of freezable helpers for NFS") CPU: 4 PID: 3968 Comm: rm Tainted: G W 5.8.0-rc4 #1 Hardware name: Marvell OcteonTX CN96XX board (DT) Call trace: dump_backtrace+0x0/0x1dc show_stack+0x20/0x30 dump_stack+0xdc/0x150 debug_check_no_locks_held+0x98/0xa0 nfs4_delay_interruptible+0xd8/0x120 nfs4_handle_exception+0x130/0x170 nfs4_proc_rmdir+0x8c/0x220 nfs_rmdir+0xa4/0x360 vfs_rmdir.part.0+0x6c/0x1b0 do_rmdir+0x18c/0x210 __arm64_sys_unlinkat+0x64/0x7c el0_svc_common.constprop.0+0x7c/0x110 do_el0_svc+0x24/0xa0 el0_sync_handler+0x13c/0x1b8 el0_sync+0x158/0x180
Showing the changes to include/linux (1 of 2 files). Show all
Unified · Split
| @@ -207,6 +207,17 @@ static inline long freezable_schedule_timeout_interruptible(long timeout) · 206 unmodified lines | |||
| 207 | return __retval; | 207 | return __retval; |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | /* DO NOT ADD ANY NEW CALLERS OF THIS FUNCTION */ | ||
| 211 | static inline long freezable_schedule_timeout_interruptible_unsafe(long timeout) | ||
| 212 | { | ||
| 213 | long __retval; | ||
| 214 | |||
| 215 | freezer_do_not_count(); | ||
| 216 | __retval = schedule_timeout_interruptible(timeout); | ||
| 217 | freezer_count_unsafe(); | ||
| 218 | return __retval; | ||
| 219 | } | ||
| 220 | |||
| 210 | /* Like schedule_timeout_killable(), but should not block the freezer. */ | 221 | /* Like schedule_timeout_killable(), but should not block the freezer. */ |
| 211 | static inline long freezable_schedule_timeout_killable(long timeout) | 222 | static inline long freezable_schedule_timeout_killable(long timeout) |
| 212 | { | 223 | { |
| @@ -285,6 +296,9 @@ static inline void set_freezable(void) {} · 72 unmodified lines | |||
| 285 | #define freezable_schedule_timeout_interruptible(timeout) \ | 296 | #define freezable_schedule_timeout_interruptible(timeout) \ |
| 286 | schedule_timeout_interruptible(timeout) | 297 | schedule_timeout_interruptible(timeout) |
| 287 | 298 | ||
| 299 | #define freezable_schedule_timeout_interruptible_unsafe(timeout) \ | ||
| 300 | schedule_timeout_interruptible(timeout) | ||
| 301 | |||
| 288 | #define freezable_schedule_timeout_killable(timeout) \ | 302 | #define freezable_schedule_timeout_killable(timeout) \ |
| 289 | schedule_timeout_killable(timeout) | 303 | schedule_timeout_killable(timeout) |
| 290 | 304 | ||