From:   Sidhartha Kumar <sidhartha.kumar@oracle.com>
To:     linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc:     akpm@linux-foundation.org, songmuchun@bytedance.com,
        mike.kravetz@oracle.com, willy@infradead.org, jhubbard@nvidia.com,
        gerald.schaefer@linux.ibm.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v2 2/8] mm/hugetlb: convert hugetlbfs_pagecache_present() to folios
Date:   Wed, 25 Jan 2023 09:05:31 -0800
Message-Id: <20230125170537.96973-3-sidhartha.kumar@oracle.com>
In-Reply-To: <20230125170537.96973-1-sidhartha.kumar@oracle.com>
References: <20230125170537.96973-1-sidhartha.kumar@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lRwKCDUhY0v5II7Rh8aU9MIVFsCZlkjnRuPHUnB5d2+j6oCriw7SNPOEuB8I?=
 =?us-ascii?Q?M1+PR5VNCadMiNzmb4/9mMqTYDsKcUEwU2zGozew+ayGlH2rCmNpmg+pVgjF?=
 =?us-ascii?Q?O5ud9zXymAlyC7jDAtPe+p+F7lI1Ai+VzeOxH90idp6368qxVmP5RHw8Q4Pz?=
 =?us-ascii?Q?vbMYZ3I5AnAr6CkjH5lMAZbxockFcgjeecWdaJSsnpLOxFEe3ZXo8NN1F0xZ?=
 =?us-ascii?Q?pXEeaayKK1TmyeQ/KXcElBwGFgUxO3SjOP+NodTorrYfDM4DxZeq1cyNw/pS?=
 =?us-ascii?Q?t2mdMzu8WML1G6pdIoaitX1koZbLgg0suWVLkOziiXyipcVxaeTgcsNnltG/?=
 =?us-ascii?Q?S283XqcX6QjnrUizL9Zd4J+UDXIXeOCpY5Js+MqxQV9mHg4Z+EC+OWYyCLEk?=
 =?us-ascii?Q?HvzZGu1papAQ2z/DqB6oaACuQaFqRRKUCd7uaWVqxSvZGrPz3Hs0L5hAXqvU?=
 =?us-ascii?Q?upvM3q9Ms4IVrKPbatBblsj7q9g9rN6ONkCDUCCLCy5osqYrw+Ooxpf6GgaS?=
 =?us-ascii?Q?oMcst4G5IJzzTois5W9VmLeFy8GmUkhC85Hc7aBSpzBsIT6r5GaDCLr50aCD?=
 =?us-ascii?Q?lZthplVzpas/7v3PpXppl0qgICUHS/2icbLoW+OMkZ8e3OoIlRe1hVB6VtX4?=
 =?us-ascii?Q?jZQxtfvumlh04YBO8031KxGuUupy2e5j5j/Ciw7gyd2DZWFVC/nGCa1LLZjq?=
 =?us-ascii?Q?4ScVUVdvDno1dtQ509X9vD8obfPQfu2PfVMYp9l0Pg/LjqGe5Yuhxj4kU0Pw?=
 =?us-ascii?Q?hGGo0lwMd/YI4LjkX7GOxq4jjcRZWHj5u3kECYHVhFKTS8n/f8TmSq5apXeU?=
 =?us-ascii?Q?jesXwAemRwEcGv2z8iRHSp8yNeBkVEhY+IkaCgHiXZOEsfMzcTd/8QAUJdCp?=
 =?us-ascii?Q?hAkDOIF/R3b/0QaivsNnzJymgN/Rhbx5OqTM9BlnsBrHJkM64PK88qeKev8W?=
 =?us-ascii?Q?ld5jfbqRB7Q2fwx40Xup3e/jJXimusvpYdT8FSSGcuJd7CzMHkzYgmI7w3VO?=
 =?us-ascii?Q?VpsqyRsgBMgkBuaoCjSZUJjIW0hidfNBycpjV8E+s975CmXNTPtQffCodYBJ?=
 =?us-ascii?Q?6nd2Nc6UMo4AajxROpNXFFGqAIjnVLncByFkK8nUANX4OGkMM21OW2EDexUh?=
 =?us-ascii?Q?97LlsCxMy6I6posQQ+5tzB22WLCfy8TkkSrKJTsNUp9GlK3sY9JBSkh6902Z?=
 =?us-ascii?Q?nw9ixcJMiKy8AVjE89ncj6IEZC/ZpZa+g0ctWDBBcq6WcNFwJ7K5tHKvNtbE?=
 =?us-ascii?Q?3R7zF/wU1BwE74jebfohOMjJUNH/L35SsaGadB9Bv2D/3+Ledm8eD7rpPg39?=
 =?us-ascii?Q?5wTZ4dSI+ToskYpu05CwXR5CO1/omalGpKOKm5eqdW0pjYgEICGuRGKN74mM?=
 =?us-ascii?Q?9vfXSm7r0smZ+mRvG0WYuhGCmIQgmGz26nbVUoDBDB5PmL6nfB6+pzaV+IOe?=
 =?us-ascii?Q?3Zwh7/GcYvtWcKUdQ4bGF1BYPRXdA+Tkikt20oOTrETJMPMKJB9Otv1QpOe1?=
 =?us-ascii?Q?PGpjtvU6AdpV7ZbMbiW9QbSFgqslRDOxBnJ79qpLNvF96nhzBRMJcKp5w14I?=
 =?us-ascii?Q?9HI++6d7OAcjYnBNI2m/TA1YusWeLDRLOc5zQyDDKUuibQ704GtNkibSt3V0?=
 =?us-ascii?Q?UQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?H9Y9Ocxatk+ymj4kdcPSeLybaU3ZiOaaTF7+hRSL3jehUeZPsObJmIBYQqxZ?=
 =?us-ascii?Q?QAVmVh64wYNeNCOGaQCb9DpmpUhJIIfUe/sLUs5zm3+src3J1t+Pip9Wyxbx?=
 =?us-ascii?Q?f3OT1MqRT/Ib3q3eKEIBy8KfbWawJNOx752Y37bX7ItvofGthynMxIcA7UGc?=
 =?us-ascii?Q?wq1gIkq1eepDSfSH2J2SXpoiULimdnwtIsP/oPWIpQ0DBP7gbKoqmCnD+fGj?=
 =?us-ascii?Q?p3TPCSHYZ2gtFOlSzwy5Aie0ARgMwIrZMs7kTrTFX/9AczFMGKWWqq/7zT4n?=
 =?us-ascii?Q?COmU+PT8/I07Lwv/e3qh3iRy5IWMQo7WLW5yhBTfFUnpzxOeBCnsvUJkRsgy?=
 =?us-ascii?Q?lHMbL3Lz8Q5FOvpqNQCRS2pilUDxOWbScNYIT0lpl729DE24DpfbW9WW6ZV0?=
 =?us-ascii?Q?mzxIiwn8gZZaKu/EjS8qt1jy9twGEB9ero6ghuLmPHjb8FDaCNkOXmr+ir2W?=
 =?us-ascii?Q?Kj/dmnoe0s1PfilWdMG/zgh4oD15TMuk42n7lw7LIwacfPv5jy5wfjvG/ds8?=
 =?us-ascii?Q?HhxaXhP/ayVtZmKLmxpTUGPt+MqOKmGqMITpiDQ1P+pJHsFM9pu0KJBfUmGA?=
 =?us-ascii?Q?kjkWNkW64sr32eVvYpOPcNRViSnAMEGTwxCV6zFE6TLoNnzzqQ3MlHRxrMhi?=
 =?us-ascii?Q?NP62cYLqesJ2KDA3p6ZXS2OZLjlzg8fHDN3vD1nq4fiTnhI14ljJk2c/HDwd?=
 =?us-ascii?Q?CnMDipL7qq9baJIR32FaBTBDxu4ihGDENU3DA/sLf72u7jzvBa7YZCMN9b3m?=
 =?us-ascii?Q?ANvImsuAdoymDTtLMIQcgxGktsG4pMkm0X2XjoOyY40Kl37NQgDmswSF37/y?=
 =?us-ascii?Q?lsszPaL504az2C/6XuznIoP04fZMOO1Tf1fJnuOJ5GZmsKxAp8NVzATmbYCZ?=
 =?us-ascii?Q?fcbiOHeSNxiiQV1SAJBsiNFjIdHbKXskAriDfzPgt5AHYQSzPQJemIRThcC1?=
 =?us-ascii?Q?+zHznvB1nZ+tnFIbDUUpkVVR3S/bHtq/qPju70LftAg=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9ae529d7-f5e3-4f42-46d4-08dafef66999
