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
Cc:     linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Yangtao Li <frank.li@vivo.com>,
        kernel test robot <lkp@intel.com>
Subject: [PATCH v2] f2fs: don't call f2fs_issue_discard_timeout() when discard_cmd_cnt is 0 in f2fs_put_super()
Date:   Fri,  2 Dec 2022 12:58:41 +0800
Message-Id: <20221202045841.9888-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?UntMt2PQpnMrLGb/swUfmTcgyzDpQCDrdlh7SslTWtvaWNCzsXc4pfwsHFnn?=
 =?us-ascii?Q?eySswJRzsRqR3ctS+k1sf65GYPHQEUfnVadMFGwHKr2kDbibUBviU2IBZjuT?=
 =?us-ascii?Q?vJG3DhwbaokmXSR1XPTUKBWHVq1fnMTsIwQY4tXWZwuweloRqskn1Y+bqc0s?=
 =?us-ascii?Q?EggmcIAUA+jnFLUdIMM/RhFWmaiQb2vggSaV9B13A6BNXiZ7fjZYgLBiJcAy?=
 =?us-ascii?Q?B1RwqWewx54f2KF+GZlu8wSA56Fd/m8ls1B+f1Ib9dQpN3I9eSv8IfhSCEMj?=
 =?us-ascii?Q?wmhsya6IuvQ/3o+ANYWj8PD0m+3eDDk2i74Z8DbWn9eUYzGYqgFiZrotvYCG?=
 =?us-ascii?Q?y1bYGX0UTFoCQwgoHpHBhxYsI4mU/I8kUVsPUVd1H869KTJU/FMurm5AaCZj?=
 =?us-ascii?Q?FDGuosWCVixdnICcdmIXmuEHNkfvHU9M1JI7q2aJYC/sIubceSAVjO1tv0AG?=
 =?us-ascii?Q?71dX0cDG9tB0n1hRJqG0LAHxBfN5SC3q/5B87T3yr78e0nqm54cJhsdERdvg?=
 =?us-ascii?Q?VrG5ClyEudT8FQoj7jopT+fGRE6ZqVXj1Fk+JyJe9VvgidNoz0CCdR4IvZ6+?=
 =?us-ascii?Q?B1X737wXZOdNN9JK77t+EnKyS24M9PyrZHIntOmHkJCGx/x55Q56GkViVTg5?=
 =?us-ascii?Q?u6/PoUQx0dUykSlfYp+RkXvHEfLMgtD/rpJgAi2BX7tgu4F4DA8k5IfcDaNv?=
 =?us-ascii?Q?wj8Up/nWxEfJG2Ab0LV0AruiNluP6Cs/Eobanku4PdI/k8bxax/hZz5w+Cr5?=
 =?us-ascii?Q?cGs215llL9EWPoUZbP+15e5ov+VejEubGQVu8udxBowCxC4aulLnFa9KNUOU?=
 =?us-ascii?Q?BVZ2ELzKHbLCkhd2Emh80YwyK84xE0sdconUL+sYZwmE83AGOBrDpviaGJgQ?=
 =?us-ascii?Q?SFipe3d5yAhjfabBGAJsXWx4engQ6cgBL7zLUnXxuMjs0drU0RjFd+NKZVjy?=
 =?us-ascii?Q?sGVEF2jpWT0OOYRY5dxPf0mlOlcW/rQezVyG+jum01OBYwiEzmmgWgqXXroN?=
 =?us-ascii?Q?zLwPpOz3i5MHOkiY86IjoVPsnOiL5OHX+nqXZ9PEu4j+WFvtXDaxxhOogwLb?=
 =?us-ascii?Q?O8ibBTysTGa305s+hwnxpSpMD5G0ERjCcrGCXtl5htTRAX838S/W1WUCgls4?=
 =?us-ascii?Q?aq6+ZZycloWOpskF2gXrGN6mhFuXuOOmOr78IwnTe1Ys5T0OzI7xneaFDDt6?=
 =?us-ascii?Q?aSkonY1Q2DZKkcuglianvNTUREcgnDO6AAGhJ+FwlmtGqE4rc0m0fIpjC7EJ?=
 =?us-ascii?Q?IJoEZ6U3sXwhFp2Pxv4EJq1MUDrJuSD3ssbqd+p6XfmcJbrVhfwBsyqOVs27?=
 =?us-ascii?Q?q81izYxJNGktwjVB3a8oKXUZ92+RytF0p5f1LFGxsjrxPMemgo5KXi1dftCY?=
 =?us-ascii?Q?5sJxhEaXL7EDs40hBWLERSC1LQguRLdaoxbneOwWwYE3am/yioSIRQZQIFDF?=
 =?us-ascii?Q?EA+ZSKQiDUbyFNdKPhBj/NXZhByZjjWlkXVwEtFq/THmED4WR/3GdtaC9jvC?=
 =?us-ascii?Q?6HrvvrCjxaTG72B9BEJnoPqWzt7fuxqsEp2Ct89gf6ow3tQtyWpN0pAzDKSH?=
 =?us-ascii?Q?loifbJOuXpEIjp8iCufi+pWlCxDIyEJMc9H8YpXb?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e73fb099-e42e-48e5-5db7-08dad421e868
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2022 04:58:52.6228
 (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: yyLxKyyoQn4BSbUG52srAb+XNqYqQf7WQ1EXRuVM0xWaMtQXnsVW0WzURgDLghITLQFI6Zk6v8mYDUdXrSjUIw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB4462
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

No need to call f2fs_issue_discard_timeout() in f2fs_put_super,
when no discard command requires issue. Since the caller of
f2fs_issue_discard_timeout() usually judges the number of discard
commands before using it. Let's move this logic to
f2fs_issue_discard_timeout().

By the way, use f2fs_realtime_discard_enable to simplify the code.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/segment.c | 6 ++++--
 fs/f2fs/super.c   | 8 ++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 9486ca49ecb1..d5f150a08285 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1655,6 +1655,9 @@ bool f2fs_issue_discard_timeout(struct f2fs_sb_info *sbi)
 	struct discard_policy dpolicy;
 	bool dropped;
 
+	if (!atomic_read(&dcc->discard_cmd_cnt))
+		return false;
+
 	__init_discard_policy(sbi, &dpolicy, DPOLICY_UMOUNT,
 					dcc->discard_granularity);
 	__issue_discard_cmd(sbi, &dpolicy);
@@ -2110,8 +2113,7 @@ static void destroy_discard_cmd_control(struct f2fs_sb_info *sbi)
 	 * Recovery can cache discard commands, so in error path of
 	 * fill_super(), it needs to give a chance to handle them.
 	 */
-	if (unlikely(atomic_read(&dcc->discard_cmd_cnt)))
-		f2fs_issue_discard_timeout(sbi);
+	f2fs_issue_discard_timeout(sbi);
 
 	kfree(dcc);
 	SM_I(sbi)->dcc_info = NULL;
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 79bf1faf4161..aa1cadfd34a5 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1576,8 +1576,7 @@ static void f2fs_put_super(struct super_block *sb)
 	/* be sure to wait for any on-going discard commands */
 	dropped = f2fs_issue_discard_timeout(sbi);
 
-	if ((f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi)) &&
-					!sbi->discard_blks && !dropped) {
+	if (f2fs_realtime_discard_enable(sbi) && !sbi->discard_blks && !dropped) {
 		struct cp_control cpc = {
 			.reason = CP_UMOUNT | CP_TRIMMED,
 		};
@@ -2225,7 +2224,6 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
 	bool no_discard = !test_opt(sbi, DISCARD);
 	bool no_compress_cache = !test_opt(sbi, COMPRESS_CACHE);
 	bool block_unit_discard = f2fs_block_unit_discard(sbi);
-	struct discard_cmd_control *dcc;
 #ifdef CONFIG_QUOTA
 	int i, j;
 #endif
@@ -2406,10 +2404,8 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
 				goto restore_flush;
 			need_stop_discard = true;
 		} else {
-			dcc = SM_I(sbi)->dcc_info;
 			f2fs_stop_discard_thread(sbi);
-			if (atomic_read(&dcc->discard_cmd_cnt))
-				f2fs_issue_discard_timeout(sbi);
+			f2fs_issue_discard_timeout(sbi);
 			need_restart_discard = true;
 		}
 	}
-- 
2.25.1