From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E63EB28E17 for ; Thu, 8 May 2025 06:21:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746685303; cv=none; b=uK9Fta/NJzMt/d7pOaw3D79nXGOvutjHugSaJABBv+bUaUk1Wvw4Tl6kq1UOezjV8mvqWWgT/ObJnK41VcPpkIN2vpgO2pRU0Ze3tSF71f0SyXBJ0oi5Dz4yEPIovC0iFgK9GzJ/QQcUxR2DFary0TXD1b0LUH2YUFMhbs7IIX8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746685303; c=relaxed/simple; bh=qdf9fd0sJ+/v8/q6H7R5F/ZcMzS90/wjaLwdt2Zsv6o=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=TCQZ5225U25IGJK7nMo/GLkh/doTA9SOvB5ZPOao5ojxr48r32+6COnIRiLNWGYiN2+ELAVTxinqL5VSzong0JidTkEB7IFi2PURGgVG+esImT33bH0CSVSWEzyKdqGnLthmC2urCR2/JFZDMa4cipyFAa/nbBU7RHUljvGw3SU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 717CC106F; Wed, 7 May 2025 23:21:29 -0700 (PDT) Received: from [10.163.54.182] (unknown [10.163.54.182]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 518303F5A1; Wed, 7 May 2025 23:21:32 -0700 (PDT) Message-ID: Date: Thu, 8 May 2025 11:51:28 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 1/2] mm: Call pointers to ptes as ptep To: Dev Jain , 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, willy@infradead.org, ioworker0@gmail.com, yang@os.amperecomputing.com, baolin.wang@linux.alibaba.com, ziy@nvidia.com, hughd@google.com References: <20250507060256.78278-1-dev.jain@arm.com> <20250507060256.78278-2-dev.jain@arm.com> Content-Language: en-US From: Anshuman Khandual In-Reply-To: <20250507060256.78278-2-dev.jain@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 5/7/25 11:32, Dev Jain wrote: > 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); Reviewed-by: Anshuman Khandual