Received-SPF: pass (google.com: domain of linux-kernel+bounces-159868-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
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] f2fs: fix block migration when section is not aligned to pow2
Date: Fri, 26 Apr 2024 04:41:56 -0600
Message-Id: <20240426104156.321701-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?1DdmpUaanuFBF3l/+UB+XO0C3Krqrf83f+PePuFzvIXJpY46by5DPl/acwAB?=
 =?us-ascii?Q?VPGB+D/qEigywW/bvsvmUdLqrUWhmohhNfzzdcOAXNvrS+jkhk5WY74kiSkR?=
 =?us-ascii?Q?hIzB52SMxGv83pDcbznrLSj9oDnhXMSSN/q7duQ/X36vpPuHMnL8lgkwVWyN?=
 =?us-ascii?Q?CE+XqipVDafNof4oVoOFHdudElzGTB9VKlUNJQbfcvLe6FgWpwTx6+WnO7fV?=
 =?us-ascii?Q?u8i9tpM/lsUR32lCwwgBb4L/C8H+jY5APP3q6qVTywu6bdfuvaEtXy1ugr4V?=
 =?us-ascii?Q?GRtt4sMsWQm4Z2onRrIiQWrb8LarFyqZx4WmaEgfK4wHd+h/YptAdgZwQrze?=
 =?us-ascii?Q?2YxoBWLN3A5aEAXAwc1Y1NLopEoGi+wMWi/RIYqvpPHa9dekdukEe0IAFrpP?=
 =?us-ascii?Q?lRftfFOPOGVEUj573d5se9SJ8TndVIn1XfkB0qtLoWc5eX8baY3JMR4hQYfM?=
 =?us-ascii?Q?8KPn3U1MBpWySG2kVtJbkH1jGd87uTnRaWo3BhfbYBupCW8CaWtSAD0x/dwL?=
 =?us-ascii?Q?dPjnWnBya/kq/RonN3vhPDOenqAqegA/CJDkSo3mBTFSNVXRuaqi+F/TTz3i?=
 =?us-ascii?Q?uCg2vgosvP06d0WGDBIvzPvkAcYjJjG6G6ImSjPTskfMpjSSQgmUvije8K+g?=
 =?us-ascii?Q?9qfHT0JtEYx+g5AVJajEqhyMlOKwwORSxgdHydR5dHZEN73fUTWgQhLnSD6p?=
 =?us-ascii?Q?fFak9vIdq5rlTzoWLmVFCB3iwDwAgt3F6cOREBGZeTEX7hD4tD7ofcI7IToh?=
 =?us-ascii?Q?14tpG3LiBNgME5tjTEoj6si/YVBH82XakoSSXbJJ6lr8dz9Y0jynLgloJH2i?=
 =?us-ascii?Q?oXUwRiK+B1sOBpHf1H+9upAq6u7G8pB1ClByzh+QWLu5VD5Bpps0mhGYJIfb?=
 =?us-ascii?Q?TD5vkDqaiaBamNY4oFiCMSEnpiFSPmLMghuurtSW1dCWEJY5TFaQhaIINSl6?=
 =?us-ascii?Q?vKKpn/I5TD8i1HKglxCHFd6oBA+asuYDCz6aeyfV6s2Pi7cR6hFvVbSmbMa2?=
 =?us-ascii?Q?mAJ1K3wkOjQG2iK4yiADWnCT2mS3WGjdqFt7r65SVEFzsR1Cn4eBRiZWD0Bb?=
 =?us-ascii?Q?rPZbUGAvImci5ZZy4zS6nGVIIJGxZ24xdQYVCCBwp+fYJWQ2L+8WnSdDzBem?=
 =?us-ascii?Q?zrS4MLwNyLbkuoRIrGPOE4fUEFuQqJvcp0qbFH1o9EMSsOXpFYoCWQmmKGJy?=
 =?us-ascii?Q?gu88XffjxbCQ5iEBrK13OvR4h9IfCAhOXQRPcd3wJzp72PjlM1RuVrg80v1X?=
 =?us-ascii?Q?lnKd80yE63kZjvZwsiAR6sujLhPuIHu1ISaV0sDm/X/n9PhByWkSpJ49vlxG?=
 =?us-ascii?Q?cK9dHGc4zhHFZtt5G1nCvDzNb10Irm+Vvb2QX3ln3+/Wd17c9KGsqjZR+34O?=
 =?us-ascii?Q?BZOZY/Pkd4DEBWrUlYLQlOcpUHGiXPhBY3eFmcDGwzZgXScLtDVo8QzlrCxP?=
 =?us-ascii?Q?PExFjTOySc14tEF351c1i6Q+1XwTzOBddfn1XF8qjRLzYvF8J+BkAF/rlQkB?=
 =?us-ascii?Q?CXTZlIn0rmx3eol3/6iUoKXl/ejkeKdYOQdUOonBb4+/930Fb6fmlq0Z66wo?=
 =?us-ascii?Q?w3ymBkNeuiTO5x5n0tffHSALrAJSyoZWp5DsD7Gj?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e488d09f-7383-4b12-30c1-08dc65dbb129
X-MS-Exchange-CrossTenant-AuthSource: PSAPR06MB4486.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2024 10:29:02.6699
 (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: qdr76ncX8iBPG42aHtnxTz0b0iHpwfKHwwkJI+iHRqJPCNxF+HSN28QI/4kT2SSAxtZCLdG9/rMMc9EVP0wziQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6213

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>
---
 fs/f2fs/data.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index d9494b5fc7c1..7ff5ad3fd5dc 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3904,7 +3904,6 @@ static int check_swap_activate(struct swap_info_struct *sis,
 	int nr_extents = 0;
 	unsigned long 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;
 
@@ -3942,8 +3941,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