X-MS-Exchange-CrossTenant-AuthSource: DS7PR10MB5117.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2023 17:05:51.5283
 (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: ha5phOlvjnGgBhLAySqbvJNKXk915/EAvWTmRJYgAyInj0OhhpdeJsR+f1jG3SjvH8Yj871ueEUk6NAb6XKfPK0w0qmKfxcnxjb6uu8rmaE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4384
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-25_11,2023-01-25_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0
 malwarescore=0 phishscore=0 mlxlogscore=999 adultscore=0 mlxscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301250152
X-Proofpoint-GUID: cEHhU-R-nztFGelfKgcaqYl945ldQ-Ei
X-Proofpoint-ORIG-GUID: cEHhU-R-nztFGelfKgcaqYl945ldQ-Ei
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Refactor hugetlbfs_pagecache_present() to avoid getting and dropping
a refcount on a page. Use RCU and page_cache_next_miss() instead.

Suggested-by: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 mm/hugetlb.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 849206e94742..e506a46b7871 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -5651,17 +5651,15 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma,
 static bool hugetlbfs_pagecache_present(struct hstate *h,
 			struct vm_area_struct *vma, unsigned long address)
 {
-	struct address_space *mapping;
-	pgoff_t idx;
-	struct page *page;
+	struct address_space *mapping = vma->vm_file->f_mapping;
+	pgoff_t idx = vma_hugecache_offset(h, vma, address);
+	bool present;
 
-	mapping = vma->vm_file->f_mapping;
-	idx = vma_hugecache_offset(h, vma, address);
+	rcu_read_lock();
+	present = page_cache_next_miss(mapping, idx, 1) != idx;
+	rcu_read_unlock();
 
-	page = find_get_page(mapping, idx);
-	if (page)
-		put_page(page);
-	return page != NULL;
+	return present;
 }
 
 int hugetlb_add_to_page_cache(struct page *page, struct address_space *mapping,
-- 
2.39.1