From patchwork Wed Jun 22 17:06:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 12891172 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 5E3A1C43334 for ; Wed, 22 Jun 2022 17:06:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 05C5C8E00C9; Wed, 22 Jun 2022 13:06:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ED13D6B00D2; Wed, 22 Jun 2022 13:06:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BCF268E00D1; Wed, 22 Jun 2022 13:06:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8AEDA6B00D0 for ; Wed, 22 Jun 2022 13:06:52 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 65CA280344 for ; Wed, 22 Jun 2022 17:06:52 +0000 (UTC) X-FDA: 79606501464.13.C3675C1 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf05.hostedemail.com (Postfix) with ESMTP id C19821000A1 for ; Wed, 22 Jun 2022 17:06:49 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LSqT46cSZzSgrr; Thu, 23 Jun 2022 01:03:04 +0800 (CST) Received: from huawei.com (10.175.124.27) 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; Thu, 23 Jun 2022 01:06:29 +0800 From: Miaohe Lin To: CC: , , , , , Subject: [PATCH 04/16] mm/huge_memory: use helper touch_pud in huge_pud_set_accessed Date: Thu, 23 Jun 2022 01:06:15 +0800 Message-ID: <20220622170627.19786-5-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20220622170627.19786-1-linmiaohe@huawei.com> References: <20220622170627.19786-1-linmiaohe@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655917610; 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=TVeSdvFGF6ZenxAzQdu4IqHqbWNp4ZpI0IpmlkCrI9Q=; b=K3Zr6g+qzTdRpKjTBpd59ZjQ6raGTex7Q8O5dOvf06PC4/BBCBtZkfCwtQkCrlF3nLKimi Bsc88QSVgZBjG+wK8kR8uBvdVANBK7/pnYMW7WqBChKFZM9c7N0CSI6+t3AqcJNwKS7+VW qgabLCiYQR/bmvk6DsQlLhbyQX9X0KM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655917610; a=rsa-sha256; cv=none; b=sU6NvHmfG5sxlTmq/72S43sdeTniBE61YWsTIFngbcFJButDDMYI+Z4bna37ARqQlVhUkM B3ha8Ib2C7Ei4TODXDv/3zvoBLe0ZbGox65CayewLaECY1rnrE4zAVlWVzRZPq53ruMWc4 zvpTVAzKyJBucwUZ+ifsyR+ydiY6yH4= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf05.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com X-Stat-Signature: r7si548mtqb33m1fuqqo9spcsh6asncq X-Rspamd-Queue-Id: C19821000A1 Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf05.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1655917609-296791 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: 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 | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index a26580da8011..a0c0e4bf9c1e 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1281,21 +1281,15 @@ 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; + int flags = 0; 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); - + if (vmf->flags & FAULT_FLAG_WRITE) + flags = FOLL_WRITE; + touch_pud(vmf->vma, vmf->address, vmf->pud, flags); unlock: spin_unlock(vmf->ptl); }