android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jbd2: wake up journal waiters in FIFO order, not LIFO

Browse Source 
commit 34fc8768ec6089565d6d73bad26724083cecf7bd upstream.

LIFO wakeup order is unfair and sometimes leads to a journal
user not being able to get a journal handle for hundreds of
transactions in a row.

FIFO wakeup can make things more fair.

Cc: stable@kernel.org
Signed-off-by: Alexey Lyashkov <alexey.lyashkov@gmail.com>
Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Link: https://lore.kernel.org/r/20220907165959.1137482-1-alexey.lyashkov@gmail.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andrew Perepechko 2022-09-07 19:59:59 +03:00 committed by Greg Kroah-Hartman
parent d1c2d820a2
commit 21ea616f1e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/jbd2/commit.c
View File

@ -531,7 +531,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
journal->j_running_transaction = NULL; journal->j_running_transaction = NULL;
start_time = ktime_get(); start_time = ktime_get();
commit_transaction->t_log_start = journal->j_head; commit_transaction->t_log_start = journal->j_head;
wake_up(&journal->j_wait_transaction_locked); wake_up_all(&journal->j_wait_transaction_locked);
write_unlock(&journal->j_state_lock); write_unlock(&journal->j_state_lock);
jbd_debug(3, "JBD2: commit phase 2a\n"); jbd_debug(3, "JBD2: commit phase 2a\n");

6
fs/jbd2/transaction.c
View File

@ -149,7 +149,7 @@ static void wait_transaction_locked(journal_t *journal)
int need_to_start; int need_to_start;
tid_t tid = journal->j_running_transaction->t_tid; tid_t tid = journal->j_running_transaction->t_tid;
prepare_to_wait(&journal->j_wait_transaction_locked, &wait, prepare_to_wait_exclusive(&journal->j_wait_transaction_locked, &wait,
TASK_UNINTERRUPTIBLE); TASK_UNINTERRUPTIBLE);
need_to_start = !tid_geq(journal->j_commit_request, tid); need_to_start = !tid_geq(journal->j_commit_request, tid);
read_unlock(&journal->j_state_lock); read_unlock(&journal->j_state_lock);
@ -175,7 +175,7 @@ static void wait_transaction_switching(journal_t *journal)
read_unlock(&journal->j_state_lock); read_unlock(&journal->j_state_lock);
return; return;
} }
prepare_to_wait(&journal->j_wait_transaction_locked, &wait, prepare_to_wait_exclusive(&journal->j_wait_transaction_locked, &wait,
TASK_UNINTERRUPTIBLE); TASK_UNINTERRUPTIBLE);
read_unlock(&journal->j_state_lock); read_unlock(&journal->j_state_lock);
/* /*
@ -810,7 +810,7 @@ void jbd2_journal_unlock_updates (journal_t *journal)
write_lock(&journal->j_state_lock); write_lock(&journal->j_state_lock);
--journal->j_barrier_count; --journal->j_barrier_count;
write_unlock(&journal->j_state_lock); write_unlock(&journal->j_state_lock);
wake_up(&journal->j_wait_transaction_locked); wake_up_all(&journal->j_wait_transaction_locked);
} }
static void warn_dirty_buffer(struct buffer_head *bh) static void warn_dirty_buffer(struct buffer_head *bh)