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>
Subject: [PATCH] f2fs: init discard policy after thread wakeup
Date:   Fri, 18 Nov 2022 11:46:00 +0800
Message-Id: <20221118034600.59489-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?/Wvet8/UTZAKNB+n0e0mPo0ooJPkhGjwTZt674hQyG+n8yJJ4omZJRgYxo0G?=
 =?us-ascii?Q?Q60wFbqXsONsHEi7FPMp5aLaSmLHPCuoWvsa0XxHwqz0+fIW51+DcI8dx8GW?=
 =?us-ascii?Q?QGb5gih2r0kKBwQQNW3qBNZqtZGreeuwBXq6X08QE3mprAGUcHE3PZpXyR40?=
 =?us-ascii?Q?J3DKp1roAQTIhGMtw4RNpVe6TRA1Yt0yyj34TY9iY1vcUBPKfUUZN40IrALQ?=
 =?us-ascii?Q?saNpPlm/KuRLIUqYGt3LAlOo2bPr6ogCj3lcvf7nXgGL/tuMcLBsNFlsnCaF?=
 =?us-ascii?Q?+AiDyKbb/oxC/j95YBaNwCRhLhykgviqFUoTVpF6iJYfcQtFFPLui65oV96p?=
 =?us-ascii?Q?Vgl9XGa4zFXAdtiVU0F1KCnu5T+4QM/tQKVeHVDxz2fM4ZJ+0SlUnf0MquCZ?=
 =?us-ascii?Q?OsgxKS7AdAPVN3hioQ3mtYNE55GV84MByWEAaRQJ4+uMel+q4ZL3Q4FoA6Js?=
 =?us-ascii?Q?uN+4z6m0KLIxcDqMuyH/SoeEpl8f3fbEQnbAR5mTycRnn5/J9zXW/duE5ZX/?=
 =?us-ascii?Q?75kfP8y96WPvOb/5kc0YcTkpAVfN4EsQXpUW7prfQpb+cXFeTPFzrVn+Bwnj?=
 =?us-ascii?Q?kTUoCIOKYLno7t4SoPAb1wpEFzB8pcclAIT29Vn5WmODwIWWzjwfTTKiV0E1?=
 =?us-ascii?Q?L1Z3H0xMIqMhmoDWxNFaRroQBXLvljeySws7i+ONWckwWTKeYMyPMGz+bi/m?=
 =?us-ascii?Q?TWqW3nrq1URp0t48G56yx+BeXFwx9P35XJgOXL395JWddb0EThvDJXJRJJdM?=
 =?us-ascii?Q?+w5X+NbCLQ1tQI3fq8pDXwbCq1C76NEJI4gYTdGLxUzvrWfxGjrAKU9lBBeY?=
 =?us-ascii?Q?gVeU70uJzdB8EQyeLwr7texJS/RQe8DmLkWJZhaxIl2aqQhWT8VwZuv+vHzf?=
 =?us-ascii?Q?TbXbOF2o76FtpXRj6h0mc/tvro3AndzyRvE5kIDa+8mh8rM3AyhktG9fC/Yl?=
 =?us-ascii?Q?dTZ2mshqAaUzCSXpnPHD7dxdenCuy4ZDOJcvQDYfhhXJ8EjWJGEvEBUWgWaE?=
 =?us-ascii?Q?DOKZYHGDvev1jtMaWbCF326LGn36G4sdNXkzliQT5M42poBIzugKEe46fuD8?=
 =?us-ascii?Q?fPL3lhi9TGSP0qDn+xa8TzN7P8QFstXWR8IB0GmyBB41Cu78Q+VIKdgGsT4W?=
 =?us-ascii?Q?n/NuifQ6qYemUp+r05jE+yS837cMJO6XqDu+mFw0N0P14Z79uoQ9cmRHIoR/?=
 =?us-ascii?Q?cyLqohdQ308iASlo5VqlwLTULaX5+c0SocPk/NhUI3v3GTOnLXAtsM1i/++b?=
 =?us-ascii?Q?uhVrFv+9YgjTkzBY9h2R+zLUPehR5DeXXfOxEi2ypJoPUfYIZC+35XRkL51r?=
 =?us-ascii?Q?aBt//xdOt6GEYmMIcPvMBQ4nGCpKaD1myWOw8/Cl/YeFMSNTVoOS74P1xgk8?=
 =?us-ascii?Q?SVmxwz9Y+f+3rQ+w43K0kaXgGMKNC61g3sdnuofhqkhFOCEvz365LUwmOMKJ?=
 =?us-ascii?Q?aej5zZYiUt27W9Jo+i0+fRI4lQk33yh99DMnNs2we00040KrvaelbvZhyx7h?=
 =?us-ascii?Q?0u59rzroDdcWasyp7l2J4YOdIsGp//d/WLGEW3TsUxBO3QDyBYMQgqX492RH?=
 =?us-ascii?Q?jPxqYcwB8c/z7n3x28rfmWokPrENoi/pixpoWA2X?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fcebb4ab-c966-4e40-9cdd-08dac9176e2c
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2022 03:46:11.5579
 (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: agMobD3064iYJ1N3zy6r5b8uLzRrCni+Xrc+tuKMltbsZ8V3FaTf9daxBWBm5CAe2ScX5HVmT7txBi7PifksBA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB5204
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

Under the current logic, after the discard thread wakes up, it will not
run according to the expected policy, but will use the expected policy
before sleep. Move the strategy selection to after the thread wakes up,
so that the running state of the thread meets expectations.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/segment.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 8b0b76550578..609e90aa80c2 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1685,6 +1685,11 @@ static int issue_discard_thread(void *data)
 	set_freezable();
 
 	do {
+		wait_event_interruptible_timeout(*q,
+				kthread_should_stop() || freezing(current) ||
+				dcc->discard_wake,
+				msecs_to_jiffies(wait_ms));
+
 		if (sbi->gc_mode == GC_URGENT_HIGH ||
 			!f2fs_available_free_memory(sbi, DISCARD_CACHE))
 			__init_discard_policy(sbi, &dpolicy, DPOLICY_FORCE, 1);
@@ -1692,14 +1697,6 @@ static int issue_discard_thread(void *data)
 			__init_discard_policy(sbi, &dpolicy, DPOLICY_BG,
 						dcc->discard_granularity);
 
-		if (!atomic_read(&dcc->discard_cmd_cnt))
-		       wait_ms = dpolicy.max_interval;
-
-		wait_event_interruptible_timeout(*q,
-				kthread_should_stop() || freezing(current) ||
-				dcc->discard_wake,
-				msecs_to_jiffies(wait_ms));
-
 		if (dcc->discard_wake)
 			dcc->discard_wake = 0;
 
@@ -1713,12 +1710,11 @@ static int issue_discard_thread(void *data)
 			continue;
 		if (kthread_should_stop())
 			return 0;
-		if (is_sbi_flag_set(sbi, SBI_NEED_FSCK)) {
+		if (is_sbi_flag_set(sbi, SBI_NEED_FSCK) ||
+			!atomic_read(&dcc->discard_cmd_cnt)) {
 			wait_ms = dpolicy.max_interval;
 			continue;
 		}
-		if (!atomic_read(&dcc->discard_cmd_cnt))
-			continue;
 
 		sb_start_intwrite(sbi->sb);
 
@@ -1733,6 +1729,8 @@ static int issue_discard_thread(void *data)
 		} else {
 			wait_ms = dpolicy.max_interval;
 		}
+		if (!atomic_read(&dcc->discard_cmd_cnt))
+			wait_ms = dpolicy.max_interval;
 
 		sb_end_intwrite(sbi->sb);
 
-- 
2.25.1