Received-SPF: pass (google.com: domain of linux-kernel+bounces-161701-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Wu Bo <bo.wu@vivo.com>
To: Jaegeuk Kim <jaegeuk@kernel.org>,
	Chao Yu <chao@kernel.org>
Cc: linux-f2fs-devel@lists.sourceforge.net,
	linux-kernel@vger.kernel.org,
	Wu Bo <wubo.oduw@gmail.com>,
	Wu Bo <bo.wu@vivo.com>,
	Liao Yuanhong <liaoyuanhong@vivo.com>
Subject: [PATCH v2] f2fs: fix block migration when section is not aligned to pow2
Date: Sun, 28 Apr 2024 21:51:42 -0600
Message-Id: <20240429035142.706356-1-bo.wu@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?2b+WxJhnAIw2+7vMhujuH7mfNqswX18wLGSswyiELszv3aO6GGVdlzmy/hYh?=
 =?us-ascii?Q?elkCnE4gtbqmgqhIwuLGlfiZTyhVzHSP60GhJWdONnjB4s++BJimdieDp1q9?=
 =?us-ascii?Q?PtLi5WGBd6juK5HPq2lSuTg2pyO2CnixmRWCqeVqipLLdz8UPm/MEV4agMES?=
 =?us-ascii?Q?D70r6+gqLW0yCKzr9HLP7h8PDmwWkDg/qsG/tCCE35eoFeh4zoxoPsAhVizz?=
 =?us-ascii?Q?0p4yDKvrTpVAfXJf/FDaVRGhAarNySF8/fCJG6oTP7Y733LRh0YFvIkCBowp?=
 =?us-ascii?Q?pt17fkI/X7mllrB93VKW2sgzwBCNagQLq5m7Etae64VxSQo/XYo3+nBVJ4S9?=
 =?us-ascii?Q?YWfNZJwL9NiCPOf1avkUU+PgQq0tio0Z+gtKiWMcmoFiAAhJy+5q/VEorHQC?=
 =?us-ascii?Q?OV/UpCt1bIj2SgwzXfzqkwB5ZnQdmPnsS0OQV7ZcM0k11NTs7+M/Kf7n9KD8?=
 =?us-ascii?Q?wa6bx9vBHhsBZ4dws4qGtFL2BLoD2OuFp6jKDYlUmLTN0Wsmo647KMGuVQZh?=
 =?us-ascii?Q?KSDGnJpd5ugjkMbJfz6nn71lrvQ/90Y/83zXGm3290Ad39xD+HojP54xTba2?=
 =?us-ascii?Q?6lFkhxMYJTtvP0tayC82iepmsdxpQPksT06AGjVdCVZfeH8UAAQDgIeseNaL?=
 =?us-ascii?Q?P825Jc50PULcbcfbdOpEtA21+bIti32jkw/x6KW5vmUIJBoYoDZDFXqAWbvS?=
 =?us-ascii?Q?KaXvs2MC7xt/BkG8ZgJWgU38HORk7gyq/z67eNoEwHVwuo8B00/b+C1ei/Ki?=
 =?us-ascii?Q?5mdet5xjA9RShk4ZX/pLIoPsjDCibB4maATPfArSfWACT5AEk6ZbvfAkmar9?=
 =?us-ascii?Q?imobb1jBoHpqTj3Sqh0149UfDxOusTIv9XPFtS3zIqCOMwg9FHY2DmOOy+Xd?=
 =?us-ascii?Q?7H3hKCexkCJ+2DZhmEvG7/UFdKjwbnFJZA8cyyFs+OA+87DTbKXP9fi1qjrA?=
 =?us-ascii?Q?aLo3tFez8d5gz28V077FnNZCYWIIpPAXAuidIv/zdbIQDt8cZ4UcrvjGZDmY?=
 =?us-ascii?Q?Iu+V83wy6nqn0alns3JJemJ1EQArOJ6t4OyEPokLX7/fI0ZVfLev2jYMYhfe?=
 =?us-ascii?Q?b6Ke7VoEXc5rA7Y3G2chcjCAK+g1wD5UUP4vymCHojg8vwDYBHyGKHqEHRhL?=
 =?us-ascii?Q?8L1wcjykrJy9VwY2xnESQd8VCc+HKbWvuMunDK+LqGCbhgi+PkmcnJoc3PAC?=
 =?us-ascii?Q?A5CijzJIkKvWmoIHuRO0zpHgm425RwhGlMWoyMWcxRpeKtxi9CW6J2iQpFSD?=
 =?us-ascii?Q?XwvFAFwuf/PL6fSnG5Cw+5uTuiL68vus4QNZoESyHozWSdq+N6IUsx4Hp+Mi?=
 =?us-ascii?Q?lvfV94h3mg6Qnxuht+/t93UMEAea7QqU8UTBadISO7viI1HbjhqDpe7w2VzM?=
 =?us-ascii?Q?Ga3WMtPIh2wBCIUQ3Fo/p3szkusfrEn65XoKfwCwe77zpiSLy18yoFyVoLgS?=
 =?us-ascii?Q?8wRv+SQQiBi/kD3GvgtQFtk/m9SqhqiUdhW1aWPgQnmTq+Ckm+PokBeybxeu?=
 =?us-ascii?Q?DZu5nWJOMUWj3oHRnIKDj2Z9rBssUbrbUp3/iVkGZ1GtbwSOAoSojjPC0KiV?=
 =?us-ascii?Q?4NFbl2uktnN6J3qydNiO7fVBlOn1JJHEE7ZASudQ?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9b34974c-5086-4e6b-b760-08dc67fdde94
X-MS-Exchange-CrossTenant-AuthSource: PSAPR06MB4486.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 03:38:44.0175
 (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: +qDf0Vvq/CKIN9dKR/6VN/brz+0c267Ej70ozOE6pqZWGH/a2whxdDQhC2GWJq6XllMYkI5C1G2BH/DoSz9RtA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYUPR06MB6194

As for zoned-UFS, f2fs section size is forced to zone size. And zone
size may not aligned to pow2.

Fixes: 859fca6b706e ("f2fs: swap: support migrating swapfile in aligned write mode")
Signed-off-by: Liao Yuanhong <liaoyuanhong@vivo.com>
Signed-off-by: Wu Bo <bo.wu@vivo.com>
---
v2:
Fix arch-i386 build error.
https://lore.kernel.org/oe-kbuild-all/202404290041.jfIs3zkw-lkp@intel.com/
---
 fs/f2fs/data.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index bee1e45f76b8..6fd877c69c03 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3916,15 +3916,14 @@ static int check_swap_activate(struct swap_info_struct *sis,
 	struct address_space *mapping = swap_file->f_mapping;
 	struct inode *inode = mapping->host;
 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
-	sector_t cur_lblock;
-	sector_t last_lblock;
-	sector_t pblock;
-	sector_t lowest_pblock = -1;
-	sector_t highest_pblock = 0;
+	block_t cur_lblock;
+	block_t last_lblock;
+	block_t pblock;
+	block_t lowest_pblock = -1;
+	block_t highest_pblock = 0;
 	int nr_extents = 0;
-	unsigned long nr_pblocks;
+	unsigned int nr_pblocks;
 	unsigned int blks_per_sec = BLKS_PER_SEC(sbi);
-	unsigned int sec_blks_mask = BLKS_PER_SEC(sbi) - 1;
 	unsigned int not_aligned = 0;
 	int ret = 0;
 
@@ -3962,8 +3961,8 @@ static int check_swap_activate(struct swap_info_struct *sis,
 		pblock = map.m_pblk;
 		nr_pblocks = map.m_len;
 
-		if ((pblock - SM_I(sbi)->main_blkaddr) & sec_blks_mask ||
-				nr_pblocks & sec_blks_mask ||
+		if ((pblock - SM_I(sbi)->main_blkaddr) % blks_per_sec ||
+				nr_pblocks % blks_per_sec ||
 				!f2fs_valid_pinned_area(sbi, pblock)) {
 			bool last_extent = false;
 
-- 
2.25.1