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;
From:   Yangtao Li <frank.li@vivo.com>
To:     jaegeuk@kernel.org, chao@kernel.org, corbet@lwn.net
Cc:     linux-f2fs-devel@lists.sourceforge.net, linux-doc@vger.kernel.org,
        linux-kernel@vger.kernel.org, willy@infradead.org,
        Yangtao Li <frank.li@vivo.com>
Subject: [PATCH v2] f2fs: support fault injection for flush submission error
Date:   Thu, 10 Nov 2022 11:25:22 +0800
Message-Id: <20221110032522.64043-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5lYxO9JImWUds3TtxWFzYI2DqoeOiD4aDJyIFChmuvmdyDzB9+6CbuVgrJEv?=
 =?us-ascii?Q?Qaai40l0sD1YCKdggxTW2H6cPOg4ocQmfK9hdgwMCc+60wG19yXSzgJCaNXH?=
 =?us-ascii?Q?cjV0mlpytDEQ8tcfhDB8iuu+AAPxesMIuQArTXBL9gTJSVGdKUDc8jgdRRbA?=
 =?us-ascii?Q?WEoa297XQeMePfLkUoFrJybFL+h0nAksuCTJfpuVMV95jHqCidKJHaRm9K48?=
 =?us-ascii?Q?6l7kGGfS4ozSQGY6m+J0RKlw1OSWxY9Bx93OsnskI3X9HBfhgIC0gSfA8WFi?=
 =?us-ascii?Q?31PScIzukrfyz2B8z8jeafjrSG3ia7mesMeWsqPlC3Ia0PUTGZkeCbh2t+/2?=
 =?us-ascii?Q?J5IoZ9bWs5p1SJz0gLUxaZhYeP0R2AgYBZHbHG6R0Oqv/ZmG5KwWUER9fRu4?=
 =?us-ascii?Q?MHO9+e1N5+/FjS4R9WYtX425jM/F5q3pgJNVr+YwDyzNlwnVj5/SaBlAooAU?=
 =?us-ascii?Q?T+hYIoqWftjxJMUJtoinBuWs3WdCupvYgMd4qxtanDlniGZD/m1FspV8flAr?=
 =?us-ascii?Q?shpOQDerS+41aa6b33feIiDwmDCXHZsmZyhtB4p+k+AzhpJlI2nAmxZGuOPU?=
 =?us-ascii?Q?6MhVjIp9TYWLiJ/+yQZqjOTN/mzKKnxYObImRidLNmyg6oSIINIU+bNSbxuR?=
 =?us-ascii?Q?STPsO14YSyzK138hW/fGaZz07jqd1PeTS8LMCJWEzNNWdjNEVEN0Z3vAKYik?=
 =?us-ascii?Q?mK3lxd9Uxr1x5UZBR36ZdlikpcUvoCJwIDNFAfHHwa7czxEd4OXp8Q7HR6nb?=
 =?us-ascii?Q?2nxYA0YP0e3L7kQRxFYEOzNsE5igCkQR5zwAIqncHYHiZcEsmY1SLwwyQN3t?=
 =?us-ascii?Q?TtIkM0uSDLa4GtzENYkTNLCzPAeuSme1Vzirak8vqsfylq89ib8mRcZ56e6E?=
 =?us-ascii?Q?UcMmWcI/cGFYQZtUwyg9hjL0lI5k0ec9LzqEJ0YLlXxbKo3wV3+koVc5i7Ls?=
 =?us-ascii?Q?kUAV6L+QrFkR6VpJgSFotIUtcYc+jWuAl+/0RXiGLIMXTC5UUCo/zlOu8ejW?=
 =?us-ascii?Q?E4dAuBAQVN2MdHKK7HW9eeOhoXCLgmFwnLlaXb4987hJD3K87IhFzSgtAglv?=
 =?us-ascii?Q?Bqi+0iFeG7CQjDaUnwlW1rURCTyJQKfWelYnAMm77RxXWi6j/pzTsKRkpOtl?=
 =?us-ascii?Q?p3Alug1B8kSWzUS0ZR8OuMPvtTkgqR4JXPIptnRIa6v0xIjVOE/a7QCI7KpV?=
 =?us-ascii?Q?3gu1i4lNRlfJO3XbYjej8ggYLaWthl/ZFTBGe0zMyjResHgbGUQPkczIp666?=
 =?us-ascii?Q?ndny/G7r+J5N/eDLhDsP6LbBFk1TB3kO4QJZAjfOJ42278YtIlv0TNGXpeRQ?=
 =?us-ascii?Q?uxWDDIBgsKWgfLgv1MovmG9siDpplgUeLHiGGq+VIrqfxZO/x5GH+2D+ELZ9?=
 =?us-ascii?Q?H7CykWzCrCDu6edDb7XnqFv7XyZn3nbCYGYwmCdHaDVdVT84JFbEeupa0KhS?=
 =?us-ascii?Q?AI4/xjqpbq9rY/LbAU16xzzbqZGKmzths7EfwRokjM5PZ6kRTq/V3pzF1NUw?=
 =?us-ascii?Q?o7akQyJ4kkjHGqreuq6abB3RxnNapllqcRKiHHcx0nF8Pw8mqCQiEpgcfxnt?=
 =?us-ascii?Q?yBXupPqRpMg4T4nXm4gaqQLWdoEpO9uRw/2FglzI?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 529480b5-a492-4878-b677-08dac2cb3a27
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2022 03:25:33.8051
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: AHXSvxqmeNW9cq/qzaRR26W6FIG2+JQeyxhltzXPMIOB7hhGiZJmwZLQOCG8zP6B12sEDxG3Hoj55rSMIem/3Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4588
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Since we now support read, write, and discard in FAULT_INJECT,
let's add support for flush.

