Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp1580360pxb; Mon, 12 Apr 2021 01:18:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3Gd9jlbHYejW7uJYShPx1yi8oQmhN2gIpxVedalDYWl95bndfhaWNnTSB4qooY9i1gAyg X-Received: by 2002:a17:906:144d:: with SMTP id q13mr27652445ejc.458.1618215534318; Mon, 12 Apr 2021 01:18:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618215534; cv=none; d=google.com; s=arc-20160816; b=O03MXzz8yPv4nOaz1qM1Fyu81v+3I2tg39lUgNqAreY6az3s/6e8EjyYf3XYto7Av5 1+ZJT9+1EyTMZN2bD6IqmjmqoPRD1vNo0y574d5Mx77APPLlEGCOZj/kS9VreDe/tfM2 ltcJ5hTfTLXtfCn2OKfRDxj4ZqCDilm9Ar2s60V36+7nPwFnWw2GFk80RhlsCjlUGV+C Npfx7tx3VfOm/JwDPFjjmH1kxZ3xPZS4HgC/L3gMCyWyHrcZQWXu5wSNjjnvHawZ7NKs 2KdjFMjOshgJ9aF6MrQWG6k5pfzYl7CSQm0B01XJ3h/Jeaxfw0/8IUnOpWZJPbQYiing o4Zg== 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 :message-id:date:subject:cc:to:from; bh=NOdckrqkvkG5f5MaVOsXnPdl6FJkuhspmSEks65DUD8=; b=y+fnmLgHfw4NwlpXMYkDOxwrVbUdAuiulVljst+AalDLnrGsjCyloVgkhsQSjrwbCc DkumwU/wp0i2/I85ebWmK6dAWGXRU2Hh022Bhv4tduDoNI+th8pA6xkyMLRBX+PxUidf KF7YN5McAL1GSNjoQThe78xcg7th3x4WOa/5tnd+FQfHA3T16oPMOfZQYPrj43BIy3wg LJmjKruXSArCVaJMeNG70x16eHBVF49fTMhlBX717BnQGALqq3itoKxANv7d+x0q7iJ/ 8sBYDkbbg0KOtj9OXd1KJTssq5aVxSXuJ5tgL2FxHuG8EsvOT00dPy4VyzJTAIT0V38V tdWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a21si6649047ejc.736.2021.04.12.01.18.31; Mon, 12 Apr 2021 01:18:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237202AbhDLIQO (ORCPT + 99 others); Mon, 12 Apr 2021 04:16:14 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:16899 "EHLO szxga06-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236973AbhDLIQN (ORCPT ); Mon, 12 Apr 2021 04:16:13 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4FJhMw1t9czkhbB; Mon, 12 Apr 2021 16:14:04 +0800 (CST) Received: from szvp000203569.huawei.com (10.120.216.130) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.498.0; Mon, 12 Apr 2021 16:15:44 +0800 From: Chao Yu To: CC: , , , Chao Yu , Yi Chen Subject: [PATCH v3] f2fs: fix to keep isolation of atomic write Date: Mon, 12 Apr 2021 16:15:12 +0800 Message-ID: <20210412081512.103592-1-yuchao0@huawei.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.120.216.130] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As Yi Chen reported, there is a potential race case described as below: Thread A Thread B - f2fs_ioc_start_atomic_write - mkwrite - set_page_dirty - f2fs_set_page_private(page, 0) - set_inode_flag(FI_ATOMIC_FILE) - mkwrite same page - set_page_dirty - f2fs_register_inmem_page - f2fs_set_page_private(ATOMIC_WRITTEN_PAGE) failed due to PagePrivate flag has been set - list_add_tail - truncate_inode_pages - f2fs_invalidate_page - clear page private but w/o remove it from inmem_list - set page->mapping to NULL - f2fs_ioc_commit_atomic_write - __f2fs_commit_inmem_pages - __revoke_inmem_pages - f2fs_put_page panic as page->mapping is NULL The root cause is we missed to keep isolation of atomic write in the case of start_atomic_write vs mkwrite, let start_atomic_write helds i_mmap_sem lock to avoid this issue. Reported-by: Yi Chen Signed-off-by: Chao Yu --- v3: - rebase to last dev branch - update commit message because this patch fixes a different racing issue of atomic write fs/f2fs/file.c | 3 +++ fs/f2fs/segment.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index d697c8900fa7..6284b2f4a60b 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -2054,6 +2054,7 @@ static int f2fs_ioc_start_atomic_write(struct file *filp) goto out; down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); + down_write(&F2FS_I(inode)->i_mmap_sem); /* * Should wait end_io to count F2FS_WB_CP_DATA correctly by @@ -2064,6 +2065,7 @@ static int f2fs_ioc_start_atomic_write(struct file *filp) inode->i_ino, get_dirty_pages(inode)); ret = filemap_write_and_wait_range(inode->i_mapping, 0, LLONG_MAX); if (ret) { + up_write(&F2FS_I(inode)->i_mmap_sem); up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); goto out; } @@ -2077,6 +2079,7 @@ static int f2fs_ioc_start_atomic_write(struct file *filp) /* add inode in inmem_list first and set atomic_file */ set_inode_flag(inode, FI_ATOMIC_FILE); clear_inode_flag(inode, FI_ATOMIC_REVOKE_REQUEST); + up_write(&F2FS_I(inode)->i_mmap_sem); up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); f2fs_update_time(F2FS_I_SB(inode), REQ_TIME); diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 0cb1ca88d4aa..78c8342f52fd 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -325,6 +325,7 @@ void f2fs_drop_inmem_pages(struct inode *inode) struct f2fs_inode_info *fi = F2FS_I(inode); do { + down_write(&F2FS_I(inode)->i_mmap_sem); mutex_lock(&fi->inmem_lock); if (list_empty(&fi->inmem_pages)) { fi->i_gc_failures[GC_FAILURE_ATOMIC] = 0; @@ -339,11 +340,13 @@ void f2fs_drop_inmem_pages(struct inode *inode) spin_unlock(&sbi->inode_lock[ATOMIC_FILE]); mutex_unlock(&fi->inmem_lock); + up_write(&F2FS_I(inode)->i_mmap_sem); break; } __revoke_inmem_pages(inode, &fi->inmem_pages, true, false, true); mutex_unlock(&fi->inmem_lock); + up_write(&F2FS_I(inode)->i_mmap_sem); } while (1); } @@ -468,6 +471,7 @@ int f2fs_commit_inmem_pages(struct inode *inode) f2fs_balance_fs(sbi, true); down_write(&fi->i_gc_rwsem[WRITE]); + down_write(&F2FS_I(inode)->i_mmap_sem); f2fs_lock_op(sbi); set_inode_flag(inode, FI_ATOMIC_COMMIT); @@ -479,6 +483,8 @@ int f2fs_commit_inmem_pages(struct inode *inode) clear_inode_flag(inode, FI_ATOMIC_COMMIT); f2fs_unlock_op(sbi); + + up_write(&F2FS_I(inode)->i_mmap_sem); up_write(&fi->i_gc_rwsem[WRITE]); return err; -- 2.29.2