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 B83DDC5B543 for ; Tue, 10 Jun 2025 03:51:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 36A8C6B0089; Mon, 9 Jun 2025 23:51:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 341986B008A; Mon, 9 Jun 2025 23:51:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 27F686B008C; Mon, 9 Jun 2025 23:51:05 -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 0CAA76B0089 for ; Mon, 9 Jun 2025 23:51:05 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B416380D83 for ; Tue, 10 Jun 2025 03:51:04 +0000 (UTC) X-FDA: 83538115248.17.822CBFD Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf26.hostedemail.com (Postfix) with ESMTP id 0D310140008 for ; Tue, 10 Jun 2025 03:51:02 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; spf=pass (imf26.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=1749527463; a=rsa-sha256; cv=none; b=xhF4UtbLtLwO+bbGdXWGYs+OHYcgPADo2Kl05fCbePZubMGkpaKl4PSxIP3yeyrbJF/hvZ vkSLHmgJhDJsi+TyyEC5fMue84UJ4xUGYDgn6Lu90EkkarFUrRCUwFNcoDk5tFyGObWlso 3BoKcKGNN66G0iA2Cu69zjnD+88e85E= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; spf=pass (imf26.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=1749527463; 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=7XuNBzHbN9Y68RevKttjaLJwqhKqIax5kj7Mc8Ib0Ug=; b=Z4dFqzGYnKchJ9GpKYCw4qKfJKs7ALApiXR3WVqWhDFKv1wOuFsA5STQtm0n++RvoZHuBO DTByr6g8umJHKn707Y5GMVkRfTQOpETBHILk9FJAkJjg7gw6RvwunwTClW2mY9PJo1Q2b5 1lxzyn7zF+1rYJSKvgrCy7YR2zRA0Qo= 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 CCB1416A3; Mon, 9 Jun 2025 20:50:42 -0700 (PDT) Received: from MacBook-Pro.blr.arm.com (MacBook-Pro.blr.arm.com [10.164.18.48]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3E0B33F59E; Mon, 9 Jun 2025 20:50:54 -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 v4 1/2] mm: Call pointers to ptes as ptep Date: Tue, 10 Jun 2025 09:20:42 +0530 Message-Id: <20250610035043.75448-2-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250610035043.75448-1-dev.jain@arm.com> References: <20250610035043.75448-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 0D310140008 X-Stat-Signature: 3qszte1uwbfkqb55qabjchqb786dm7rz X-Rspam-User: X-HE-Tag: 1749527462-505990 X-HE-Meta: U2FsdGVkX1++ATnAAeoiRH1a3eNt6UpwVeH3T5H+d1o/QkppH2IRdybNi15c2O3fRZ1A757HO0FMv8ZGw6zsjWdVGS+Ryag3XfOtN6f8UO67Ivvpu91aza7powjyf9Ljyj359UdDnFpYqrcnK82/YQY2LG4z3b/6KQ6ULKRV1kf0NdnlMBY75JgvAfIk9W4bH0jTIjIU0vLHQsEEz7JzOrjSW+aQN6RE7AeqZMfwWp+5jFzt5g9KREdZbz/aTXJRKUjRRuIpWHKA9/rCHMm2X0DoY5Ihz8g3vPQrVO+eGI249JKw8SBU+rCQPlR4JuniIC8s1z/pD1Aj82KaX+2JCFAp1LE3/oNWbOJgxMUESC3vEbo0qnlgr/RvF9sa9diQcy38k99qp+Hfj/ICv8WG0Tl6DZ97sZ0hpWM5Ot8StLfpXdeIzNPsSorPN+WsnIGn6PfCC2KjHynE6F3E+mnWf+/f4nSwPh7gm3jq2Kd8UpJaCJWFwIwWtZHYlfN8mMAXTp0BNGv+k0lNwptAwZhym3l3PEEfFdNP0xudV+9bre5Yyf+9D3H2bLkqOGdCwkfN2D49OEN+X3WacrB6Kk+o1vV35Jxfqy94ZCAbcB8x3rLPJLH/znmtmgPWRL2HJBG/jtrtiiUaIbbYIB/xl+bIA1IVb6hnrN1gNZ8Ol1RCUKleqxUjGOP897ZAGwJWQ3oMoA4YHI9ZuTwfsSG8eVodD0RHBjtmH+SLYE18BAmTp7k/XLD8/nIRO5iF8OxTjxxFGIsRbfy/01xp8f0tKLwFhnMhDLL/ki8Pc4UuTyR6zTPeo9WRrk/Uq5i2YSKhktSUGjjufleoFClzqYNspkN3o05GlAbpOKEOT+h2hE+O106mdNz6c3HDr6yaIeiPybdlXy3Py1zh/WZcMDfTYzPYzDJDQircry/6bZuYWtS3EZm//IasF1LsZ5e++Zo57+PheGzsPtk+mKJM6VSJJLL 6/Ps7xeJ D6RD74N4GH3QSWi2k+ecPM+ChzMXy16vX2C6X8M7FNLYgqQRewUQwB//bbuQ80Awy6pb6jxN9ADG5t9nlmnsoPr3r5JVWsZm4vjAjOXy61854e37fzT5Ph3tDFTEMm7lqD/LFXMoyQqBsHUt6Gw0I2jo+Zh8GQUA8Ui4zc+ldsedvhc9/kTQG0CIQT0nN94bMTWqvud65DNjmbJg= 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. Reviewed-by: Barry Song Reviewed-by: Anshuman Khandual Reviewed-by: Lorenzo Stoakes Signed-off-by: Dev Jain --- mm/mremap.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 60f6b8d0d5f0..180b12225368 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,14 +236,14 @@ 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) { - VM_WARN_ON_ONCE(!pte_none(*new_pte)); + for (; old_addr < old_end; old_ptep++, old_addr += PAGE_SIZE, + new_ptep++, new_addr += PAGE_SIZE) { + VM_WARN_ON_ONCE(!pte_none(*new_ptep)); - if (pte_none(ptep_get(old_pte))) + 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 @@ -260,7 +261,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)) @@ -268,7 +269,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); } } @@ -277,8 +278,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