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,
        zhangpeng362@huawei.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v3 1/4] mm/memory: convert do_page_mkwrite() to use folios
Date:   Thu,  6 Jul 2023 09:38:44 -0700
Message-ID: <20230706163847.403202-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?4+hB6oMRFtR9oNPAea09ttRFMvNLuA8hMQjcLRXelEEAOE9vfdYBrGRywPrj?=
 =?us-ascii?Q?b1KvRnCZbMwJxrHn0vPitn0lDE8OXpAk2KsOjEkYENYSSHPCdTUwqXE1w+ti?=
 =?us-ascii?Q?hKFyBl5eytoVZAu/FMmJYmPn3w2FtUqKsp4meslBuEWZ/o4InvpD+bQj+1vY?=
 =?us-ascii?Q?2Z7oZD2JzQHW6fRNpb5owrKoU/9tlNVd2IsUmijncubXlLaTDbrVbJiWgYsE?=
 =?us-ascii?Q?jkIDz6bm4Dbez/bD62OLI7guQs2Ino2l495221w3umEHY2/Ewq2DrdE52UIa?=
 =?us-ascii?Q?/PODTG+VwwKZTmQYuw1w8nqloYHYChVxNGEnTLfAJ2zeGabrjfXXJpnqALDb?=
 =?us-ascii?Q?diDwgnPmy+WzNqemT2A3AX7QLTNLLrbENJhU3ADl8cLiRP/X/3uW61KzH+yM?=
 =?us-ascii?Q?RoDUYUiboHcWx5JCGBm9LIb5KVmDtLiNtkEFYqSYEdefe93kqXBK/94TEaMT?=
 =?us-ascii?Q?DQsWXHVyLSm1zEMiHvP5v6/5LnRw50TPp1ZxqOezcF/S8/ExNBmXfLEZDfv/?=
 =?us-ascii?Q?YVonMvX8SHPz4tUrGMe7gM2fK3VXqHacyvAtVoNYq0uasfWole6+elHlRxf8?=
 =?us-ascii?Q?z3CrXp1JZJ/a5wHSij40td4FovLMs71Fv8Vt4zPsxSXxoICRfqhfajCAfGFc?=
 =?us-ascii?Q?yAL1Q0sTeDW/KZ/MmKR7mOrM2eFi2Et170ZO56z4feZ3DzRlotnkfuCJFlbx?=
 =?us-ascii?Q?cEPSYixveiEk9CeyAzuBMs9dB6VjKFtuRR05jeGvK3yBl7ETeONSLVqRHzn5?=
 =?us-ascii?Q?FbHDQo2Hus4Bd+0Mqpcgn6EXFb0L4uWTfhCDyC3/ROXwSeNm/Ngk6cV2PZMn?=
 =?us-ascii?Q?8eXTXRULNqTS2ZYweeLj7vdbHBjjWZdQEgVP5XQaTo6kPWaaHVJMyb9W6p2/?=
 =?us-ascii?Q?jQCC70yUGdCbuICXqg3ehp0mCm1PD05wQpsvcB/iaBgWQPgAW+TNmLyuX3HQ?=
 =?us-ascii?Q?iNPSqBn8eVoUWHI8vNcDb7PD1LhN8t/wez3fKdloUVo42fleGRwrOnueNSue?=
 =?us-ascii?Q?vun4dsuevzdCvWMW5IH+B9KZccFKcTPEHQmRW0cHL87RLIn7Q1fGg6avrFFF?=
 =?us-ascii?Q?hJxvcUByXWIlpdwTyBI0aA38GlmjJ4qVzjeCjNtvXJ1fYpBE+D5Y23h5drzs?=
 =?us-ascii?Q?/T9jnwl9J1zE543riiJusxgeCUciTxYNajHbL3n4mToydlPF+7Mm9Ykj5XA7?=
 =?us-ascii?Q?tf7B1D2rTcPzk2Da+sDliwrnx4VSNoAyP3FRLRZAAVmVcamacaxIUZYoAEOH?=
 =?us-ascii?Q?meQHMe3vyM3WzZQxQviLM/BvFiwRD+ygjxhh4IOAjvXc0K25iM6Qy3PlQvfQ?=
 =?us-ascii?Q?DmIbZ+LKLax/nq7IDNj3wTrHro+mOHHNj5eDLSTMxsRM52wunaPX+d0WG1xi?=
 =?us-ascii?Q?5QfV4pc/HhTJTg2rfO1GfKDxPt3Py+c2pp73rmeBUBMkgf2682dWWX6ywzVM?=
 =?us-ascii?Q?0OYywuD0eqORIboUwKQPkiWa2a5/NcNtpG9kNN22Yvyr68f+B2Vj2Fcgk//D?=
 =?us-ascii?Q?ga6sAp+K0FW0ZYgT+JQllE+GdjL3Pn41tdSmcVfqj9b7PWYDHwwlXKIEYCL+?=
 =?us-ascii?Q?OQ42bNajEdM+nbBUcqKp8hygtEV1ZNRErfPDbmvya0Fh4MqgXDngxLnnC9so?=
 =?us-ascii?Q?SDdoBn5IHIqQ6D+RB0JVVhY=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: qwe3piIttDKpdG9xx7iPRT4D5ukvTEDEFtmtA8Q2vKWxWPjYMOFZTx2n511kFjGd8e7Fwe7RyUqgn6Mbxx0aDlFvKIk7OX8BEqPhWijBOVAKOxBwmJdQ6ixIRySdk674v9gsW3tq+J/y3p4rEcdGwQqxQ5s7cVF4Sf35UpiaWTF5XcIrwqMvHOOrZE7wBMVCh1uNLmZ1DoScpC3UwEGlANutMh7dLIxskCTIjw9w/emu83CWWqJCjiDDjA8TlwEJ6v44pS2H3veUx3mRfLh0onLQ0ZjfyVnw8fdMv100yshtDuw6KD66tXUzYFd7/k7O4MOQYc4Th3QEmva28yfppS7IpB6TqlTCQxPpDKElWqLRx3R/JPH7gb8s0nNiYx/9KgiPJb+ErRG1Q1grjaV188iScK210rGwPHYqLD2VH1iWWVEau/zGu2iEOcfVhw9nWboSfU5L8H5EebWvK5It9+7XfZBLMtPvtcs5Ei1FU/WYw7muglQNyz3sPHv/6zVHY4qX/Bw5mi/rJDsz3B5C4BzKcGtmPWPyWF6IVz+aIIM7fpLCnj5jb/gTurJn78wbpUvHCq/SQY8/j8dVRxg5WsIELRpPE4jMe6SQe3stwyCTX4IblvcFPW4z+MS8VLxzAgefZqNx7YQXXjB890t09IpfYsyCelChHZ3PvfBPlYMMskSba0zfjxH5Y06ruiitUqfjN2QXaJfonU2MwJunM1xfvBgEVyCobbIRVE/EIBx7JeFFg+o3MgLqYXkFNFA0PWJhaw/eiX4YaNg7cPcQ8o70An+7OaYIaddKLVS0FAisiu7fuKQp/Gx5CCQq68tMwSVwWfC+Vsai6xLfriaKBOp+O2657LMHbyehDCXzziWNd+tNLEST0OHbbqEjjKK/NEJnnRPOyI60/HspiN6iGA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d684c700-ade0-4b7f-3c43-08db7e3f7c21
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2023 16:38:53.7378
 (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: ysyUiLLLrxm7euWYT/q5+oNxMAhD30vbgMRtudUVhpHHRYW2nNoCEjKaZrWMNy2u03IHmWVp1sXorNCdXTxas+2eIlaC/HOhFPNB+0n/zPw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB4955
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-06_11,2023-07-06_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0
 spamscore=0 mlxscore=0 adultscore=0 phishscore=0 malwarescore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2305260000 definitions=main-2307060150
X-Proofpoint-GUID: 7_DHzLf13NVVQ-V6wrw5rQELKiThzpPx
X-Proofpoint-ORIG-GUID: 7_DHzLf13NVVQ-V6wrw5rQELKiThzpPx
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>
Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 mm/memory.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index cf4ae87b15639..1736a130fa829 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2935,7 +2935,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;
@@ -2950,14 +2950,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