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 B56D5C3ABB6 for ; Wed, 7 May 2025 06:03:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6FC6C6B0083; Wed, 7 May 2025 02:03:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AA2C6B0085; Wed, 7 May 2025 02:03:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 571C66B0088; Wed, 7 May 2025 02:03:21 -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 3BB536B0083 for ; Wed, 7 May 2025 02:03:21 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 82E0716128B for ; Wed, 7 May 2025 06:03:22 +0000 (UTC) X-FDA: 83415069444.21.628EBA1 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf03.hostedemail.com (Postfix) with ESMTP id D733020005 for ; Wed, 7 May 2025 06:03:20 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=none; spf=pass (imf03.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746597801; a=rsa-sha256; cv=none; b=q7k5Rh+djYV2R7OuLSrZ58WhpQ/0Z8QalLGTziNN92cGL//8SJ2IzksNkcZDbN4WcmDEc+ +GfEQjnjX24PzvVRZGn0yHQUKTPq5xSZPkvKEw4NjG2cGnEskmVaMEXjMfrKaNSJvwK8VS i5eWninxLMAKp3jnuSkDOTZNk9ACD+E= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; spf=pass (imf03.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746597801; 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:in-reply-to:references:references; bh=JtjugGs4vpvQiYMoF/iMn6mM4PXXK/gVZrTGI4Wer9c=; b=SbB83h/BXLPfDgjblQso1BPjrV3An42KETIvKT8vJkenXdqiBX8Tfc0L8HEWLoZ5LDz++m Hb6bCGyNas70KKCCWh0EWxFRoOR6Yv+BDgXrkqCN8a8fLiT9626D1loV1vueIh0rcG2Ees VlxpnEBBObdmO6MG8JDGgJ5Bm102mGU= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 26684339; Tue, 6 May 2025 23:03:10 -0700 (PDT) Received: from K4MQJ0H1H2.emea.arm.com (K4MQJ0H1H2.blr.arm.com [10.162.43.22]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B7EAA3F5A1; Tue, 6 May 2025 23:03:12 -0700 (PDT) From: Dev Jain To: akpm@linux-foundation.org Cc: Liam.Howlett@oracle.com, lorenzo.stoakes@oracle.com, vbabka@suse.cz, jannh@google.com, pfalcato@suse.de, linux-mm@kvack.org, linux-kernel@vger.kernel.org, david@redhat.com, peterx@redhat.com, ryan.roberts@arm.com, mingo@kernel.org, libang.li@antgroup.com, maobibo@loongson.cn, zhengqi.arch@bytedance.com, baohua@kernel.org, anshuman.khandual@arm.com, willy@infradead.org, ioworker0@gmail.com, yang@os.amperecomputing.com, baolin.wang@linux.alibaba.com, ziy@nvidia.com, hughd@google.com, Dev Jain Subject: [PATCH v2 1/2] mm: Call pointers to ptes as ptep Date: Wed, 7 May 2025 11:32:55 +0530 Message-Id: <20250507060256.78278-2-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250507060256.78278-1-dev.jain@arm.com> References: <20250507060256.78278-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D733020005 X-Stat-Signature: 3q5gxxrc5of4h1r87w65trrgche73tqg X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1746597800-790307 X-HE-Meta: U2FsdGVkX1+Ta4/tAywiuUh+BcS3rjO5vrD6BlFzZcI43KQZHLO+yvWxMmug3wVGpZmQsuXHAyBmko74o2jiSYSxb4PpIVfR4qN8NFGya2+mhimCgc2zG6IAdPFrHNz922sxFA+og1/fWBXS+0uYYQNjtF/JsWWh+fpQqjmsgZ/yGuP6iLP/dqEfepbtJkcCWvHcvRgleIkCKc4PEkoaOYLKY+MDHxUgZWmD+eFHLJJSvrt+xm/lHh0kKX86JAqXBrv8keJeW/PlILe4yVgTIFCAWGvtU1IBUl+7PxWeGgSBrwBWwCR2Als82exUS+hJRVGLlY9isvu60mFoiWSGNvUm6EyHpdQOJp7zc83jnuddtJp2RrXMuL3SH4j1+zz87bTWrBJNg62t5svk+3URYuhk2I4dbtkJBaXiXsRxtca/FLdLnf+aod6YgnNmqJS09bIm2EPgpRAlB3LL6eFiXI36xYyAR4BJ6TDOYcvpynMKCuZOoSesKU6vW9ALxb9HxNEmoqgQsbdcNafa4rNVtw6LClklrg0FEb5VRxPG1B51FtOxzmGuK9Z/LFoE2B4BEAH11ZyANXLizyJ18Io+TiWoGESZ4VWFDdukmTLME0pfFfG/sqpZ9ZaZhGPRjcBa1GBcb56wyo5qsdEl/EQAquUttrM9hrRhkSCsbl+kc3VFyWhoceXzbgnWx94hoTnm++GSdViForv3eUqha10VKDcCZhZFJqbZc4PdYPJ6Q7tryYINHWLHiLJBu4AMxtIKob/wzqn8dKPvxII5H6zj2LODgafh1B0N7nIdbEFxbsl0Ue7Usgr7iKF9dQlloj+BzSaxGxxCeKXb733Zz+F/Nb/XONQUB1AViilgV44hbv95E3ziPHd9g7z8xrtJ/46QsVVS4DskEhvXXckDa+hwE2aHazj+mf1WEwx2N9/TCSJ+6QFzjWyxO4OgjOXcog1qeg096ev8AhXZpf8vNPq OsCXto7j LaPlZ9g/L9XWFChyvH9W3L02otSasQE27g9OKds+LTCWvw6hn6QkG70SMUajGKfeGKm6CyCazKDu/Jysh+zmfrgzC9HiOebWVPr8+v7fozF6FphrBfvJZkJUmhyTFe9DwaNwjcI+qiw3n/S3unR8njXzFdQ== 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: Avoid confusion between pte_t* and pte_t data types by suffixing pointer type variables with p. No functional change. Signed-off-by: Dev Jain --- mm/mremap.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 7db9da609c84..0163e02e5aa8 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -176,7 +176,8 @@ static int move_ptes(struct pagetable_move_control *pmc, struct vm_area_struct *vma = pmc->old; bool need_clear_uffd_wp = vma_has_uffd_without_event_remap(vma); struct mm_struct *mm = vma->vm_mm; - pte_t *old_pte, *new_pte, pte; + pte_t *old_ptep, *new_ptep; + pte_t pte; pmd_t dummy_pmdval; spinlock_t *old_ptl, *new_ptl; bool force_flush = false; @@ -211,8 +212,8 @@ static int move_ptes(struct pagetable_move_control *pmc, * We don't have to worry about the ordering of src and dst * pte locks because exclusive mmap_lock prevents deadlock. */ - old_pte = pte_offset_map_lock(mm, old_pmd, old_addr, &old_ptl); - if (!old_pte) { + old_ptep = pte_offset_map_lock(mm, old_pmd, old_addr, &old_ptl); + if (!old_ptep) { err = -EAGAIN; goto out; } @@ -223,10 +224,10 @@ static int move_ptes(struct pagetable_move_control *pmc, * mmap_lock, so this new_pte page is stable, so there is no need to get * pmdval and do pmd_same() check. */ - new_pte = pte_offset_map_rw_nolock(mm, new_pmd, new_addr, &dummy_pmdval, + new_ptep = pte_offset_map_rw_nolock(mm, new_pmd, new_addr, &dummy_pmdval, &new_ptl); - if (!new_pte) { - pte_unmap_unlock(old_pte, old_ptl); + if (!new_ptep) { + pte_unmap_unlock(old_ptep, old_ptl); err = -EAGAIN; goto out; } @@ -235,12 +236,12 @@ static int move_ptes(struct pagetable_move_control *pmc, flush_tlb_batched_pending(vma->vm_mm); arch_enter_lazy_mmu_mode(); - for (; old_addr < old_end; old_pte++, old_addr += PAGE_SIZE, - new_pte++, new_addr += PAGE_SIZE) { - if (pte_none(ptep_get(old_pte))) + for (; old_addr < old_end; old_ptep++, old_addr += PAGE_SIZE, + new_ptep++, new_addr += PAGE_SIZE) { + if (pte_none(ptep_get(old_ptep))) continue; - pte = ptep_get_and_clear(mm, old_addr, old_pte); + pte = ptep_get_and_clear(mm, old_addr, old_ptep); /* * If we are remapping a valid PTE, make sure * to flush TLB before we drop the PTL for the @@ -258,7 +259,7 @@ static int move_ptes(struct pagetable_move_control *pmc, pte = move_soft_dirty_pte(pte); if (need_clear_uffd_wp && pte_marker_uffd_wp(pte)) - pte_clear(mm, new_addr, new_pte); + pte_clear(mm, new_addr, new_ptep); else { if (need_clear_uffd_wp) { if (pte_present(pte)) @@ -266,7 +267,7 @@ static int move_ptes(struct pagetable_move_control *pmc, else if (is_swap_pte(pte)) pte = pte_swp_clear_uffd_wp(pte); } - set_pte_at(mm, new_addr, new_pte, pte); + set_pte_at(mm, new_addr, new_ptep, pte); } } @@ -275,8 +276,8 @@ static int move_ptes(struct pagetable_move_control *pmc, flush_tlb_range(vma, old_end - len, old_end); if (new_ptl != old_ptl) spin_unlock(new_ptl); - pte_unmap(new_pte - 1); - pte_unmap_unlock(old_pte - 1, old_ptl); + pte_unmap(new_ptep - 1); + pte_unmap_unlock(old_ptep - 1, old_ptl); out: if (pmc->need_rmap_locks) drop_rmap_locks(vma); -- 2.30.2