Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Oct 24, 2016

lore

Share & tools

lore

Jens Axboe

author

2016-10-24 12:00 UTC #0 lore raw

The following changes since commit e291cff14e97feb3cff711f5a5cbcb63b32f9c72:

Use fmt -w WIDTH option instead of -WIDTH (2016-10-20 08:10:10 -0600)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to ca0122d822ea7dd573f05ca4cf43c5d0ff9f4adb:

backend: if we can't grab stat_mutex, report a deadlock error and exit (2016-10-23 08:35:14 -0600)

----------------------------------------------------------------
Theodore Ts'o (1):
backend: if we can't grab stat_mutex, report a deadlock error and exit

 backend.c | 7 +++++++
 1 file changed, 7 insertions(+)

---

Diff of recent changes:

backend.c +7 -0

index fb2a855..093b6a3 100644
@@ -1471,6 +1471,7 @@ static void *thread_main(void *data)
 	struct thread_data *td = fd->td;
 	struct thread_options *o = &td->o;
 	struct sk_out *sk_out = fd->sk_out;
+	int deadlock_loop_cnt;
 	int clear_state;
 	int ret;

@@ -1731,11 +1732,17 @@ static void *thread_main(void *data)
 		 * the rusage_sem, which would never get upped because
 		 * this thread is waiting for the stat mutex.
 		 */
+		deadlock_loop_cnt = 0;
 		do {
 			check_update_rusage(td);
 			if (!fio_mutex_down_trylock(stat_mutex))
 				break;
 			usleep(1000);
+			if (deadlock_loop_cnt++ > 5000) {
+				log_err("fio seems to be stuck grabbing stat_mutex, forcibly exiting\n");
+				td->error = EDEADLOCK;
+				goto err;
+			}
 		} while (1);
 
 		if (td_read(td) && td->io_bytes[DDIR_READ])