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 v2 1/4] mm/memory: convert do_page_mkwrite() to use folios
Date:   Wed,  5 Jul 2023 12:43:32 -0700
Message-ID: <20230705194335.273790-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?ogDP0AlzEJVYBwBftW5EEh0X+wlWZk3XqopYQSTSm2+2tCP0lCLguRMdNUqK?=
 =?us-ascii?Q?TYLw8iADmBpBmOguNiTTIviORaBupbrVme98mLjh/T4F+UOqc2URQ/DEDtxV?=
 =?us-ascii?Q?kvUCw4Sl2OKIHVT1Z70Z73Mluh4n8mGxIf00In+FsyGfZwvj9ebeMct5DoTh?=
 =?us-ascii?Q?Q13un1WV4RYmRU2zq5MRp1ouro6pSmLk86zawVNF4daLDDHiBMWDRwNs3gRN?=
 =?us-ascii?Q?6I2A6VclfouZum/lxUMVDPnLUpkK0vwF1OBvaMOsI+orCiUfqIzfpXLea3Gu?=
 =?us-ascii?Q?WpxxqLrRhxGRd4+BzBKsQluvnbNm+bXLcOIT395l2+HcRrPrdSKTauQ3d1BJ?=
 =?us-ascii?Q?APMBkTwjfNcsa8Un+p8x3gZDGbBGWj3qyHWVyJYayGHFduTEae6uBn2NEZCG?=
 =?us-ascii?Q?LjRUHzoVrJYwfTZd+4xYVCNIkzFRpbMYAQU6i6p5lL/z4hOCCyC7U0lCJdYg?=
 =?us-ascii?Q?SM+JFJB7RUuTzbNWQcjtJY5Rg866Lxa3nD4rpn54sajWTmQu/oHid6YISXLT?=
 =?us-ascii?Q?tgULA04LuLXHjyRujW46Y3exqTrTGODAsq4B7snGZtuDY1rOAP0kz7vs0QQ7?=
 =?us-ascii?Q?GWV4i0ut7Eys0URTWUsgtFEdzziqGAJQwfoLqSDnKSEzTwdrAtUZ6QSMA1EE?=
 =?us-ascii?Q?yTyq75t8gFcgVAtXSGtn+akGAO1/JbhOKAQc7bH+rjs16PJ5nJ5R8rvrNTWj?=
 =?us-ascii?Q?bkzETBMFARrl3INctFHSJI35QH3IKGXHLEwCU+ld/9Lc8NuSqHkYi43y1B9e?=
 =?us-ascii?Q?Wd9BwRgabApKFVcdXudCPqBMSfa47AU+j0IuZmSrzRi+PGJFTCCTFOV+mum9?=
 =?us-ascii?Q?aZaVyjy+OVh3IMZaACKqcvangTB64uXY4tH0N+bv+9W3pvglIIrS45nVMZ12?=
 =?us-ascii?Q?vYL1bR5Y3aU9f1G5OZZSRJu28v75AWhlcbl4/7Mx6c2MRMsJlxU+3+b91Cnz?=
 =?us-ascii?Q?9UwWKmKCXzXzJFdWi3kISpREnFH1uFoYfP9E3l/rP8NOJXmqg9Lq+ecvfJ0g?=
 =?us-ascii?Q?rqG2gOUUikhHj5fbI85pN8EOVaODorIbu/vmh+QZqxt5xm8GJJFoXs7Cfab/?=
 =?us-ascii?Q?lfi4EaP+RLXhuz4mqRqmcGiws7yuTjyrh9hP/X5/TV2SH4pQZRT+a4GabPkZ?=
 =?us-ascii?Q?ubGMIhn4sQttylxgeJ764YHkgoibIzdFDdqSYVRuzbRdzzonZq3TMjJp83ux?=
 =?us-ascii?Q?Nz3LwDblgPLvpLYfwTd8Uf83mjcintedXc7DTrLVtUfoUNCmE83Vo0cvls7O?=
 =?us-ascii?Q?t0yu4RAYAJE+D8UCil59qV9QE0E60DvhBXtuD7ZKzmK7njC7gGATunJfBqXD?=
 =?us-ascii?Q?NicL6JqnIB5oLPNiSE4l6cWz1lJxktQmrknrk9/r0dAG8Js4PlaHROHzj76d?=
 =?us-ascii?Q?rDRGN8S/ksAdrB+rzfMZqRzwpMSOrH9YjRCiWojuS/CHMT+Ovd4cOBMdFDPQ?=
 =?us-ascii?Q?DpXTFpe7xFXXX+IhLFOxYTVbQ1Y9GKQJGUehwP8l0tHpuNgSv5aIEvb+9wMl?=
 =?us-ascii?Q?cN/5ynFYK2HsCQeZ3jC0Az8jF3vS32oQu3BmQ7tESFoqMdmI23/3hRwJKOVS?=
 =?us-ascii?Q?QyVc0N+uNeKazJa3eZN+RI0nqxndRDuoxWCFH6fmwvYTLWgu3FHhLL6en1JX?=
 =?us-ascii?Q?5NfH5o/HCGhjjxddulsJ9aM=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: EFSqoR/5kDPXBII9EgsJ5AI/hD9w7PAIP8R2PN30d4BXgaap65bGYiJAVWvnI6BJuyV5adyDj5YEbXSEbnAmpmvTj0Nho/89iSoeuBgSFl4BKO6Cx2ctH6VtVK47ojqqLeUW8jSXVWCsAvRMc76M9IeRCtz9c3pd+7vodVNEY1zEvK1BAfpHS1tYDsSdHRM1RGqbst6dMC2LwCn0ZeX9K5jkhI5YxBchOkMitUKV/HKkEaI+qEuIKRCJSaotOnEyj+GZlwujL4qA0es0U6pymMtAfa/UsUaN/tCNhz690rs6xLh2kIMI1R9Bs5mN/cBD5b9taIi31iL+yRyhrlMHXG5FEUtIUu5BBaB93P13IG3CrHyj1NFQRAvVl3zxq5NlMkEXsfzYJtskUbk5Tx4F5CUao8atYOVdcNKUSonmSGaXEBTkWVSoSKL3XeyI4ych3kDKqlrrDFVX6bWFa9ybtdno7eyNwmCT3n9wtlqrD8LfSwqMNC2aP6hmOfO+bJ2SV1vTd6Kj6ThanODyTuQy2KEKFM4YkI7uLTFEjv5nJuHxBsmVDwQeu+15gtBhOcNGSClgOlcx/148XvqH9JcCkp7Hqy+tRVuNRNnY626oykjJuyoqPj2TPtnHjuWFBckR2VAGo7xHNETfAgx28WHQmI9oUiVxO2KQq2uC+2BoIqBkmozTyH04S0WJ08E4wgHFg9jnazMOwaPAur5GcmY8RGlWN8/9LrsmAXW6WqGotrvmR1FIBpR/3XHgx5ZvKol64xEszchrD1d02DhNeDAarj4nzT9DEJk0Slf/nq7ykxMZ6NTLfCtVq0cubGiphE7cF+1u/A9VLcULU5dn8PujdTjwib3wIVUCMGwIeNGBy54Q5rGahy2Y2CxWEE3RxvBK
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1dceceec-79a3-4004-4ca7-08db7d9026d7
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2023 19:43:48.5568
 (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: jb4KVrnhj49G36XmMfWGBsL+bxqwWvuU2SbCXKgDInj5gafsfJAD6YYBeFCKmy0SkwtrKKEEXaxobwAGyXOtPAF1JBsQ3ukIwTW74agRHZA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB5914
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-05_10,2023-07-05_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0 suspectscore=0
 malwarescore=0 phishscore=0 mlxscore=0 spamscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000
 definitions=main-2307050179
X-Proofpoint-GUID: mG3kDwMm1HkKk6TsnT2Lt3wO_x3aiWc0
X-Proofpoint-ORIG-GUID: mG3kDwMm1HkKk6TsnT2Lt3wO_x3aiWc0
X-Spam-Status: No, score=-2.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 one implicit call to compound_head();

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---

v2:
	change folio_mapping() to folio->mapping
	
 mm/memory.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index 21fab27272092..e73245b791a7a 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2932,7 +2932,7 @@ static gfp_t __get_fault_gfp_mask(struct vm_area_struct *vma)
 static vm_fault_t do_page_mkwrite(struct vm_fault *vmf)
 {
 	vm_fault_t ret;
-	struct page *page = vmf->page;
+	struct folio *folio = page_folio(vmf->page);
 	unsigned int old_flags = vmf->flags;
 
 	vmf->flags = FAULT_FLAG_WRITE|FAULT_FLAG_MKWRITE;
@@ -2947,14 +2947,14 @@ static vm_fault_t do_page_mkwrite(struct vm_fault *vmf)
 	if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))
 		return ret;
 	if (unlikely(!(ret & VM_FAULT_LOCKED))) {
-		lock_page(page);
-		if (!page->mapping) {
-			unlock_page(page);
+		folio_lock(folio);
+		if (!folio->mapping) {
+			folio_unlock(folio);
 			return 0; /* retry */
 		}
 		ret |= VM_FAULT_LOCKED;
 	} else
-		VM_BUG_ON_PAGE(!PageLocked(page), page);
+		VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);
 	return ret;
 }
 
-- 
2.41.0