Received-SPF: pass (google.com: domain of linux-kernel+bounces-160455-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, willy@infradead.org, linmiaohe@huawei.com,
        jane.chu@oracle.com, nao.horiguchi@gmail.com, osalvador@suse.de,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH] mm/memory-failure: remove shake_page()
Date: Fri, 26 Apr 2024 10:15:11 -0700
Message-ID: <20240426171511.122887-1-sidhartha.kumar@oracle.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?7AkDX2ZI0ycfGFprtCdzLdPyBn4LLys35IIfZpKjk9Nr/9oG0oPAIn8U3Z9A?=
 =?us-ascii?Q?snOeglOQ6+thiG40Gt7yaowZ8+0quwy+LFPZGkfCcUGFdAZUq3pGzSlnjY8p?=
 =?us-ascii?Q?M/OAtkzf3O5FrfRL0nKbj3s5OWZeolVhXHqlVGcTYKFBqI2aGUI5lu/rF3DP?=
 =?us-ascii?Q?s46F/PJ6oHwS2tBEmhKq2Jzif0OMRF4rCO+Fipu8Wine0Kof8xa0jj5lvo8/?=
 =?us-ascii?Q?TLex+ImpY+wEXqOZX4lSZox8fsIGXmC7hkMqvp7tcuFpsfemAwPo9c6PeGlf?=
 =?us-ascii?Q?q3BAcBWxzrrkIcUzzj9LRX4DfOTlDx8hNNe4iboVnmRH4UTC68Tk4oimQxd0?=
 =?us-ascii?Q?ic/uMZz8qjhBNNNP8iyncayMgnyJ2Ql36g2CJR8ryiCVfKX4YUA9RZLUK+2L?=
 =?us-ascii?Q?kbnL2D2JYz3+dlT4S2Razu9WWl6mwKnHoGcTuLAfGUcU1gavzgYYlJI0/QUh?=
 =?us-ascii?Q?6QQrjtD0xzNzsTHVrbcsPEm0XA4C1Q9CRugOTwlfPFopslSKlP3hP6ZJN5Vi?=
 =?us-ascii?Q?G0HEVQdbW1VO4BsZwBZIa3gVj3YCYy6BZq5TI8z0m4F0G18m81xS7RctKPnh?=
 =?us-ascii?Q?I6tGp9Rb3/TUn7IMCGd5qapfHOVsJI9AHYjG98VLcc8JYR6yHLajiw3rUF2o?=
 =?us-ascii?Q?QlAo1KcHDwr6VYInwMmScDgEZSZmYk8Pz6j3sKXOdRY69Z00Qiq1PqVXBg1+?=
 =?us-ascii?Q?67if0jR5ETRPVWBRZ+KHnI7ViQiaws4e4BjVtcodPic811w7FvuADINs+fnd?=
 =?us-ascii?Q?C4mQDRgEdcXKl07wWvX4Z2yW+dDBaJqYkhPY/UzwBni4IRVme8SctweyBp0G?=
 =?us-ascii?Q?4C7z88rEv1i3I5uzwcSm9UYOWE7QAIZqUBiWgTtDhQDEpjd1LytiX9+Ssthr?=
 =?us-ascii?Q?xCX7Clc37L65nDcgXpWLgC7bg15oATEjD+aRpwX0E6HJCNnYHygUynozppsf?=
 =?us-ascii?Q?Il/qh7p9aFdkK5im9LBwQ/SvJlpb6N6reyYKz+a5wpm+jkIvImfIrH/W2SyV?=
 =?us-ascii?Q?fwjMNfm2xafX/ofdw/pr+WcRGJbPlpM+eSem0WUL4CCW2hCQahfmgT92Yoee?=
 =?us-ascii?Q?XwWSaygont8gDz80LNQJYUHpIQvOMltfaB69YfSWQgaIsnOQKn3hADic7F2o?=
 =?us-ascii?Q?N/Ge8MJarVUdLn/P7bqzXUW4YIzgd5mC2rd0rAark7B0AxDB+zMwl1J5k1Pu?=
 =?us-ascii?Q?d/TjtuCzFIrJan41JhGmHWctBL9kRhkMii+aYwPauCV7KdlBzwtjsgZTGKi2?=
 =?us-ascii?Q?bS0k7jCYtp76RdkHus+ypfc1wuP1mZO9GHkSzZ23lqjRlixLY82TAQEa1N4K?=
 =?us-ascii?Q?XtnA7xZFRfkcAHuNzOA/uoKqnOckV5x41jUvN6w+Me56aLaeeEiZ8OaxG5Tm?=
 =?us-ascii?Q?YU6A0dCSk19lSgeDM8k3SZyfBFr9D0XRSzOBSF+s9uaDP5m/0G/7ulgiK0/5?=
 =?us-ascii?Q?VfBYkfd9z9dyPN3+Vms9Kzuj4uAqLWjzwb5BviTo/qWwTzivrVtyT8xtvIvD?=
 =?us-ascii?Q?F3Ek1uR9jhuDzd36Xbp+9LLOY7e7c1/bPD3tviBSvEkLVHeyh3Kc12F6nXbc?=
 =?us-ascii?Q?8B2XqM9egdpQ4jMZYsbpmCezZbx/1ora3TMSQP9EMUgQ7GCUTpfRZZbpWWjC?=
 =?us-ascii?Q?MHgY+AJJ+SlRn0f0Py/PCaE=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	EJLDxgXx8T+4bN376acDZShzr01eUEBiXeV/YX7S2w4fBiidoiMBakC9gRaDmR5xS7bGBt4JxOUwNB7yxhgj5t4QJXBXJ61Oh/c6Mmgld9YppsR4C7UgbOdhHqjyJR5Lg+/QUqKriSqncXTwnecwDFuN/7beHYphO2nXdeDyAPeT8pEasOhQSREvnpNR6EpPQkNGNqiDA1D+n5wbl6lJNFy8LjuIgqjs1UTxDElaMen43oVqURWgfALl1MZlA8u/CfMoC6j01TRcUZF/Ofx2fJEYuAi/Sb4H48LpMsw4nUnlQGsuzoT1IVUvJalFa7DvgAnqwE3d92opqCN5/DWr9FOqZ2qIWDr6dhuc9Fp0KW69H4FOxq/yXhMFMIB3TD+ZOhNUFfSIOuFOYV2lWBJndQ6S3BJWvSV9rPWkL6vf+NIy884kxI3iznK77VdmakstcOZr5jNjmKXM2Go9Y0s617Oev57/d8EjCtdPDqBI7BNbMcWm6cRqvj3oN9WSXl9m9f3H1n1nArEP12ZxPzM6XqciCvYE3oinSUtVoAGA01npNTmxDPAW/LSl0Rqe4NUJqx9tsh+kcWbCPfCtF5MNcqbqpt2O2IQqbQ0Ww38t+XE=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2a1acb9a-a0fe-4059-5137-08dc661471d0
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2024 17:15:17.5908
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lqUXcvvGv/UKsayNcps7JuL+JeY6BSd2Yw9Cxpcjz7DclVivS+MVnIwn0wwQMbrHsucPga7ccDKlp0Evpk47vK2q6Ha3kkf/p0g/Ouq2+90=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB6207
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-04-26_14,2024-04-26_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 spamscore=0
 bulkscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000
 definitions=main-2404260117
