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 68078CD11C2 for ; Sun, 7 Apr 2024 06:27:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3A706B0088; Sun, 7 Apr 2024 02:27:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C33B6B0089; Sun, 7 Apr 2024 02:27:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 83DFE6B008A; Sun, 7 Apr 2024 02:27:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 631096B0088 for ; Sun, 7 Apr 2024 02:27:17 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EDC711A0834 for ; Sun, 7 Apr 2024 06:27:16 +0000 (UTC) X-FDA: 81981753672.19.DB48AE9 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by imf08.hostedemail.com (Postfix) with ESMTP id 6724B160008 for ; Sun, 7 Apr 2024 06:27:12 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of gehao@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=gehao@kylinos.cn; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712471235; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=S3mTScEpmf/GWRUJ5nCYMb0VZbnl1Nij0hu+WJ+QeP4=; b=yvUMlC5krYb/940KiqEHQM44HkuKfTsweDjhWTR8DJXi6GKrvwAN9s0/9FEhkISouMKwaJ ZJyxnWVBQilAKH04qc4yCn215JzAq+eP7esoREnkmnHKJp6qLdDUt7ODy3RTtPxLu9Yf84 gNRuJIVnWJjNLBfF6JPh0CfXEupTyes= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712471235; a=rsa-sha256; cv=none; b=PX/zDCTcfqFxHREsD55CCEbaJRwc2aCBJFSIrte7F3odMEH2mmBiDpdE+JRCJcv0ev/FwO mibdubT6ESjqUqc20xZzh2gcEpkX+tEaOWTIBJ+LfQAou9qvpcwkq1cruNJ94YpUNCagtJ 7YC2kTgCd6PLAzzEBuq6yMn+g2vitnM= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of gehao@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=gehao@kylinos.cn; dmarc=none X-UUID: da943092f4a711eeaf09c5092e5928d1-20240407 X-CID-UNFAMILIAR: 1 X-CID-O-RULE: Release_Ham X-CID-RULE: EDM_GE969F26 X-CID-O-INFO: VERSION:1.1.37,REQID:948c4543-3f8b-4a76-ab10-3baa5673adff,IP:15, URL:0,TC:0,Content:0,EDM:-25,RT:0,SF:12,FILE:0,BULK:0,RULE:Release_Ham,ACT ION:release,TS:2 X-CID-INFO: VERSION:1.1.37,REQID:948c4543-3f8b-4a76-ab10-3baa5673adff,IP:15,UR L:0,TC:0,Content:0,EDM:-25,RT:0,SF:12,FILE:0,BULK:0,RULE:EDM_GE969F26,ACTI ON:release,TS:2 X-CID-META: VersionHash:6f543d0,CLOUDID:60e088d839de1bf4cdd3d3db2ff0b4a3,BulkI D:2404071427067MY2OJ0A,BulkQuantity:0,Recheck:0,SF:66|38|25|16|19|44|102,T C:nil,Content:0,EDM:1,IP:-2,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil, COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_USA,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI X-CTIC-Tags: HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CC_NO_NAME, HR_CTE_8B HR_CTT_MISS, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM, HR_SJ_PHRASE HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT, HR_TO_NO_NAME IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_TRUSTED, SA_EXISTED SN_TRUSTED, SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS CIE_BAD, CIE_GOOD_SPF, GTI_FG_BS, GTI_RG_INFO, GTI_C_BU AMN_T1, AMN_GOOD, AMN_C_TI, AMN_C_BU, ABX_MISS_RDNS ZHF_RECV_LOCALHOST X-UUID: da943092f4a711eeaf09c5092e5928d1-20240407 X-User: gehao@kylinos.cn Received: from localhost.localdomain [(116.128.244.171)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 1678508837; Sun, 07 Apr 2024 14:27:05 +0800 From: Hao Ge To: akpm@linux-foundation.org, Liam.Howlett@oracle.com, vbabka@suse.cz, lstoakes@gmail.com, willy@infradead.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, gehao618@163.com, Hao Ge Subject: [PATCH] mm/mmap: make vma_wants_writenotify return bool Date: Sun, 7 Apr 2024 14:26:53 +0800 Message-Id: <20240407062653.803142-1-gehao@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6724B160008 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 15tqsbko3zwwsta15cka8ratw33grq7f X-HE-Tag: 1712471232-128630 X-HE-Meta: U2FsdGVkX1++C5+ucJkuiD7dQEVRJftnC5i+ljLkTAI/eNmN9a9O/auwzu72Xqkahvi2bETMOFgVYLYmvTVZ2yXOifeq6UOuLPcYZycmkOpWlq/mPUBiQ9Lmyb491QeDjsYxZGcnqQEPfbENIU4dPboK3sZrw5+x+Ajtd/TvmPFJsSiQdZExg2twOb6wrA4IXyK/rFOQ5cJiZSS1T3dZEYJHSCDviC5bFrLpxx19BziVG6zsNrIMz9kdceeFKbwG8yHzgR38X8WvRDWMeSTEY88VywmY2vs5ZuYCDqoG/PfBLqf3OD2y315Jn3tvYFyEOBMDPB+TuX0K3KIA9eqSuVCQls0S46qRjUvr9mBuJyAnGFexi/8a9k5fRtuMz8dovj/cFNrdmvddiBS97sx6Cls8EJ6TbPevaUL9DjT6AYcIOBkXO+SwcyKKXeuFponbXwZ6K5eSmJ0jx+3ymXdzZg/4YybPr0DyvIfd5AXrGYH27dJTA6z9vR/4VXqtto2TLNb8nTvD5Rt9LSpdbRsuXUBZyP8gEHChXnsnrdgpe+o88Z9lpkkOsIw9KfW/Y13+KtJZF6YzvYXk+wvle+Lm7uS+bzlcvz4hvCI251BQl3lJlOe5xRcepI6anxOWNX+ocvEd7gYpe/FaoPke56NaDtfbN2SNrkViCkx6SGERaKIX7zELCSzXdRiLny5+EN9xntQiDwgL4E1RiEAj1VeAdKGcdlaON5ki3BoYktH4vAbSRTBF9i3skNrW/dIsbHROxuLzyxVbFB2QFDZsLoPtLa2HuUj59+z0FAkTpOTYGhGCm9qiBz3ZfRNcEXo1gTutj4xlX79CwUI= 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: vma_wants_writenotify should return bool,so we change it Signed-off-by: Hao Ge --- include/linux/mm.h | 2 +- mm/mmap.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 0436b919f1c7..e2f1374c43b0 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2550,7 +2550,7 @@ extern unsigned long move_page_tables(struct vm_area_struct *vma, MM_CP_UFFD_WP_RESOLVE) bool vma_needs_dirty_tracking(struct vm_area_struct *vma); -int vma_wants_writenotify(struct vm_area_struct *vma, pgprot_t vm_page_prot); +bool vma_wants_writenotify(struct vm_area_struct *vma, pgprot_t vm_page_prot); static inline bool vma_wants_manual_pte_write_upgrade(struct vm_area_struct *vma) { /* diff --git a/mm/mmap.c b/mm/mmap.c index 6dbda99a47da..ac219f1689e0 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1514,32 +1514,32 @@ bool vma_needs_dirty_tracking(struct vm_area_struct *vma) * to the private version (using protection_map[] without the * VM_SHARED bit). */ -int vma_wants_writenotify(struct vm_area_struct *vma, pgprot_t vm_page_prot) +bool vma_wants_writenotify(struct vm_area_struct *vma, pgprot_t vm_page_prot) { /* If it was private or non-writable, the write bit is already clear */ if (!vma_is_shared_writable(vma)) - return 0; + return false; /* The backer wishes to know when pages are first written to? */ if (vm_ops_needs_writenotify(vma->vm_ops)) - return 1; + return true; /* The open routine did something to the protections that pgprot_modify * won't preserve? */ if (pgprot_val(vm_page_prot) != pgprot_val(vm_pgprot_modify(vm_page_prot, vma->vm_flags))) - return 0; + return false; /* * Do we need to track softdirty? hugetlb does not support softdirty * tracking yet. */ if (vma_soft_dirty_enabled(vma) && !is_vm_hugetlb_page(vma)) - return 1; + return true; /* Do we need write faults for uffd-wp tracking? */ if (userfaultfd_wp(vma)) - return 1; + return true; /* Can the mapping track the dirty pages? */ return vma_fs_can_writeback(vma); -- 2.25.1