From patchwork Mon Oct 24 11:27:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9510 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp481884wru; Mon, 24 Oct 2022 07:23:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4WkZ0hVMeLZInkm9PFmdfRmjaDJIrhtVWQmIPorTEqv1izigaDs7XHj/t83eeUDEYQGmYQ X-Received: by 2002:a17:907:720b:b0:78e:c0e:a434 with SMTP id dr11-20020a170907720b00b0078e0c0ea434mr27871972ejc.741.1666621436184; Mon, 24 Oct 2022 07:23:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621436; cv=none; d=google.com; s=arc-20160816; b=ZiF/ZPtICsJCKWjjx2hZVGYGw7xxA0K8tu9zQfV9JIMvBLaMFIhr9CeaFSRfulI5jv 7VRFoW+4YwK2LQbja5bl0xtNsqv3xW5MRc3NlIkY0ZltACYSEDG0BrsQbcwlJ4CgbD9F 3fzHJts4nOxkU23nrdhaoV04Y9SDnVTwjvGx5mMkG3TkMEHZcpKCpNXcwh/Xmip3rTlg BjjG7Ciktqo0zoRXDRa42qBaOvsyHlx7XsrcLJLba9UWl4KNRipG0OLhUzeYKLHh8yLG VN6cPF8n4lDQyMRtqk14T4J7xnlzkxA6EWhdkXhRQUVOXJIFiicqvk7bEiQYmRnRPPpv PxJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OjZm6OvFUc81B9/pIV15qwwcdqttNUfcrPjFsvMoJRM=; b=0eMktvX83kypOuf8qY75SRp/ggrRmGeZC9yssfTDVCKnDkLhJU/tTzT2TziBz7zBXk 0F+qEeEBz79QcLAF+Mwsl/KbKOi1MyNfjbONSDEYyP8clmNn674nKdX8TFMTTY/W1Ikp KWmWzRj7Ban7sP6qjlbIUx9oeZ9P1niBL7PoSYtWGihQrdOsMmRS8ZhVmtjB2XVvEOXi bPruv3LifY0lxUErQyYtzWcBt6Ot0VM3wqwXltqVCS/Iwwt89VkGLPdpN4OEbUOoeV7j 7yvF5XF+cP29jdtyAR+CUDfgHGv0V0xi1tyRcEuRa7Oq41AWXaqLKvC7TCrV58vwDvW+ Q1Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OcsS2iVd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qw22-20020a1709066a1600b0078dcf11ccf7si27316722ejc.802.2022.10.24.07.23.31; Mon, 24 Oct 2022 07:23:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OcsS2iVd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237119AbiJXOTz (ORCPT + 99 others); Mon, 24 Oct 2022 10:19:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235047AbiJXOO1 (ORCPT ); Mon, 24 Oct 2022 10:14:27 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF6353054C; Mon, 24 Oct 2022 05:54:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 831DC612CE; Mon, 24 Oct 2022 12:36:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91860C433B5; Mon, 24 Oct 2022 12:36:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615012; bh=bEmBgl0GT+2D0DUgIZWHRCQpwTRsSlgOSVEiO/oYD9k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OcsS2iVdwDzoyp4tbYs7qJLjlIxy+OHh08sA7cohR3OEpjHQpNRmhntofg9A2ecVF HnW/vj0OL23vLU9ejTMSwZnZu7bw1kNJFBxQDUW81TcEDkHhgQzgo6pQpMu6yU70AU b6YVDb1ecuF0GynMxLZNnX2ktL9RuhkFblHwgd1M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, stable@kernel.org, Alexey Lyashkov , "Ritesh Harjani (IBM)" , Theodore Tso Subject: [PATCH 5.15 088/530] jbd2: wake up journal waiters in FIFO order, not LIFO Date: Mon, 24 Oct 2022 13:27:12 +0200 Message-Id: <20221024113048.989359615@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747579238906549719?= X-GMAIL-MSGID: =?utf-8?q?1747579238906549719?= From: Andrew Perepechko 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 Reviewed-by: Ritesh Harjani (IBM) Link: https://lore.kernel.org/r/20220907165959.1137482-1-alexey.lyashkov@gmail.com Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/jbd2/commit.c | 2 +- fs/jbd2/transaction.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -581,7 +581,7 @@ void jbd2_journal_commit_transaction(jou journal->j_running_transaction = NULL; start_time = ktime_get(); 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); jbd_debug(3, "JBD2: commit phase 2a\n"); --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -173,7 +173,7 @@ static void wait_transaction_locked(jour int need_to_start; 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); need_to_start = !tid_geq(journal->j_commit_request, tid); read_unlock(&journal->j_state_lock); @@ -199,7 +199,7 @@ static void wait_transaction_switching(j read_unlock(&journal->j_state_lock); return; } - prepare_to_wait(&journal->j_wait_transaction_locked, &wait, + prepare_to_wait_exclusive(&journal->j_wait_transaction_locked, &wait, TASK_UNINTERRUPTIBLE); read_unlock(&journal->j_state_lock); /* @@ -911,7 +911,7 @@ void jbd2_journal_unlock_updates (journa write_lock(&journal->j_state_lock); --journal->j_barrier_count; 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)