From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D87BBEB64DD for ; Mon, 3 Jul 2023 09:29:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 27DAD8E009B; Mon, 3 Jul 2023 05:29:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 22C0A8E007C; Mon, 3 Jul 2023 05:29:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11B658E009B; Mon, 3 Jul 2023 05:29:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 019E58E007C for ; Mon, 3 Jul 2023 05:29:22 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C5131120868 for ; Mon, 3 Jul 2023 09:29:22 +0000 (UTC) X-FDA: 80969777364.11.7577385 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf02.hostedemail.com (Postfix) with ESMTP id 7FEB08000E for ; Mon, 3 Jul 2023 09:29:18 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; spf=pass (imf02.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688376560; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ug3X/lbYhCJrjxfG3gB3kWdwUp/Xu7etqB/4bi9rQQg=; b=p81AeM1FYKDfs6ndqhhEmY2c3bvTJALlHMGRntPLCbMFRxUhpQFZdSq7cX6P8FR1MM0430 KCbGZKRQM6OTNN6f3Vx8X565xveRNs2KH7EwUjY8FLKDGndTzeE3lzrJjj51obnJ0kvNwm Rcqw5XJgYprGYs40FeCiz74aBsz+JMA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688376560; a=rsa-sha256; cv=none; b=wSL1e7fXort0LW1gheCmfEawrpAAu9E76h30WrCISDc9k62yZjkMr3wwmP9E13k6ePQq7d B7Wk3yVKENOCiv8DoTShdYQA+rdnnTAGyaW2x0Vbn4f2WbQiLjjk7ecEruJalzuS9zWmLX bQWg27uWk/9mhdJl5Qfkqoz6chsuwoQ= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; spf=pass (imf02.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QvgX853mnzMqHY; Mon, 3 Jul 2023 17:26:00 +0800 (CST) Received: from [10.174.179.160] (10.174.179.160) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 3 Jul 2023 17:29:13 +0800 Message-ID: <860b4135-2d00-6864-df3f-e04689ec12e2@huawei.com> Date: Mon, 3 Jul 2023 17:29:12 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [PATCH 1/4] mm/memory: convert do_page_mkwrite() to use folios Content-Language: en-US To: Sidhartha Kumar , , CC: , References: <20230703055850.227169-1-sidhartha.kumar@oracle.com> From: "zhangpeng (AS)" In-Reply-To: <20230703055850.227169-1-sidhartha.kumar@oracle.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.179.160] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 7FEB08000E X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: jggz85xk9945boxawbq49iorntuadf81 X-HE-Tag: 1688376558-139634 X-HE-Meta: U2FsdGVkX1+cuJDwcQc+0ugdh1MwI9SKO4gXfYFzJRUbPfgOEMZlNup+wFTjWO3CEhDuna8lY2m7H/03kRENBuW0EwGeaLm7MGE4QAQJ4y7wJ/T1pZKyu48mmrNkCsLgwv/RWAN+A0XJZ57vv2tmLwpaXSZTUb9cqVAZJzBhJ0JDWepLAjFf+c+8cPiwUXhpMT+zGDK+AuXb+fQzdKa4SgS+JJTzso49KvAWgB02pHLJ6AfNsZHgmwa/ys7+eicUtx05GsDhCwCqwWSe5hkHobgY+0ZfBbfRL2iB0tJFdwDafFS2lMrpa+nc+bZUFogilYs8xEc04fr1uojMLc7yLBd4FxBZpFvyRT85WGPUZ4qz5QIpaXOImVXD9RDz/bJmQuM52wOLD0XL4mEAm8GbukNhHj9SB+zsuAm4d3twtcCtssiXWUKCAw+sl1AAquYg8nlja3p0YFXtBxa8whPDb8C0p9WvVfe2Fh7XZTSYXwK1GjQZnCwgj2LBU2l0c1AJrTIch0b1jsmgFEkNMeMo/Qm5gR5AE7kkf6r+xTDf1qmqk+/Uadh1gTk5+AXtKNM7RwifSSqrj0VkTDHh1gsIhp0qlCCDfESj8dpwT1LQMBddB3H3lvEc/V+wcaL8CeHQOgmUqv4xO83z2uIO2St1D4PBz/78M6p03TfkDStUM1UmDAiRLYynBkh5KC6G3AFcNt8bQ9q/2a3v8VmMVdE5Ff26QMY/xhF5bzgXkq7GOJWHpXMzdG0EQ7QI2q/iByYT3nb+VlcciGP4+gQJVtzmCLmRtEMAYcwdnZHyEV8hirMt+xri1QlIfCC9MbPn3GVfWk1gRzLxpU2CgFIkds3R2VoeKEwHp5M/txE/8zN5VS4IpLJ6AP2+cYTB2tonxRk58OWhOBBPiV93PH+P+IXi+GWSdV0sZAwnCx/1J1txzj6ZQDE9H7fDmYW/2kf3MhWECYJCg9w+GxAiGeHmk5D uKFpZowc nMcV5+0BWGo7rQEazSFfg694l8BphKeJbS+IH+0JSLr+CPBVkLs8TakUfFw4W6X9seyPFkZJLK/zYXATU0VTijh07KZEAyLZ/9H/djaCSas+P+9/dCHxRMQzFqBCei1PDhuxBJR8/6EwE6V1aE+cNgJWb/d4E+6xAJvVKgCU824zjSU1M/Wl3uc5R/dDjIvJPiMHK7yPo6nqqwgE= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 2023/7/3 13:58, Sidhartha Kumar wrote: > Saves one implicit call to compound_head(); > > Signed-off-by: Sidhartha Kumar > --- > mm/memory.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index 21fab27272092..098fac2f5efc0 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)) { Could page->mapping be directly converted to folio->mapping? Thanks, Peng > + 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; > } >