Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH 3/4] mm/memory: convert do_shared_fault() to folios
Date:   Sun,  2 Jul 2023 22:58:49 -0700
Message-ID: <20230703055850.227169-3-sidhartha.kumar@oracle.com>
In-Reply-To: <20230703055850.227169-1-sidhartha.kumar@oracle.com>
References: <20230703055850.227169-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?NRvIhPAVMg2MbRf/29IPgQoNFRuR2wzrSV1/AvV0dxJ/c9vDhTgjF+AE1cDk?=
 =?us-ascii?Q?4uSbfcn9ZRnVqTk60JiUmzfDFHlO+C6t//Q5XGWagmnZUlguZQvE4FNrbczm?=
 =?us-ascii?Q?J46PxJkDVnrPEMzolAK+8j5EypHINdDnKdWPibv+N67RC42da+ZNVdQ4NRYV?=
 =?us-ascii?Q?Z8qy91jOx8JALz3sqqHegWEkNtKzoy4eabZogmTbz+wxa5nJstAB1uyR0MAy?=
 =?us-ascii?Q?D4kWR+ydHBsC6x9H7iAr3Y+hGMsiekBcNWwYFg5znl8BS1wWiQ7aumAEEGA7?=
 =?us-ascii?Q?/v3zNYEMzLIIoEiWxilXazSNE/lT7ZpJKv0wJ+mlxbZpLAqp/vKdgd4HG7oJ?=
 =?us-ascii?Q?TkZ9mKPpY0T2xSbHBrm09A3dATlt85FCc8zQtVY7U2ht4CvQczLI/iEq4yfD?=
 =?us-ascii?Q?oOkSvJBOwpjR6+S5Vo1bb6LBOD83mrDXXC/KjMkAcDCOWsUiG6KKfPwO4nAp?=
 =?us-ascii?Q?QaSjdd2I3stOm7Mp5TyCZloZKahrmgm4zSZE5CHU6lXQvJmJifwCq62zGi84?=
 =?us-ascii?Q?b5tYmtD6YslR0Hq1CrnZvyxs53rbwSNpK/eAvzFtYAZQTXURsMKM8YujHoGo?=
 =?us-ascii?Q?rkf/7h4xmd/cXPC3RgtBcII6dcenWz4E97l+ObxJQRHGnZo768lggvw+D9jP?=
 =?us-ascii?Q?SGBWZhhk2TGJbZejLCn36NWhVYVdDVUsg2a/MEfbpVCodX2WBqMEdyLUgzfr?=
 =?us-ascii?Q?wm+LqktNPauMHQ0Md9yvJIEuWrh7E9CB2/vQZLn/5UB0fDI/CuMRtLbOldrK?=
 =?us-ascii?Q?IUekt250mH+dFLDeM4vwyJ9a1OJmCnv4KHWXYWtvN8GBxEFv4+5SOiKiMJxs?=
 =?us-ascii?Q?AVU4NML1gMtjpp7TqPf4Ml/EmEDBhHhJYOkzghw0K+7jyRFCKszTez9nEXm1?=
 =?us-ascii?Q?E5dOKw7ZO/L3y08PpPr2crK5Vl5Sg8rDkyyHZOVKWhYt6hs8hLS/HA/znI+h?=
 =?us-ascii?Q?ZFLKH/b8g8pJe8j9FLxd/+0fMdDuL/BrIQg3HnwWeBxcpLbvsDUaJHUErev/?=
 =?us-ascii?Q?f0j29UgKtW6G68CKjFAHegKN8Nhhv6+6nKyTFj2Q0e/Qq1GpXyjbERihNqpM?=
 =?us-ascii?Q?7UYO5qi5UcmMBVpRr3HsmOn5WmxXFCxa1pn4uFu1gqVDeNxnTbnNReKU17n8?=
 =?us-ascii?Q?Thyy3JWdOxyrj6lI1h9G+qCQcM88+Dylwdki9B15h1xRaEnlp/eGrbZDVhNJ?=
 =?us-ascii?Q?kVYVF9FR97JQJq+RuApPIXMhfzAP++BCxXlHFj+Q8UXdL6HYYRIAuFdu/UdZ?=
 =?us-ascii?Q?OS5iEZFvES5gIugkdrABypCgOM5HxBdSXBA6qg9Iq+xMek6m2Mi0mFbeFO2B?=
 =?us-ascii?Q?TkKF0LUU43+hp9sjIYU4pFImOmmwI9OghtQE+H+7Cpw5uUTxkyq7H5k4cQcK?=
 =?us-ascii?Q?I1lgI4X5ZbC+DOyQqUI55NYZDrt52w746UlG/20FusesKzIvXsw3cJ5tpsRo?=
 =?us-ascii?Q?+yeQYa+F31kw98sNo6MytZKDN2xKL+eIAd5SGWXt7S1qonYe3z5EfEw6y1bg?=
 =?us-ascii?Q?lDw/iAW0Bcye2JNEEiF3X+KrDzAdBF0MR1UvO9WxDEhKJUKYK+uzFpwv9ls1?=
 =?us-ascii?Q?wo6UgTo9CHwScr3adNtgKi1c4YWQ+D0P5rrGe21h5uGZSDSK0Rkv3b4tog5T?=
 =?us-ascii?Q?nbg8UEX4ZXJCvXdl5ceD1Fk=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: t0MrgEVILwrsRIIU4IfH7T/D/fWNdQiaDSoz7W9EgjhOs7+CmE8BJK+TrNh0MkkhrdohlZ/caD8U49vrN96/a4kNKUqat4hlakfrk8dTsZjeOSaQUTZgDxBpC9Ra273EzRglo8BLwuPXgiTDVj/lmynGmJJu12Cw9Y+fnx1ah8niBWp/AQZwKM+tSsJkTUlHSIreJb/Oz81rfmmHHaHrcsi0+xswYbfByNggQsAdek5mlLDhufwCbN/x+OyrFRpUMFL7Cm63uAzUOpPLs05iMl/5LgtSWChVsRU7Eo9tYbgHBnn/4N3cy0R8SQcudy0EEcMp1GuHWq+j44pmAbifO3zAIjY4EnBUkpQd214q2Gc0TZfjFyQRwR/DnGt0HrpvCoTZYM7cCvNeNxnB62sTuR0rlpZBw9w8sy4tbrgyRelFrPWs6acRtZouid2hPf2767wAc9C/juyWLAJqSQbo1L+Z9rBL7EDJ+baF0zbf+G3RZY/qr5KPIcjfDb34WwwviiuICMPMrSxjVR0w6eXGJbejPYQu/lPsjLA2RHNchjL/26A5bJ3taGPhpWBhWm4tRs+sM/9ILKKPsXX+0mQQD3Yue4DEhpZI9GrxYgNopcR2GEP1un5Tg1N3j4SqZ9XDNcJ5BIdH51MjFd7p4yDqZOii29/qZgHUz0ypaXP8dmqoE7z3m8KZ+HlZUOWumzULtfXUhQKRjBMAeyTCIXgPQjL1hFAEYvvmBJLf+p1FvxUDP8uzilmAaj7POCrC9WR0EKFT9nV5hlFgSiXdn0k+WfNhXpQCZl9ynFROhqdN/NfpI3wVYAqgZfypB1Tc0qxiyv9bNbmWmN7m3hIojZRIzPyZGeksKFwaVkfJUlz3Bvg0ARJxqHSvyZ9M9mII5WRO
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0f8c906a-e5b8-4c31-d6cc-08db7b8a9b3a
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2023 05:59:04.4576
 (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: 7xN6c+Jc65DBGxZ0k7dpf3fSslmU277nJEaCKQ9ifOSX4mQNJBxfTWKOU6aKOBvTtD0XDOz/N20w/iTUuxa/SDP2LTxcLVpVbfL/02DA+0s=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4697
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-07-03_04,2023-06-30_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 bulkscore=0
 malwarescore=0 mlxlogscore=999 adultscore=0 spamscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000
 definitions=main-2307030056
X-Proofpoint-ORIG-GUID: gJ9jXKm5Dfz6Ib6NFElSeh6loN7MmKkc
X-Proofpoint-GUID: gJ9jXKm5Dfz6Ib6NFElSeh6loN7MmKkc
X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Saves three implicit calls to compound_head().

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

diff --git a/mm/memory.c b/mm/memory.c
index 93480e846ace6..33bf13431974c 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4594,6 +4594,7 @@ static vm_fault_t do_shared_fault(struct vm_fault *vmf)
 {
 	struct vm_area_struct *vma = vmf->vma;
 	vm_fault_t ret, tmp;
+	struct folio *folio = page_folio(vmf->page);
 
 	ret = __do_fault(vmf);
 	if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))
@@ -4604,11 +4605,11 @@ static vm_fault_t do_shared_fault(struct vm_fault *vmf)
 	 * about to become writable
 	 */
 	if (vma->vm_ops->page_mkwrite) {
-		unlock_page(vmf->page);
+		folio_unlock(folio);
 		tmp = do_page_mkwrite(vmf);
 		if (unlikely(!tmp ||
 				(tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) {
-			put_page(vmf->page);
+			folio_put(folio);
 			return tmp;
 		}
 	}
@@ -4616,8 +4617,8 @@ static vm_fault_t do_shared_fault(struct vm_fault *vmf)
 	ret |= finish_fault(vmf);
 	if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE |
 					VM_FAULT_RETRY))) {
-		unlock_page(vmf->page);
-		put_page(vmf->page);
+		folio_unlock(folio);
+		folio_put(folio);
 		return ret;
 	}
 
-- 
2.41.0