From patchwork Thu Dec 20 09:22:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Yi X-Patchwork-Id: 1016688 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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 43L5mm5VWgz9sCh for ; Thu, 20 Dec 2018 20:19:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729726AbeLTJTT (ORCPT ); Thu, 20 Dec 2018 04:19:19 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:57963 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725795AbeLTJTT (ORCPT ); Thu, 20 Dec 2018 04:19:19 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id C3A34D95B7D52; Thu, 20 Dec 2018 17:19:15 +0800 (CST) Received: from huawei.com (10.90.53.225) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.408.0; Thu, 20 Dec 2018 17:19:07 +0800 From: "zhangyi (F)" To: CC: , , , , Subject: [PATCH v2 1/2] ext4: fix race when setting the bitmap corrupted flag again Date: Thu, 20 Dec 2018 17:22:20 +0800 Message-ID: <1545297741-49408-1-git-send-email-yi.zhang@huawei.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [10.90.53.225] X-CFilter-Loop: Reflected Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Commit 9af0b3d12577 "ext4: fix race when setting the bitmap corrupted flag" want to fix race between setting inode/block bitmap corrupted flag and reducing free group inodes/clusters counter to prevent multiple frees. But ext4_test_and_set_bit() will invoke __test_and_set_bit() which is non-atomic, so the race is still there. Fix this by invoke test_and_set_bit() instead. Fixes: 9af0b3d12577 ("ext4: fix race when setting the bitmap corrupted flag") Cc: stable@vger.kernel.org Signed-off-by: zhangyi (F) Reviewed-by: Wang Shilong --- Change since v1 - add CC stable tag as shilong suggested. fs/ext4/ext4.h | 6 ++++++ fs/ext4/super.c | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 3f89d0a..755ba14 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2888,6 +2888,12 @@ struct ext4_group_info { (test_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &((grp)->bb_state))) #define EXT4_MB_GRP_IBITMAP_CORRUPT(grp) \ (test_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &((grp)->bb_state))) +#define EXT4_MB_GRP_TEST_AND_SET_BBITMAP_CORRUPT(grp) \ + (test_and_set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, \ + &((grp)->bb_state))) +#define EXT4_MB_GRP_TEST_AND_SET_IBITMAP_CORRUPT(grp) \ + (test_and_set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, \ + &((grp)->bb_state))) #define EXT4_MB_GRP_WAS_TRIMMED(grp) \ (test_bit(EXT4_GROUP_INFO_WAS_TRIMMED_BIT, &((grp)->bb_state))) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 53ff6c2..5b83765 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -798,16 +798,14 @@ void ext4_mark_group_bitmap_corrupted(struct super_block *sb, int ret; if (flags & EXT4_GROUP_INFO_BBITMAP_CORRUPT) { - ret = ext4_test_and_set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, - &grp->bb_state); + ret = EXT4_MB_GRP_TEST_AND_SET_BBITMAP_CORRUPT(grp); if (!ret) percpu_counter_sub(&sbi->s_freeclusters_counter, grp->bb_free); } if (flags & EXT4_GROUP_INFO_IBITMAP_CORRUPT) { - ret = ext4_test_and_set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, - &grp->bb_state); + ret = EXT4_MB_GRP_TEST_AND_SET_IBITMAP_CORRUPT(grp); if (!ret && gdp) { int count;