This patch supports to inject fault into __submit_flush_wait() to
simulate flush cmd io error.

Usage:
a) echo 524288 > /sys/fs/f2fs/<dev>/inject_type or
b) mount -o fault_type=524288 <dev> <mountpoint>

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 Documentation/filesystems/f2fs.rst |  1 +
 fs/f2fs/f2fs.h                     |  1 +
 fs/f2fs/segment.c                  | 12 +++++++++---
 fs/f2fs/super.c                    |  1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst
index 6e67c5e6c7c3..316d153cc5fb 100644
--- a/Documentation/filesystems/f2fs.rst
+++ b/Documentation/filesystems/f2fs.rst
@@ -202,6 +202,7 @@ fault_type=%d		 Support configuring fault injection type, should be
 			 FAULT_DQUOT_INIT	  0x000010000
 			 FAULT_LOCK_OP		  0x000020000
 			 FAULT_BLKADDR		  0x000040000
+			 FAULT_FLUSH		  0x000080000
 			 ===================	  ===========
 mode=%s			 Control block allocation mode which supports "adaptive"
 			 and "lfs". In "lfs" mode, there should be no random
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 04ef4cce3d7f..832baf08ecac 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -61,6 +61,7 @@ enum {
 	FAULT_DQUOT_INIT,
 	FAULT_LOCK_OP,
 	FAULT_BLKADDR,
+	FAULT_FLUSH,
 	FAULT_MAX,
 };
 
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index aa4be7f25963..a4813fa33c0f 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -486,7 +486,13 @@ void f2fs_balance_fs_bg(struct f2fs_sb_info *sbi, bool from_bg)
 static int __submit_flush_wait(struct f2fs_sb_info *sbi,
 				struct block_device *bdev)
 {
-	int ret = blkdev_issue_flush(bdev);
+	int ret;
+
+	if (time_to_inject(sbi, FAULT_FLUSH)) {
+		f2fs_show_injection_info(sbi, FAULT_FLUSH);
+		ret = -EIO;
+	} else
+		ret = blkdev_issue_flush(bdev);
 
 	trace_f2fs_issue_flush(bdev, test_opt(sbi, NOBARRIER),
 				test_opt(sbi, FLUSH_MERGE), ret);
@@ -1126,13 +1132,13 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 		if (time_to_inject(sbi, FAULT_DISCARD)) {
 			f2fs_show_injection_info(sbi, FAULT_DISCARD);
 			err = -EIO;
-			goto submit;
+			goto skip;
 		}
 		err = __blkdev_issue_discard(bdev,
 					SECTOR_FROM_BLOCK(start),
 					SECTOR_FROM_BLOCK(len),
 					GFP_NOFS, &bio);
-submit:
+skip:
 		if (err) {
 			spin_lock_irqsave(&dc->lock, flags);
 			if (dc->state == D_PARTIAL)
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index a43d8a46a6e5..3d3d22ac527b 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -62,6 +62,7 @@ const char *f2fs_fault_name[FAULT_MAX] = {
 	[FAULT_DQUOT_INIT]	= "dquot initialize",
 	[FAULT_LOCK_OP]		= "lock_op",
 	[FAULT_BLKADDR]		= "invalid blkaddr",
+	[FAULT_FLUSH]		= "flush error",
 };
 
 void f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned int rate,
-- 
2.25.1