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 306D9C3ABAC for ; Tue, 6 May 2025 08:50:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6E23C6B008C; Tue, 6 May 2025 04:50:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 691A96B0092; Tue, 6 May 2025 04:50:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 533BE6B0093; Tue, 6 May 2025 04:50:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3416B6B008C for ; Tue, 6 May 2025 04:50:15 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3BE421204F5 for ; Tue, 6 May 2025 08:50:16 +0000 (UTC) X-FDA: 83411861232.01.E32C350 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf24.hostedemail.com (Postfix) with ESMTP id 0D315180004 for ; Tue, 6 May 2025 08:50:13 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf24.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746521414; a=rsa-sha256; cv=none; b=HQ3EzlN78KltSUGU3ZF7u0RV5MbuPMV8cVVZg6c/yD/dWaJBya2tVfWBxqljVKdNdjqnMj Hj5peoUbElrU52A53I8M439Ez9Ldfl9wKcEsZawUaiqFLCM4cjWX7Z5TISyMMEX/ptkxV2 AyoBsmjgSyNVheWWQUDM3fU55r9Sgjo= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf24.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746521414; 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=qbYE+qU6YzUFDFX5Rl+rMpDmEFM2Z1pIjOr6GNEPdPw=; b=NT9RUIINqkl6DNwB9iEVe1dZ5RrU11j9LJ90SVBJDLFCYQ63nzKqrtngKxy/7qDAACHNOZ 3kh2Y8h0ZNUKFc+z4ktM2HIdEGufEh3ua49YH8a/7Vt8/7//5Z6rCYaf4FHWj68rmiLi7H n82umSjOecdlUvurdzmwTQqazUS0IxY= 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 7381D113E; Tue, 6 May 2025 01:50:03 -0700 (PDT) Received: from [10.163.54.208] (unknown [10.163.54.208]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C04EC3F673; Tue, 6 May 2025 01:50:04 -0700 (PDT) Message-ID: <4cee3168-cb9f-4b73-a2f5-51ac177c35dc@arm.com> Date: Tue, 6 May 2025 14:20:01 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/3] 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 References: <20250506050056.59250-1-dev.jain@arm.com> <20250506050056.59250-2-dev.jain@arm.com> Content-Language: en-US From: Anshuman Khandual In-Reply-To: <20250506050056.59250-2-dev.jain@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 0D315180004 X-Stat-Signature: e4mfcngheic5s7mj7uu3qccrz4yiwbcp X-HE-Tag: 1746521413-865914 X-HE-Meta: U2FsdGVkX1/5ZoJaFLq9P44QMl8lxsjGaWclEOWf+GeSIJSlSPfbg6F5Y8mqNRd+wwhuGyEmeiwUom3ubE7dN2ZYlaQQwpFbfm+ilSaOesm+XR+aUuV5lzYdygA3RqML027nlAYk7RO6anb5WBzfSn6QNniAkdZjE7JbYO78QRerlRfvL7If4hEPxYrG65tJhegxMoH32cHM4Ci22T42OR8SLzmX1Q3FwXxduRsvZM2dErDH804aTKwpoypPNSRQ2w48s7yyTUSDdlfkReNxSW3ZD14AzA9ilkjHyKG4kCdegQM3PAF6nH+wnlGoSDhxccisVQucGN4qntGDZGJzoVATGZK2teo07aAHdz50nAUDdu/WRdsXmwbvHqwI0JnATVxKWC4bYKKF0b5AZGVmzGYdIibBfj+WviBsVC8IcHor621lhCgvA9vhFqEzSe4xPJzz6y5mNakqVJPvf77mByts/fqvP2iPKz+WA7bv2jUBOunSinAw8E7e1OFSQnHPTnvvaQ4D0AtXyGmCh+PUZnph25QPaIgIhSXmmH1lQ5FjGtBWkVzN9DVqGef5XuKSQo5fI4WloQc9PgjIW8DcupA6hSPk5X4Yc0GLEhGJgPJpPPzbm1VnE4DmaRiOXbf9d/FzDQIwkjspUAPI2e98k+toa/cBC2OmpNcJOmCZDXuqkw9vA80h6fNwjLrYJOA66F99CPl0M6S5ilTrPxG4woIifrv8sCCVFMaNNLeb3EK60tv7LKOimMGkXWk4jeg9Z3Ml+4zhXw6aeYT66zJVhQVAZ88te4i1uuNeB7rmdwKKVunX9KBZWg0WXjsIA94GJ+C/OhOX+BMjP1WwnXYxpqOonJNDXWlh/fTp5pZ/POZpI3RJstbrFmdRutvpZoxygWfmaznnZ/Yh+zZ5r1h67zV97Fb6PTvDsPTo260ADmAXY884+3H92b103jo2GOO/1cauO0Io0LsD8Y77Qhl 0x4fbhU4 No9znJZoofeKgr1KNz/R2svXN0H2dS0ixUHEvpdvBQpppZ+XtJKVDZDy/96rTKLnXiW+ZDPT+5Wts42Vxp7Hsei2K//EzbZIl8ppfxqQ5pjpd4qYXj+CaDPTNY3DznyOF9nNYRENOonwgasPKvrEKeRqaBrPVQcVb9cLpmZGFeO4ci4NABu1MeHJ/6223lwe2ytzcAbzrF0ngs94wGzYkICCMo4eRXJ9Be1MiqZ3jRriqA1annq+TAfATeg== 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: On 5/6/25 10:30, Dev Jain wrote: > Avoid confusion between pte_t* and pte_t data types by appending pointer > type variables by p. No functional change. > > Signed-off-by: Dev Jain > --- > mm/mremap.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/mm/mremap.c b/mm/mremap.c > index 7db9da609c84..1a08a7c3b92f 100644 > --- a/mm/mremap.c > +++ b/mm/mremap.c > @@ -176,7 +176,7 @@ 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; > pmd_t dummy_pmdval; > spinlock_t *old_ptl, *new_ptl; > bool force_flush = false; > @@ -211,8 +211,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 +223,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 +235,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 +258,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 +266,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 +275,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); Although this makes sense, mm/mremap.c might not be the only place with such naming confusions regarding page table entry and page table pointers. Rather than fixing this in just a single file, I guess generic MM wide change will be better.