Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
Message-ID: <CY8PR05MB9378AAC222D4298DE011ED6BCDF0A@CY8PR05MB9378.namprd05.prod.outlook.com>
Date:   Wed, 13 Sep 2023 09:38:01 +0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.0
Subject: [PATCH V3] xfs: use roundup_pow_of_two instead of ffs during
 xlog_find_tail
Content-Language: en-US
From:   Wang Jianchao <jianchwa@outlook.com>
To:     djwong@kernel.org
Cc:     linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org
References: <63b3742c-0efe-c096-c737-a0e0419480bd@outlook.com>
 <59dd15dd-5b35-871d-6d3a-ec779975b089@outlook.com>
In-Reply-To: <59dd15dd-5b35-871d-6d3a-ec779975b089@outlook.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: CY8PR05MB9378:EE_|SJ0PR05MB7801:EE_
X-MS-Office365-Filtering-Correlation-Id: 1a4d7f4d-950c-4bde-b3ff-08dbb3fa436f
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: rZaDU6nr2nZxd9aug41VZGrpZPKPUUsDRfSICTSWd60z/302xLXQpTRqgL98F0vOKdlKax1VIQdD02Zivog2tVE2544k4yxBJ2R6/k3m19asuBigiaI6AYefZL9i7otWHSLZqBWWBsOoMhYZvMP8OXWunAfGmlhWBuXFW8IHAlR6KnGtDV+1ub7HQY9i5L0G+xoVPimXGvoBErygBEZMUIJ5pgKaOLoXJfGR+nhZ0wlt+/D3V76bOi13WySzf+tA6tGLITb5rg7PvtC9u0K7+drKkN4EPTNVIGSaaf6tpcVOZI4EsmLuu4dNO68rN7GnBenSo7dBo4rFwjwa796e3IlfRSMA1JFssh6Ror4WxXtSZIj3toS5/F+/NMhzDi1/Ez4iPxBENRLpQ7M4NeSZgFrwMKVyC9bLKvvDG2GDx/Iy9Y2hhuKIalHUFsF2YL4+W6HLUyBYGIbc2cJ5rglLmKBMidn7rzD/Gc3aA/X/0Zk22UZjrJejrk5NeNaNLqVgWoCzOJlxb2giPJXjJRtnnO8MbHkrEdtzbeAjKP17ZEPnGw7f4RYODww3tB2f+Cpj
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Tk8xMktjQ0lmVTFXcWhPbXdwbWVDTUVxb0t3REo0MjdNMjVwT2RubUY0NFdo?=
 =?utf-8?B?bHRoV01ielBvTkdZb0JmcnJnSzBUeVBkcnZVZjhJVmlLbzVubmpKMDJidTdU?=
 =?utf-8?B?bDIzTEJhMk1ZV0EveVlQTkRXeW03ZFhoVTZoWjFzR0NSYWF2ZXVEVXY5aHFJ?=
 =?utf-8?B?ZkIrRVhXbTlrNy9sSDRXWGwwZGFwTUE5NHlEUVZBcms3c3l2NkdENW5CZ0Y4?=
 =?utf-8?B?d0xOYzRRTytJQlpTRDZEMnREaXRaV0hlaGFQZE9JK3BRRFFLaEdrT005aEYz?=
 =?utf-8?B?TEY2dUgreE5UMlBWWVc0QStoZ2c4ZmRoelVPM2JnVXQ2M2hFQWlTVzNTRFpa?=
 =?utf-8?B?MVJaOXBteFlpVzQzL0E0RnZFTm0vV3FQcWNKNVoyMmdTUi9QQjd5T1FQU21m?=
 =?utf-8?B?WUY0WGZFUTlwSnRNdlFqRzd6TWIzTmdWOVJrcDNxYkJlM3RNUm50VGhqYkJQ?=
 =?utf-8?B?VTVRcE52VUJZdUI0M2UydW10YVcxbDlwenBITWI2QVc1M3d1SVNwUS92SHRw?=
 =?utf-8?B?T1hwSEMrdHdyQnprLzZjcmE4L2ZHU2xBaXF1MzU5MTV6WUpmL3lSbFc2NWRn?=
 =?utf-8?B?R1V5RXlNQTUxNFZza0FpdkFUY29abHNOVzcyQnJIWFNMcGVDUXZ2RWxlWnJ0?=
 =?utf-8?B?R3JWZjlEU0trbTIwQ0ZGNUJGdkxhQlNCaVQ5dC9RVEJtN2pRQ1N5TS9Uc0lw?=
 =?utf-8?B?SkVEWG84ZFlndEJWMEZxUDF0OHU3NXBoWmp1ZGU1aDRrd0lxTkJaSjBJaVNu?=
 =?utf-8?B?eDIwcUdwczIrWjkvRWpQbFZIL1JCNXVkN1Yrbk1aQitJeW5haVAzYnpzTjYr?=
 =?utf-8?B?SlUrZ3BxNEt4YVVpRklaeHNwTGN6WDJIODJsNlROcHJSL21PRENTSWlXZU5I?=
 =?utf-8?B?cnltSFlNRlpjSlNScVM5b0h4SXVzUHJwck0zMm9jS1B6WmNGd3praUJpRDRS?=
 =?utf-8?B?MzZwa2xpZ0pQOFF2WFJGc3lReVJ4NG1jT3VwTFI0QUM2WmpGZUkzK29BME4r?=
 =?utf-8?B?NFVBRWZkMjJxa3Ftdlp6K2RDMkxSNW9KblFaQXlPVzFFbFpoa3N4ZU8xblVI?=
 =?utf-8?B?MGlvVjdsMWk5a3pwZ0dibGJwam9jYkxaU3c3M1F4S0kzSmY4WnBNcTZtUGxD?=
 =?utf-8?B?SDJzeVVEdzhpb1VxOXNvNFhBWXZVdkRFUERCK3RyNUUybUpNa0JUc3d5WFd1?=
 =?utf-8?B?d0JXU0tLMEtZWWtwNXJRcTdVNEtYN1pEQnp4SUlkNC9RZUFXOGJ5aDYrS3BP?=
 =?utf-8?B?NG9IVXB1b1d2SVdvb3N4bjVuQnBiVHBhbTZCenhNZWZjNlVmd1o4MXpwR0t1?=
 =?utf-8?B?ZHZYWGNackFOSXZWOXRyWE15aXpaWW50NkpVYjU0eEo1SjhVN2MrUlB6R3p3?=
 =?utf-8?B?L2VCVXdTamNFQjlwZUt5akxiY0VUWDZwOGVZRlpjeGRoTXNmYmRjSkxvcG4y?=
 =?utf-8?B?RjJkR2toQlh3Kzl6YkN2TGlvb2hEYmRYeHlIbm5qV1pYK0wwaU9yQnRhVllm?=
 =?utf-8?B?YzBNUmh4NWVzcVJVNEFkNVNTSy9NMVJBSi8vUDV2c2RibUpMMThza3NYWEdH?=
 =?utf-8?B?WG9NM0k5d09qVm40ODZFdHVJamxBZUlMdUppNnBBekREUEdVaUs0bGFnem1i?=
 =?utf-8?Q?uGitnokdT6GjfGx6zEPtlq8x9BWqzlQDdeIdWADtL3YM=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1a4d7f4d-950c-4bde-b3ff-08dbb3fa436f
