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 AA91EC072A2 for ; Sat, 18 Nov 2023 02:43:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 359DE6B054A; Fri, 17 Nov 2023 21:43:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 309BA6B054C; Fri, 17 Nov 2023 21:43:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1D1486B054D; Fri, 17 Nov 2023 21:43:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0CC976B054A for ; Fri, 17 Nov 2023 21:43:25 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D3C04C0E18 for ; Sat, 18 Nov 2023 02:43:24 +0000 (UTC) X-FDA: 81469528728.02.3B5211C Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf18.hostedemail.com (Postfix) with ESMTP id 0C4221C0004 for ; Sat, 18 Nov 2023 02:43:20 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700275402; 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=G/iwcHk7NkjxgpbwwvS84JQ00EntZu/foFprcPpVBA8=; b=a8nGwdD1OJ3Fl4GSICXwhWa0Le8SvQPMuw16kUAJ/jraROrUxOluyykdjq4K4YImNcWLPC 35pJD6vMJaFZwdevZR5ft+3Fer29gSGV76QiquMwCuid1OVe4IAhD62PjAklZWYVqFm+oF dFLialAJ5fBIWzGhtH4JsixleSJ4MXM= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700275402; a=rsa-sha256; cv=none; b=opmQESdLeeXwkS0N7GLo+pKTNYbcweg0DkFkLI0nbhgGVW+S9P5cioWTfA8VAuU6eX5V+I 61iVcjPPVHUR+g04TITEfTZnuz0KWMlhmtHiQ13EgkF07RcBD2w09rixctPHJBIqo6YHJm 3JROLwmDICnAzWiRJ2o+XO/8alm0bPg= Received: from dggpemm100001.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SXHzZ3RqtzsR5v; Sat, 18 Nov 2023 10:39:38 +0800 (CST) Received: from [10.174.177.243] (10.174.177.243) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Sat, 18 Nov 2023 10:43:01 +0800 Message-ID: <153d0e8e-c860-4221-bcb0-71b46f17e2d5@huawei.com> Date: Sat, 18 Nov 2023 10:43:01 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 5/5] mm: memory: use folio_prealloc() in wp_page_copy() To: Andrew Morton CC: , , Matthew Wilcox , David Hildenbrand , Sidhartha Kumar , Vishal Moola References: <20231118023232.1409103-1-wangkefeng.wang@huawei.com> <20231118023232.1409103-6-wangkefeng.wang@huawei.com> Content-Language: en-US From: Kefeng Wang In-Reply-To: <20231118023232.1409103-6-wangkefeng.wang@huawei.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm100001.china.huawei.com (7.185.36.93) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0C4221C0004 X-Stat-Signature: wwnicy18s6wbdeb655aw144fcd75fa9p X-HE-Tag: 1700275400-886194 X-HE-Meta: U2FsdGVkX19pz+kpBbqITTaqJUZq7GAEv9VeyF6pycHixzRgjdWFMknumpMw8d6v1PTmg6ZwhTo2eWSWaWyvhxPVnCi6YeVvz1FDTHL0sUyU2ZdchEPNnVCH4f6RRcnn+3sSNqiad4pnmCDABkVLt2nJLpRsxR0eRtAbmemBYE6qBVcYjmXAFRiJ2kHaC2JUPnYPjL84VHY4VY8RHFkw4ZhHC9YqU1MMI83Z2fjrGp/gH62PmR2xQv6K35fgLrBm6abFSgrl/mUUCf5dGO7po62TKK2DEQ1HoAKAI2ImNsyBBI0CWNJ2tez5jYxPlD56mD4u9u2ixoO/ujIUz8fJwqPCHNtdYRJacYzl8L0oaRVBFxY7Iq50DXeQrOV89A8RKjZfzdr4Rk1Le8NGneUbrgLB8sv8SH3LkUD1E92H0nYwkoecgAs7QqgUlz9raXXdTvgrlmt5p/lO8Am+NDRRRnlmjPYPahEZbGTwtuE86N3/10p0OA3nx4/LjrWnqqBuOwwf7mDMlu4jcT5CfMF12OW+FCZh5OTXNkaAX9SYIeY4WK7sg65edemrBnDutyq4NB0bmRYDQrMh0Lw50wW+Ab/FI9K33pF1iSG+VnE4YlukF7VVwQNfFVgIU9SHmZY/p6vhwpLaN4npeHwBse/QffsWFvAuKFEsGiXRbxi+VawlvESZAYNnQapEeudAjIqVH3FNjVhl4gBEeUkIG54gwKYgxfxQh6QfEVAjyH5AySylfol1LhrS/CwvMf8CgRLF93U01boXaOE5zH/a1G4oUaaalAVOgeqEH7YmvGJeEkWWLN+qejtWiVXN8ksXgT7VVjkcxu9mXfs7BPSRBHBf8gyekcdCo4owAeEvfC3heu6vrtuWHcCZRrHXNE0dqkr9mW/ympiSp0loH5eSQ9lFCvJfNnXd1QBwNqqu/SBPq1rCQaja74WpCSEkZhYBJrP3kgGEbQpiul9yeD9iUOe JrZRhQ1u +FByLrxtSRi1Bs/4UhhExhYsx8pL/YB7vA5UZ96m9JW6HFdvH0AYKYI+q8SC605IPjzXYlAZHUD1nd+wMSCSpWL7lmLtieKxq+20en2V0X1v43c77cDcztxbuCW9a5qj7qkL5d7UjiYiuQCOB2R20Dl56fL4Dk8hlj1zKjSKtG2OGHQL2eSPGoB4PefkcrRIYg7vACjPWJWzt+6XoJKT0JxTiw8X55fmlKVuHujQ3hBUf7zRJ+uR+MiuXc2QnIZ0qgoNfgkA9V/brZAz/pUczSAwd1iqteNtpNnb+6IyvViwDnepLD3D/69N3JgMaVJl61HLwyWgkEm8VVZQ= 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: List-Subscribe: List-Unsubscribe: On 2023/11/18 10:32, Kefeng Wang wrote: > Use folio_prealloc() helper to simplify code a bit. > Forget to add RB of Vishal，adding it Reviewed-by: Vishal Moola (Oracle) > Signed-off-by: Kefeng Wang > --- > mm/memory.c | 22 +++++++--------------- > 1 file changed, 7 insertions(+), 15 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index 868a2fc54549..98d9c7094cab 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -3112,6 +3112,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) > int page_copied = 0; > struct mmu_notifier_range range; > vm_fault_t ret; > + bool pfn_is_zero; > > delayacct_wpcopy_start(); > > @@ -3121,16 +3122,13 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) > if (unlikely(ret)) > goto out; > > - if (is_zero_pfn(pte_pfn(vmf->orig_pte))) { > - new_folio = vma_alloc_zeroed_movable_folio(vma, vmf->address); > - if (!new_folio) > - goto oom; > - } else { > + pfn_is_zero = is_zero_pfn(pte_pfn(vmf->orig_pte)); > + new_folio = folio_prealloc(mm, vma, vmf->address, pfn_is_zero); > + if (!new_folio) > + goto oom; > + > + if (!pfn_is_zero) { > int err; > - new_folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, vma, > - vmf->address, false); > - if (!new_folio) > - goto oom; > > err = __wp_page_copy_user(&new_folio->page, vmf->page, vmf); > if (err) { > @@ -3151,10 +3149,6 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) > kmsan_copy_page_meta(&new_folio->page, vmf->page); > } > > - if (mem_cgroup_charge(new_folio, mm, GFP_KERNEL)) > - goto oom_free_new; > - folio_throttle_swaprate(new_folio, GFP_KERNEL); > - > __folio_mark_uptodate(new_folio); > > mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, mm, > @@ -3253,8 +3247,6 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) > > delayacct_wpcopy_end(); > return 0; > -oom_free_new: > - folio_put(new_folio); > oom: > ret = VM_FAULT_OOM; > out: