From patchwork Thu Jan 11 08:17:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 187221 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp1300644dyi; Thu, 11 Jan 2024 00:18:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IEHoGE8NA0OLGX/8+ZsJnTLCWeoYg0r+v7MLC4bNxGX0QJ9gb+vNfK0XYoOqjA1vQCts/tY X-Received: by 2002:a05:6a20:7d9f:b0:199:a963:45a3 with SMTP id v31-20020a056a207d9f00b00199a96345a3mr823533pzj.66.1704961095535; Thu, 11 Jan 2024 00:18:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704961095; cv=none; d=google.com; s=arc-20160816; b=z4bw6AGITFo3dCJJguWQL8XQD6R8g9sgfSBVELf7PhzUY1RVXRrapeNrep0BRgBHJ2 gRlGZHg67V96UBdsVf9Og5RBFTHwKKqn3r4sA8qeMQRjdvy7GcLSrKxuSmj2MqF2OevQ 5NmNWVOCtB0H/xMeOzo97aoftIgD+eg8dn3Uq1zLaZQEXdJXcPPu6boDBCwMQ2ClIUIy Q6XTjeQ0U2eDaUJFhpWD0zshe/0yQOlsdYM5fe8+QH7CvlFBW0rSUSPxEvNNP1xdQIPZ 6nEZaKiIDS2F7MBTWzw74ZVBN9smt60QCqyt68y9q9zBv6sdm8kpCjmfgaAY8XGnLLnI KChw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=+o9UZgNV/Xh2d07BJWk2BTbyFjrpdtqzp5NxKlSBhdg=; fh=wvvOME7PCkTE7TmPFG6Lm9xZkOwlOFZ+q2Nu5YPd35I=; b=K63LX4njjDxj2bAnVcD+NRPkajbVoJkPzplf1UxBELl5AMvdJAYZUBA6TL/7rUKiYN 1nysUHThF/c9zy/93i47RHhI5Eqfh3lTKT58YXw4hpmXt89d8/gemrYFZgqXKemv7dI/ 6zveoT7IOaFvjF0EhLxrphA8sZBGgszaPxwoWTH6mbQtFPFp7OT7eMt83S+V3/1zOslu vkJ6o/VNPXVpNo595DTj784eMWsP3hE/gLjGRvA2lcmR5llLgMwzxe6+V+fhnjbhQqet vdG6oKqORZjs5OdhUTiiVZ1eBX1ip8rmP7hGT1wr/Kml3kCf8Xv42RxYa+u6AaWzjrcU e2oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=k20201202 header.b=PutPWzbt; spf=pass (google.com: domain of linux-kernel+bounces-23195-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-23195-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id cq13-20020a056a00330d00b006d9e3783cf4si592817pfb.52.2024.01.11.00.18.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jan 2024 00:18:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-23195-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=k20201202 header.b=PutPWzbt; spf=pass (google.com: domain of linux-kernel+bounces-23195-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-23195-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 4C1D0286D1B for ; Thu, 11 Jan 2024 08:18:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EC9F8DDB3; Thu, 11 Jan 2024 08:18:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PutPWzbt" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E092E545 for ; Thu, 11 Jan 2024 08:17:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00909C433C7; Thu, 11 Jan 2024 08:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704961079; bh=6/KBhRJKvbOmR2LyqIZkaOwcwJm2RpzWRnpJUkpAL8I=; h=From:To:Cc:Subject:Date:From; b=PutPWzbtL476sPg8chP7RJKKWMAj+mYS2f7POak1nJalGkex+UvOwOUwJ7wGjIPZ+ HTTazRqMpZIg+5qs0a1ykErqMwRq2LN6nrVK2Tfp8td8le5913ErcR4VV/9PRKUkfH tVGFe2xc57o64UYKfDwR2JcJ5q7mesWmu47yfPidp0FyibB0zYcSAiV0Di/YuLjcFM YcxA7mU9a/tV3N0NmMPaAkc0a+piApu9/Dd6L+iGdjca1cYMK6CHzmyVx6ULUGoY5T csAU/hTvog+6EBY3zGlivZYPtEMr/4yvpYroyjy92t/9TcKbc3/QfmKGLcIcyoVoVc QSH2xjPnBH97w== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu , Zhiguo Niu , Yunlei He Subject: [PATCH v3] f2fs: reduce expensive checkpoint trigger frequency Date: Thu, 11 Jan 2024 16:17:43 +0800 Message-Id: <20240111081743.2999210-1-chao@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787781285790916372 X-GMAIL-MSGID: 1787781285790916372 We may trigger high frequent checkpoint for below case: 1. mkdir /mnt/dir1; set dir1 encrypted 2. touch /mnt/file1; fsync /mnt/file1 3. mkdir /mnt/dir2; set dir2 encrypted 4. touch /mnt/file2; fsync /mnt/file2 .. Although, newly created dir and file are not related, due to commit bbf156f7afa7 ("f2fs: fix lost xattrs of directories"), we will trigger checkpoint whenever fsync() comes after a new encrypted dir created. In order to avoid such condition, let's record an entry including directory's ino into global cache when we initialize encryption policy in a checkpointed directory, and then only trigger checkpoint() when target file's parent has non-persisted encryption policy, for the case its parent is not checkpointed, need_do_checkpoint() has cover that by verifying it with f2fs_is_checkpointed_node(). Reported-by: Zhiguo Niu Tested-by: Zhiguo Niu Reported-by: Yunlei He Signed-off-by: Chao Yu --- v3: - Recently, Zhiguo Niu reported the same issue, so I repost this patch for comments. fs/f2fs/f2fs.h | 2 ++ fs/f2fs/file.c | 3 +++ fs/f2fs/xattr.c | 16 ++++++++++++++-- include/trace/events/f2fs.h | 3 ++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index e2e0ca45f881..0094a8c85f4a 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -279,6 +279,7 @@ enum { APPEND_INO, /* for append ino list */ UPDATE_INO, /* for update ino list */ TRANS_DIR_INO, /* for transactions dir ino list */ + ENC_DIR_INO, /* for encrypted dir ino list */ FLUSH_INO, /* for multiple device flushing */ MAX_INO_ENTRY, /* max. list */ }; @@ -1147,6 +1148,7 @@ enum cp_reason_type { CP_FASTBOOT_MODE, CP_SPEC_LOG_NUM, CP_RECOVER_DIR, + CP_ENC_DIR, }; enum iostat_type { diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 8198afb5fb9c..18b33b1f0c83 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -218,6 +218,9 @@ static inline enum cp_reason_type need_do_checkpoint(struct inode *inode) f2fs_exist_written_data(sbi, F2FS_I(inode)->i_pino, TRANS_DIR_INO)) cp_reason = CP_RECOVER_DIR; + else if (f2fs_exist_written_data(sbi, F2FS_I(inode)->i_pino, + ENC_DIR_INO)) + cp_reason = CP_ENC_DIR; return cp_reason; } diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c index f290fe9327c4..cbd1b88297fe 100644 --- a/fs/f2fs/xattr.c +++ b/fs/f2fs/xattr.c @@ -629,6 +629,7 @@ static int __f2fs_setxattr(struct inode *inode, int index, const char *name, const void *value, size_t size, struct page *ipage, int flags) { + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); struct f2fs_xattr_entry *here, *last; void *base_addr, *last_base_addr; int found, newsize; @@ -772,8 +773,19 @@ static int __f2fs_setxattr(struct inode *inode, int index, if (index == F2FS_XATTR_INDEX_ENCRYPTION && !strcmp(name, F2FS_XATTR_NAME_ENCRYPTION_CONTEXT)) f2fs_set_encrypted_inode(inode); - if (S_ISDIR(inode->i_mode)) - set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_CP); + + if (S_ISDIR(inode->i_mode)) { + /* + * In restrict mode, fsync() always tries triggering checkpoint + * for all metadata consistency, in other mode, it only triggers + * checkpoint when parent's encryption metadata updates. + */ + if (F2FS_OPTION(sbi).fsync_mode == FSYNC_MODE_STRICT) + set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_CP); + else if (IS_ENCRYPTED(inode) && + f2fs_is_checkpointed_node(sbi, inode->i_ino)) + f2fs_add_ino_entry(sbi, inode->i_ino, ENC_DIR_INO); + } same: if (is_inode_flag_set(inode, FI_ACL_MODE)) { diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index 7ed0fc430dc6..48f2e399e184 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -139,7 +139,8 @@ TRACE_DEFINE_ENUM(EX_BLOCK_AGE); { CP_NODE_NEED_CP, "node needs cp" }, \ { CP_FASTBOOT_MODE, "fastboot mode" }, \ { CP_SPEC_LOG_NUM, "log type is 2" }, \ - { CP_RECOVER_DIR, "dir needs recovery" }) + { CP_RECOVER_DIR, "dir needs recovery" }, \ + { CP_ENC_DIR, "persist encryption policy" }) #define show_shutdown_mode(type) \ __print_symbolic(type, \