Received-SPF: pass (google.com: domain of linux-kernel+bounces-135254-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Mon, 8 Apr 2024 19:12:03 +0800
From: Zhaoyu Liu <liuzhaoyu.zackary@bytedance.com>
To: liuzhaoyu.zackary@bytedance.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] mm: swap: calculate pages via roundup() in
 __swapin_nr_pages()
Message-ID: <20240408111203.GA203766@bytedance>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Use roundup() to replace while&shift. When the "pages" is large,
using roundup() will be faster than while&shift.

Signed-off-by: Zhaoyu Liu <liuzhaoyu.zackary@bytedance.com>
---
 mm/swap_state.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/mm/swap_state.c b/mm/swap_state.c
index 642c30d8376c..d34dc95d0910 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -590,12 +590,8 @@ static unsigned int __swapin_nr_pages(unsigned long prev_offset,
 		 */
 		if (offset != prev_offset + 1 && offset != prev_offset - 1)
 			pages = 1;
-	} else {
-		unsigned int roundup = 4;
-		while (roundup < pages)
-			roundup <<= 1;
-		pages = roundup;
-	}
+	} else
+		pages = roundup(pages, 4);
 
 	if (pages > max_pages)
 		pages = max_pages;
-- 
2.25.1