X-Proofpoint-GUID: FOoxZYJr3xrsNr9tcthZYLzdJkHktlav
X-Proofpoint-ORIG-GUID: FOoxZYJr3xrsNr9tcthZYLzdJkHktlav

Use a folio in get_any_page() to save 5 calls to compound head and
convert the last user of shake_page() to shake_folio(). This allows us
to remove the shake_page() definition.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 mm/memory-failure.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 16ada4fb02b79..273f6fef29f25 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -385,11 +385,6 @@ void shake_folio(struct folio *folio)
 }
 EXPORT_SYMBOL_GPL(shake_folio);
 
-static void shake_page(struct page *page)
-{
-	shake_folio(page_folio(page));
-}
-
 static unsigned long dev_pagemap_mapping_shift(struct vm_area_struct *vma,
 		unsigned long address)
 {
@@ -1433,6 +1428,7 @@ static int get_any_page(struct page *p, unsigned long flags)
 {
 	int ret = 0, pass = 0;
 	bool count_increased = false;
+	struct folio *folio = page_folio(p);
 
 	if (flags & MF_COUNT_INCREASED)
 		count_increased = true;
@@ -1446,7 +1442,7 @@ static int get_any_page(struct page *p, unsigned long flags)
 				if (pass++ < 3)
 					goto try_again;
 				ret = -EBUSY;
-			} else if (!PageHuge(p) && !is_free_buddy_page(p)) {
+			} else if (!folio_test_hugetlb(folio) && !is_free_buddy_page(p)) {
 				/* We raced with put_page, retry. */
 				if (pass++ < 3)
 					goto try_again;
@@ -1459,7 +1455,7 @@ static int get_any_page(struct page *p, unsigned long flags)
 			 * page, retry.
 			 */
 			if (pass++ < 3) {
-				shake_page(p);
+				shake_folio(folio);
 				goto try_again;
 			}
 			ret = -EIO;
@@ -1467,7 +1463,7 @@ static int get_any_page(struct page *p, unsigned long flags)
 		}
 	}
 
-	if (PageHuge(p) || HWPoisonHandlable(p, flags)) {
+	if (folio_test_hugetlb(folio) || HWPoisonHandlable(p, flags)) {
 		ret = 1;
 	} else {
 		/*
@@ -1475,12 +1471,12 @@ static int get_any_page(struct page *p, unsigned long flags)
 		 * it into something we can handle.
 		 */
 		if (pass++ < 3) {
-			put_page(p);
-			shake_page(p);
+			folio_put(folio);
+			shake_folio(folio);
 			count_increased = false;
 			goto try_again;
 		}
-		put_page(p);
+		folio_put(folio);
 		ret = -EIO;
 	}
 out:
@@ -1643,7 +1639,7 @@ static bool hwpoison_user_mappings(struct folio *folio, struct page *p,
 
 	/*
 	 * try_to_unmap() might put mlocked page in lru cache, so call
-	 * shake_page() again to ensure that it's flushed.
+	 * shake_folio() again to ensure that it's flushed.
 	 */
 	if (mlocked)
 		shake_folio(folio);
-- 
2.44.0