From patchwork Tue Nov 26 14:45:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Yi X-Patchwork-Id: 1201085 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47MmPb6DYbz9sP6 for ; Wed, 27 Nov 2019 01:24:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727821AbfKZOYd (ORCPT ); Tue, 26 Nov 2019 09:24:33 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:43906 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727016AbfKZOYd (ORCPT ); Tue, 26 Nov 2019 09:24:33 -0500 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 1C113291CC001E39E26E; Tue, 26 Nov 2019 22:24:31 +0800 (CST) Received: from huawei.com (10.175.124.28) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.439.0; Tue, 26 Nov 2019 22:24:21 +0800 From: "zhangyi (F)" To: CC: , , , , Subject: [PATCH] ext4, jbd2: ensure panic when there is no need to record errno in the jbd2 sb Date: Tue, 26 Nov 2019 22:45:37 +0800 Message-ID: <20191126144537.30020-1-yi.zhang@huawei.com> X-Mailer: git-send-email 2.17.2 MIME-Version: 1.0 X-Originating-IP: [10.175.124.28] X-CFilter-Loop: Reflected Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org JBD2_REC_ERR flag used to indicate the errno has been updated when jbd2 aborted, and then __ext4_abort() and ext4_handle_error() can invoke panic if ERRORS_PANIC is specified. But there is one exception, if jbd2 thread failed to submit commit record, it abort journal through invoking __jbd2_journal_abort_hard() without set this flag, so we can no longer panic. Fix this by set such flag even if there is no need to record errno in the jbd2 super block. Fixes: 4327ba52afd03 ("ext4, jbd2: ensure entering into panic after recording an error in superblock") Signed-off-by: zhangyi (F) Cc: --- fs/ext4/super.c | 4 ++-- fs/jbd2/journal.c | 46 +++++++++++++++++++++++++++++--------------- include/linux/jbd2.h | 4 +++- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index dd654e53ba3d..76cde5fb8207 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -482,7 +482,7 @@ static void ext4_handle_error(struct super_block *sb) sb->s_flags |= SB_RDONLY; } else if (test_opt(sb, ERRORS_PANIC)) { if (EXT4_SB(sb)->s_journal && - !(EXT4_SB(sb)->s_journal->j_flags & JBD2_REC_ERR)) + !(EXT4_SB(sb)->s_journal->j_flags & JBD2_ABORT_FINISHED)) return; panic("EXT4-fs (device %s): panic forced after error\n", sb->s_id); @@ -701,7 +701,7 @@ void __ext4_abort(struct super_block *sb, const char *function, } if (test_opt(sb, ERRORS_PANIC) && !system_going_down()) { if (EXT4_SB(sb)->s_journal && - !(EXT4_SB(sb)->s_journal->j_flags & JBD2_REC_ERR)) + !(EXT4_SB(sb)->s_journal->j_flags & JBD2_ABORT_FINISHED)) return; panic("EXT4-fs panic from previous error\n"); } diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 1c58859aa592..eb5e60df0da4 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -2072,13 +2072,7 @@ int jbd2_journal_wipe(journal_t *journal, int write) * Two internal functions, which provide abort to the jbd layer * itself are here. */ - -/* - * Quick version for internal journal use (doesn't lock the journal). - * Aborts hard --- we mark the abort as occurred, but do _nothing_ else, - * and don't attempt to make any other journal updates. - */ -void __jbd2_journal_abort_hard(journal_t *journal) +static void __jbd2_journal_abort(journal_t *journal) { transaction_t *transaction; @@ -2096,8 +2090,33 @@ void __jbd2_journal_abort_hard(journal_t *journal) write_unlock(&journal->j_state_lock); } -/* Soft abort: record the abort error status in the journal superblock, - * but don't do any other IO. */ +/* + * Mark journal abort finished when the errno in the sb has been recorded + * or no need to record. + */ +static void __jbd2_journal_finish_abort(journal_t *journal) +{ + write_lock(&journal->j_state_lock); + journal->j_flags |= JBD2_ABORT_FINISHED; + write_unlock(&journal->j_state_lock); +} + +/* + * Quick version for internal journal use (doesn't lock the journal). + * Aborts hard --- we mark the abort as occurred, but do _nothing_ else, + * and don't attempt to make any other journal updates. + */ +void __jbd2_journal_abort_hard(journal_t *journal) +{ + /* Nothing need to be recorded, mark it as finished directly */ + __jbd2_journal_abort(journal); + __jbd2_journal_finish_abort(journal); +} + +/* + * Soft abort: record the abort error status in the journal superblock, + * but don't do any other IO. + */ static void __journal_abort_soft (journal_t *journal, int errno) { int old_errno; @@ -2116,14 +2135,11 @@ static void __journal_abort_soft (journal_t *journal, int errno) } write_unlock(&journal->j_state_lock); - __jbd2_journal_abort_hard(journal); + __jbd2_journal_abort(journal); - if (errno) { + if (errno) jbd2_journal_update_sb_errno(journal); - write_lock(&journal->j_state_lock); - journal->j_flags |= JBD2_REC_ERR; - write_unlock(&journal->j_state_lock); - } + __jbd2_journal_finish_abort(journal); } /** diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 603fbc4e2f70..870f7f2f912c 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1248,7 +1248,9 @@ JBD2_FEATURE_INCOMPAT_FUNCS(csum3, CSUM_V3) #define JBD2_ABORT_ON_SYNCDATA_ERR 0x040 /* Abort the journal on file * data write error in ordered * mode */ -#define JBD2_REC_ERR 0x080 /* The errno in the sb has been recorded */ +#define JBD2_ABORT_FINISHED 0x080 /* Abort finished, the errno + * in the sb has been recorded + * if necessary */ /* * Function declarations for the journaling transaction and buffer