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 v2 1/2] f2fs: fix gc mode when gc_urgent_high_remaining is 1
Date:   Tue, 25 Oct 2022 14:50:24 +0800
Message-Id: <20221025065025.35017-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?gQao9MpCOpmIC/yayS6K1nxvhQij/9GI7MRnsBcMy2B/Xa58YL+EP1WVOMKl?=
 =?us-ascii?Q?vxV3bb+xTIO3SpeYuHqszSmskenLwj2Nn46pOMb6dt5UcLnVVD0guRcAsyUR?=
 =?us-ascii?Q?dfspyNToB4n+PHNgXSUVeio7vNJXvkMp40Ul0wvfmuxFNIox3sBWTm9rgX88?=
 =?us-ascii?Q?v4fur1EhSDpE29Qaqxn0pvazQijRx8/Z8RhCKYm/vR/CkX7tcpIuoe1iGRC7?=
 =?us-ascii?Q?GvZIldo4VHnWGEeQX83dzccvyatxxInKPuCiOPEa2BS7jjZ4zypwNo3EWZCw?=
 =?us-ascii?Q?js0ccXc3ie1a+vkojkFwqYAvIBY6V53rtPAOccvwdHdzbi9erTrzGNx9M5zA?=
 =?us-ascii?Q?obcFre1M4WXG7knLg//kVOLGFyLX8wqLH8iBnoU4OrDPDIfXCwyMKGMTTeqT?=
 =?us-ascii?Q?6LMB6tSx+2PkX0aKoL7ikCq4XZ7q8kqY27Xbhk8JLyQ/WV+qlNe0a8UmBxyM?=
 =?us-ascii?Q?8RH0KC9zkxOqI2SP/u5EZ5n7SEW+iveXaXGYFc1uU0Fz4p2EN5jisqxyvcUN?=
 =?us-ascii?Q?iQnpTUoR0kMQ2yZPxMfJJh2RYGYHWBRcuB3JrVawAeW9NZkPsTOk5XKgsjsJ?=
 =?us-ascii?Q?FMzJsx4Gg+Ca7YjEoEhAiSnmGSIdK4ckgLSiW3tOQhWJadnUPkbwAyj0JyON?=
 =?us-ascii?Q?FkeUgsBoHHyrb9cwLJ3hoUpsEyCCEZrf3DYR76giNTrr1/6gyO3fQP3bIPGC?=
 =?us-ascii?Q?JYMHquIxDpaiEDx0rrA9y2H1145z9wU1NDQFIA6wLKU0Ii6s5JWq4YwUA75/?=
 =?us-ascii?Q?XN1Pyuw/5qCnzIxp61EbmxKh8d4eIyHK8XjOLnvDFXCn79U/d6bE/WGKsexe?=
 =?us-ascii?Q?evPumHBHAqFR8hcmrPML2Xlz9O03tP9MmK4NzrK8bzMAsudpTycAFx0KHxc/?=
 =?us-ascii?Q?5+/DiRUEXGE6dt4rFb42278Etpxxzj/bHZ+/5Ea8ER0J+Nww2BMzQMr8qW4+?=
 =?us-ascii?Q?oDn8Gb4astwLcjYQXXb5sPYdT/XB+fJvzv0BdLPWjJq4mMNMX+XAA43EVF3m?=
 =?us-ascii?Q?c0sXybYYZxAhrJzpd4deroLqPAyiWryvNjyxWMRK4g/bswM2ymQ/01NFR2Yp?=
 =?us-ascii?Q?DhKWCMWI4pmrEW/Dnhw4yN8D0UOHmfMvrQELF223Hqvg2eJiZx6rgK0883aq?=
 =?us-ascii?Q?kavLT9yeotNDdNux1v54L2cnF7tqFL7vx06+aqg9jlwMMXM3SYLKLNsPo/k8?=
 =?us-ascii?Q?SyQ4+/Jz3S/jGpyY6kwMWHCvcYppGrbMSCKnRN3MGgJO4fhO2sdAjvsivohi?=
 =?us-ascii?Q?Xr6WrIu9fo6pAL4zLu2JRFPQF4DPr2RgeWImrjFeociXDlMw7PtY+K/03ZCv?=
 =?us-ascii?Q?RO12Og3ysIAyi5nBeysN3xKifkycJYDDoT4dHX8jFUxS2uKPw9EehGin2JDB?=
 =?us-ascii?Q?6GJWeXxvKeGaL3hwFrmESJ/NxI3XK9iLRRX9bB4IIQEMpJ/bJJyFcluK28co?=
 =?us-ascii?Q?rJI9sklu2hMXq7nYMc/RQg7NifZGHOkf4DcNRtALcJ+0CzD6n+dnLG+z19mv?=
 =?us-ascii?Q?x3hnB4LuSYK1yItpPp6dcPFg+YLUjPIIiCigaz/EM4qDQN7GU4anFR/KRRdI?=
 =?us-ascii?Q?Fk5rVZDYtzac4WbzGb3q/wV2mVxdzxxZ5jDxSDgt?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 23d3b9ec-fd59-4512-2f21-08dab65539e5
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 06:50:38.7861
 (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: x9mhJ53lKDjb+N1zBJJlJkYXMWlT5TJLo1ifgfs7MQ56L/+Jj3rhSdkggihPMNdebXAuMkfAzdch3t29Use7pg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB4144
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,URIBL_BLOCKED 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, when gc_urgent_high_remaining is set to 1,
the mode will be switched to normal at the beginning, instead of
running in gc_urgent mode.

Let's switch the gc mode back to normal when the gc ends.

Fixes: 265576181b4a ("f2fs: remove gc_urgent_high_limited for cleanup")

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

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 4546e01b2ee0..e0ff99c7e3f2 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -96,16 +96,6 @@ static int gc_thread_func(void *data)
 		 * invalidated soon after by user update or deletion.
 		 * So, I'd like to wait some time to collect dirty segments.
 		 */
-		if (sbi->gc_mode == GC_URGENT_HIGH) {
-			spin_lock(&sbi->gc_urgent_high_lock);
-			if (sbi->gc_urgent_high_remaining) {
-				sbi->gc_urgent_high_remaining--;
-				if (!sbi->gc_urgent_high_remaining)
-					sbi->gc_mode = GC_NORMAL;
-			}
-			spin_unlock(&sbi->gc_urgent_high_lock);
-		}
-
 		if (sbi->gc_mode == GC_URGENT_HIGH ||
 				sbi->gc_mode == GC_URGENT_MID) {
 			wait_ms = gc_th->urgent_sleep_time;
@@ -162,6 +152,15 @@ static int gc_thread_func(void *data)
 		/* balancing f2fs's metadata periodically */
 		f2fs_balance_fs_bg(sbi, true);
 next:
+		if (sbi->gc_mode == GC_URGENT_HIGH) {
+			spin_lock(&sbi->gc_urgent_high_lock);
+			if (sbi->gc_urgent_high_remaining) {
+				sbi->gc_urgent_high_remaining--;
+				if (!sbi->gc_urgent_high_remaining)
+					sbi->gc_mode = GC_NORMAL;
+			}
+			spin_unlock(&sbi->gc_urgent_high_lock);
+		}
 		sb_end_write(sbi->sb);
 
 	} while (!kthread_should_stop());
-- 
2.25.1