Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1653943

[PATCH V2] libcfs: Fix a sleep-in-atomic bug in cfs_wi_deschedule

Show all headers | View raw

The driver may sleep under a spin lock, and the function call path is:
cfs_wi_deschedule (acquire the lock by spin_lock)
  LASSERT
    lbug_with_loc
      libcfs_debug_dumplog
        schedule and kthread_run --> may sleep

To fix it, all "LASSERT" is placed out of the spin_lock and spin_unlock.

Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
---
 drivers/staging/lustre/lnet/libcfs/workitem.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/lustre/lnet/libcfs/workitem.c b/drivers/staging/lustre/lnet/libcfs/workitem.c
index dbc2a9b..9c530cf 100644
--- a/drivers/staging/lustre/lnet/libcfs/workitem.c
+++ b/drivers/staging/lustre/lnet/libcfs/workitem.c
@@ -140,6 +140,10 @@ struct cfs_wi_sched {
 
 	LASSERT(!in_interrupt()); /* because we use plain spinlock */
 	LASSERT(!sched->ws_stopping);
+	if (wi->wi_scheduled) {
+		LASSERT(!list_empty(&wi->wi_list));
+		LASSERT(sched->ws_nscheduled > 0);
+	}
 
 	/*
 	 * return 0 if it's running already, otherwise return 1, which
@@ -151,18 +155,14 @@ struct cfs_wi_sched {
 	rc = !(wi->wi_running);
 
 	if (wi->wi_scheduled) { /* cancel pending schedules */
-		LASSERT(!list_empty(&wi->wi_list));
 		list_del_init(&wi->wi_list);
-
-		LASSERT(sched->ws_nscheduled > 0);
 		sched->ws_nscheduled--;
-
 		wi->wi_scheduled = 0;
 	}
 
-	LASSERT(list_empty(&wi->wi_list));
-
 	spin_unlock(&sched->ws_lock);
+
+	LASSERT(list_empty(&wi->wi_list));
 	return rc;
 }
 EXPORT_SYMBOL(cfs_wi_deschedule);
-- 
1.7.9.5

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH V2] libcfs: Fix a sleep-in-atomic bug in cfs_wi_deschedule Jia-Ju Bai <baijiaju1990@163.com> - 2017-05-31 10:00 +0200
  Re: [PATCH V2] libcfs: Fix a sleep-in-atomic bug in cfs_wi_deschedule Oleg Drokin <oleg.drokin@intel.com> - 2017-05-31 15:40 +0200

csiph-web