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 3/4] mm/memory: convert do_shared_fault() to folios
Date:   Wed,  5 Jul 2023 12:43:34 -0700
Message-ID: <20230705194335.273790-3-sidhartha.kumar@oracle.com>
In-Reply-To: <20230705194335.273790-1-sidhartha.kumar@oracle.com>
References: <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?2WA5FjZfQeAbPXVALK7BXG+quyKaKu54u5rEXIDAn10DRiWn5DBX5vIgKhm3?=
 =?us-ascii?Q?o5zFYntzut9weUMSsoFfS15/LLCTXsi5VQJBAl/Tk2qk/BPO7oyPs1XgoTTW?=
 =?us-ascii?Q?//t/S0bGQPKmiwkaQOh1jH924k3PPqDDCIo3dne3CMb2MskxwNbavZlAL/Tt?=
 =?us-ascii?Q?kE2vXy2vLvgtIt/wmyd/I9imhtuv3d0uzYNLe29tQ8j/E7rdHRqbydVPn/EF?=
 =?us-ascii?Q?uznt/pHsFAwqcjsuGvWJVdZJ8p4gak3M4ysb/l8yg3376CkGGzKAAucW/jMK?=
 =?us-ascii?Q?S1y14ZL1tH+VuJkNjRytUVZZfm/t2OZplfl5CmnrXeUCNf4OIrURKbF32MXr?=
 =?us-ascii?Q?d2TLGenyMTupPv7+WZZUpYjKAR8e9yJYvT3CD9JRAVjRZ5eOKMcqQwJFuQx2?=
 =?us-ascii?Q?eH7FwGbgyujUh/3v9JKo3nHpWHAvzlp0CDYlCdsaKa2HdnqUFg7/eVdf1SBN?=
 =?us-ascii?Q?u44pUcOEbwVDIRabI7WplaAmWu+5maoKRxX82mP1dZhHi3+6KTkUHBTDoxnx?=
 =?us-ascii?Q?I6fra/4IZOawpS7QjbjYZPBnLYLVfokS5IFLSMqXIwcRjlxRJwvCtY609TiF?=
 =?us-ascii?Q?+qYTPV10CcUmw08PYbeza3qggXuh3MqdYr53egRfN/F9U/TJbxpzXYRQ73Xn?=
 =?us-ascii?Q?LJ41ktIBbXTtexyTXMFnRBxIjuJy8DDiQ3eYrKRtdGnUkG6/RyF6jNqe1yBx?=
 =?us-ascii?Q?1bmkVZO/QCtgW3/ZcAlCug18weBoLvnIWqvjPzUTBbA7SBgR8YcjDRwnREjU?=
 =?us-ascii?Q?fYbLD+3+vROtEgw0qoz863sMcIr+vCbA9XoZKGLQsY30fUH/xPM8yYeLLrHh?=
 =?us-ascii?Q?Q6+D2gQDEJYGEwuxpEM8Xm/1+m01g860ttwrB2+2RdFLX73TlNFvEPCIjj79?=
 =?us-ascii?Q?5AxnJ0jqvCRSQb6h6m4b0sn1jh9pXklVucaR+sEyUstGG4rMXm2cKFTr1+0/?=
 =?us-ascii?Q?e9ssCDo315o4w0T/CEqFUOsRmULlZalqjtBlpbV3YMGgU5MdVBCbdLcKqfhY?=
 =?us-ascii?Q?sOfrGAxYhrBbcVWrx/OAqBA3xkfLQbrxfyWaoffDZACmFJFTPfKHSGWO00k9?=
 =?us-ascii?Q?+ZBJqqr4gXfZL4uBrHyO6X7Xm7T4c7Kx8uNqYgcKUSC8k4V7ouANaV2MnLh9?=
 =?us-ascii?Q?6s7d8dJxINmrKdicUwiOCpPja9xVrCsMRSubOPEun9uEfR3siraos0ZIHblx?=
 =?us-ascii?Q?wRmmQsPEf6TVB9sPg6ma6UHfeu5oDqR9E2RA4mzhqYr39pAUc/OaO7RBQRzr?=
 =?us-ascii?Q?pu5qK4ekqDchMIK9W8SZTvA6Z0LKNYNrGHHMRM1y7jCS+Dl8Sdtnk+ZmjTTI?=
 =?us-ascii?Q?hCQ771n6TJB10er8nofzENwLy4YBVs1NsGdsp3JE9whwviYJw2D8QKLMJEbg?=
 =?us-ascii?Q?HTOuC/uSCxfB2f6lJQ7oLbliS7EjQwXZug4TuqwD62FFI4neVI8HENrEqz8N?=
 =?us-ascii?Q?osS2mPGyLoFTF81GqfZnU/7VJ1wEhvunLtKpKa+tv+La4648ogQaufSYNaRH?=
 =?us-ascii?Q?b+bqSxnLPpAQT5TVqlrR9rRpcQ5Iqod85payPov345tTTNAAMAnnp/8z8A1l?=
 =?us-ascii?Q?V81vBN1xni63Ksco1+zrDl0HttpM0xnTj1jWSCSX6goJy8A9vUKliFVcacwD?=
 =?us-ascii?Q?mZI8Ern53zhOD52PNxsTuuw=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: VobPXkaiKw0dK9ceKqrjCVqPlsLaVaN0OvAi0NWxDQyKUnEI5JYciOOAUfwJ51rAgxuRvQkpln922PY8JhcgkB6ncaVqtDHeYUaAHtE83Uiwrk5I4pnz3p687HzWpo0ZfMTF/F3+A6SzixAe1oXBXcgX/bdtT095AAxFmk9sef00W09IsP3A4AKhj2TVyCCq9FwoxEzkUnpg3AU77JdlL9ZcjBhAb+hLxxlfKUK1Hmzl0IcFRp3asQ1Hh+yJYmVeQsx5GWDl1X30P26lLTYodx8HNuJnmgM8C5vH7CcNjiubou9St5MsyNJoBEXx7A3KhT9sogj8SwwxQaSbQVlSXY2StXgsu3mOzcwd79K18MZu+qunPF8DX+6bL+bumS5V3PoPEi5uRq1QiZUZVZwCqS60pTE9NF3MDp141bdm47+wkJC9BseAa7j0z9xi+gxh2SajM1xqgcUvpD2GdzTKYCo1pHnlEea3E2U15nPT9ZdAD/2LigzE396LqGvQntAiD7JAw2i+PBF5E/x77rdhU4/2iq5bY+mzjTA1rX8v+4y+4uJjcBEj7DTeuhL1ExgJlOtwFNu3lwscLRKjzGJ5ZOPJ7qRYG1JEK9NdqSreC0erYw4aJ+m5z30HEHbG7CRcUwpvhS5zVCppVUrkEpRZ1OOJ+OeHMIf5Agip9fSkNyzfFejkRpiryb+t0e+3UKAyUEJLrsLCzrTVUEXcctd0mg3dkXZJNcustULs/QtGhhBpMIiiPOttJaUywQaSh3ihgWRprj2lMz/Y7ZlUOthOC38XjYiFxskU6Ik1dAFKzmhC+dvdh4q6JNo/t6R4JyyziAMImlMx4TQP8N541WXzn5PlckY7xhI5s+TGpbgZlKoSKpxMlahHyMlmrpE/Rxr7
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8c08156a-b109-4c87-ba1e-08db7d902c17
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:57.3394
 (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: TBTQOV3I2JZB7KSkaLLS89HVu2L17r3/k3kd/D7bRLd8VabKWZYc18B36OjuRH2Kup009mqaLjdFK3PLmmd7dbH9TDkktcARWHVq75dA3x8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4533
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_11,2023-07-05_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=999 phishscore=0
 malwarescore=0 spamscore=0 bulkscore=0 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000
 definitions=main-2307050180
X-Proofpoint-ORIG-GUID: M9-XHpMHVJl8IMCMoywoSL_mP6h9dm9h
X-Proofpoint-GUID: M9-XHpMHVJl8IMCMoywoSL_mP6h9dm9h
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 three implicit calls to compound_head().

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

v2:
	 - move folio initialization after __do_fault()

 mm/memory.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index fba33fb55a010..ce7826d3f6200 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4593,21 +4593,24 @@ 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;
 
 	ret = __do_fault(vmf);
 	if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))
 		return ret;
 
+	folio = page_folio(vmf->page);
+
 	/*
 	 * Check if the backing address space wants to know that the page is
 	 * 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;
 		}
 	}
@@ -4615,8 +4618,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