X-MS-Exchange-CrossTenant-AuthSource: CY8PR05MB9378.namprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2023 01:39:26.3027
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR05MB7801
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 12 Sep 2023 18:39:35 -0700 (PDT)
X-Spam-Status: No, score=1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,FORGED_MUA_MOZILLA,FREEMAIL_FORGED_FROMDOMAIN,
	FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email


In our production environment, we find that mounting a 500M /boot
which is umount cleanly needs ~6s. One cause is that ffs() is
used by xlog_write_log_records() to decide the buffer size. It
can cause a lot of small IO easily when xlog_clear_stale_blocks()
needs to wrap around the end of log area and log head block is
not power of two. Things are similar in xlog_find_verify_cycle().

The code is able to handed bigger buffer very well, we can use
roundup_pow_of_two() to replace ffs() directly to avoid small
and sychronous IOs.

Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Wang Jianchao <wangjc136@midea.com>
---

Changes in V2:
 - Move change log below "---"
 - Add reviewed-by Dave Chinner tag

Changes in V1:
 - Also replace the ffs in xlog_find_verify_cycle()

 fs/xfs/xfs_log_recover.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 82c81d20459d..13b94d2e605b 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -329,7 +329,7 @@ xlog_find_verify_cycle(
 	 * try a smaller size.  We need to be able to read at least
 	 * a log sector, or we're out of luck.
 	 */
-	bufblks = 1 << ffs(nbblks);
+	bufblks = roundup_pow_of_two(nbblks);
 	while (bufblks > log->l_logBBsize)
 		bufblks >>= 1;
 	while (!(buffer = xlog_alloc_buffer(log, bufblks))) {
@@ -1528,7 +1528,7 @@ xlog_write_log_records(
 	 * a smaller size.  We need to be able to write at least a
 	 * log sector, or we're out of luck.
 	 */
-	bufblks = 1 << ffs(blocks);
+	bufblks = roundup_pow_of_two(blocks);
 	while (bufblks > log->l_logBBsize)
 		bufblks >>= 1;
 	while (!(buffer = xlog_alloc_buffer(log, bufblks))) {
-- 
2.34.1