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 202ABC43334 for ; Wed, 29 Jun 2022 02:17:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 39C256B0071; Tue, 28 Jun 2022 22:17:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 327868E0002; Tue, 28 Jun 2022 22:17:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C5768E0001; Tue, 28 Jun 2022 22:17:38 -0400 (EDT) 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 09CF86B0071 for ; Tue, 28 Jun 2022 22:17:38 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CCDCD34551 for ; Wed, 29 Jun 2022 02:17:37 +0000 (UTC) X-FDA: 79629662154.04.89E46DB Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf14.hostedemail.com (Postfix) with ESMTP id D2B45100005 for ; Wed, 29 Jun 2022 02:17:36 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4LXlTJ4yGDz9stC; Wed, 29 Jun 2022 10:16:52 +0800 (CST) Received: from [10.174.177.76] (10.174.177.76) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 29 Jun 2022 10:17:32 +0800 Subject: Re: [PATCH v2 04/16] mm/huge_memory: use helper touch_pud in huge_pud_set_accessed To: Muchun Song CC: , , , , , References: <20220628132835.8925-1-linmiaohe@huawei.com> <20220628132835.8925-5-linmiaohe@huawei.com> From: Miaohe Lin Message-ID: <086bac6c-3c99-0667-d301-2839122b89bf@huawei.com> Date: Wed, 29 Jun 2022 10:17:32 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.177.76] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656469057; a=rsa-sha256; cv=none; b=AwZA+76jPMLphCvUXADdrkBbPTf+6FUMofykElbK8n6JqCgLNFSpGmMi5uz1AdCG2aRxxB ccAp78g+Pi9hQ9/ZIjIonDg2XAw4FzYLxOsEhRl3PPPpSr2msBL5GGXjr6YdAdjc5V6w0m e45yILf4nnoEReuWiN59qOmjmgEBBNA= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=linmiaohe@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=1656469057; 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=V9u6x2dX3W3f5MxJrCsnACrBxE9FITGnaPyGSVsxipA=; b=AY6lVxPsRBW9h1cOFV9y0f0F16q+itx++K99C3Sy4drDsN6pADQvunm0ieimzI+nrlS1r/ h1cjTA4cMIJarSJGCSeCbyLofXT69s6+ev9OrjUpdpwmsSon5FO8eWlEVH5TnbBiq/AP2l +aW3Ta5OQ5RRw4DzokfUf/aHNBPl0IM= X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: D2B45100005 X-Rspam-User: X-Stat-Signature: 9151nh4r7yha1fe7y18bafrgacxjj3ya Authentication-Results: imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com X-HE-Tag: 1656469056-963859 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 2022/6/28 22:59, Muchun Song wrote: > On Tue, Jun 28, 2022 at 09:28:23PM +0800, Miaohe Lin wrote: >> Use helper touch_pud to set pud accessed to simplify the code and improve >> the readability. No functional change intended. >> >> Signed-off-by: Miaohe Lin >> --- >> mm/huge_memory.c | 16 ++++------------ >> 1 file changed, 4 insertions(+), 12 deletions(-) >> >> diff --git a/mm/huge_memory.c b/mm/huge_memory.c >> index f7164ef8b6e3..d55d5efa06c8 100644 >> --- a/mm/huge_memory.c >> +++ b/mm/huge_memory.c >> @@ -1284,15 +1284,15 @@ int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm, >> >> #ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD >> static void touch_pud(struct vm_area_struct *vma, unsigned long addr, >> - pud_t *pud, int flags) >> + pud_t *pud, bool write) > > You have change the last parameter. Have you forgotten to update its user > of follow_devmap_pud()? My bad. I was overloaded yesterday. Thanks for catching this! Will change it in next version. > > Thanks. > >> { >> pud_t _pud; >> >> _pud = pud_mkyoung(*pud); >> - if (flags & FOLL_WRITE) >> + if (write) >> _pud = pud_mkdirty(_pud); >> if (pudp_set_access_flags(vma, addr & HPAGE_PUD_MASK, >> - pud, _pud, flags & FOLL_WRITE)) >> + pud, _pud, write)) >> update_mmu_cache_pud(vma, addr, pud); >> } >> >> @@ -1384,21 +1384,13 @@ int copy_huge_pud(struct mm_struct *dst_mm, struct mm_struct *src_mm, >> >> void huge_pud_set_accessed(struct vm_fault *vmf, pud_t orig_pud) >> { >> - pud_t entry; >> - unsigned long haddr; >> bool write = vmf->flags & FAULT_FLAG_WRITE; >> >> vmf->ptl = pud_lock(vmf->vma->vm_mm, vmf->pud); >> if (unlikely(!pud_same(*vmf->pud, orig_pud))) >> goto unlock; >> >> - entry = pud_mkyoung(orig_pud); >> - if (write) >> - entry = pud_mkdirty(entry); >> - haddr = vmf->address & HPAGE_PUD_MASK; >> - if (pudp_set_access_flags(vmf->vma, haddr, vmf->pud, entry, write)) >> - update_mmu_cache_pud(vmf->vma, vmf->address, vmf->pud); >> - >> + touch_pud(vmf->vma, vmf->address, vmf->pud, write); >> unlock: >> spin_unlock(vmf->ptl); >> } >> -- >> 2.23.0 >> >> > . >