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 9BA69C3ABBC for ; Tue, 6 May 2025 05:01:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3CA2A6B0082; Tue, 6 May 2025 01:01:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 37B436B0085; Tue, 6 May 2025 01:01:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 245A56B0088; Tue, 6 May 2025 01:01:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 089776B0082 for ; Tue, 6 May 2025 01:01:27 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 91C6C1A1831 for ; Tue, 6 May 2025 05:01:28 +0000 (UTC) X-FDA: 83411284656.21.6C24969 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf28.hostedemail.com (Postfix) with ESMTP id E1DDEC0007 for ; Tue, 6 May 2025 05:01:26 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf28.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746507687; a=rsa-sha256; cv=none; b=AOoklw8oVoafPWTpjZZg+Sk7YaG29iPEBgCC91oFyQGNlNsDnUHuhiuA6GVt4h5Mb+DKqw CadmR2lrbfRNksusvQ1XhWXPEGK05uJFb+QPLV/vji4w7zjIg2UqSt8GvD9AKNE8hy76No uxAADf0Bky2W2W8OcHcfr5I8QZrWUNE= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf28.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746507687; 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=w/USMi60JVZAGThPG7p2tB9q37n0nLpDre+LJQBpLEQ=; b=t0FFL0u0SYvJNqKVwHiqkK00x3tUILTDv/TjRESvct4chxJyJ7MqwfnMp3uCnBi/Ob1xkZ 2WkMJPGQ1mmK2U6IpSf2GOH7UUPr3K34TZ4711Ikmrad/SjGLNTC/mmR5ZpoSMUGTNYMO9 hDAAjJajmsoGkuCkvq/k+mdu9gaE0jo= 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 619271A2D; Mon, 5 May 2025 22:01:16 -0700 (PDT) Received: from K4MQJ0H1H2.emea.arm.com (K4MQJ0H1H2.blr.arm.com [10.162.43.13]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 802EC3F5A1; Mon, 5 May 2025 22:01:19 -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, Dev Jain Subject: [PATCH 1/3] mm: Call pointers to ptes as ptep Date: Tue, 6 May 2025 10:30:54 +0530 Message-Id: <20250506050056.59250-2-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250506050056.59250-1-dev.jain@arm.com> References: <20250506050056.59250-1-dev.jain@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: E1DDEC0007 X-Rspamd-Server: rspam04 X-Stat-Signature: y5f1gj9xanxu7f11xqcyiojf7so4g54r X-HE-Tag: 1746507686-253254 X-HE-Meta: U2FsdGVkX19SSjrkxrQHlwBY6xdGYW+owujNu85hV4MYqrZmIIM5ng6Nj9SAhbM5VzjMXGPfF5Ms6hMP7bZ0bMpJwecIcXuotU+zgbXOQm8qAzqiejb+mugjhVrZCE+QcN41tOI5/eQJJXG6osOfWOvNJi1oAgJXXvjvLppDIATovPGUJeqxPoyJY6/2ibljYZcsKN7MJ9PMp8ZRMwI/+o+UYoD497rawp/qmpHHVkzHaKktQzJf51jesrAUrjk20ENCQMFLRAwShHBe0lORrCFtnjYrv1ah8pex9J6bc7EgZrzgzBRbZMuudBbD+ABij/x7nCTO44i2rdcwWsFeKCqMpunFc7Lc8cgEKkfNvWD6QYoApltRyVL/vhhAm3pFkK1A1kE8QJAbjljfF6eeiDO7QOodY8iRxkMjmb9uhZ7+7hi8/EH960/IRIigSh9gd+2p/Hk69UFIZRNjPAeJfIscdMoSk25IrJVtmLu8X5GMYmTgrtZuieQiTZYUj+othzste8TY+Zw7y7E35fXbje4rQGnvylvxY1JQ2mDIqIVb/7BOtLDga7kbKgQCehcfSvtR0I+94yZ1UTFDzvniSAyo6/1FQ4Ib6Qfga8dDphs0X8xrA9o2sa53O4yDPmUJTq03EKxHBTmff7VnK7TqKVkfy1jwmIhlyGaVCWLKiqoJKKJdEo+mqNE1/QqGM/qwsX9OlYnFhIFXnUx7iTuJEIbsd884amflsQNMvaakc/XWdYb3hkOgjifuxmbgb7KI/Gru4eYDzGh4iyYTh+9lt0qpp7p1dQlfiQvwKNNqgPhejMb7lhalKM54+pLVZEMdc3VcOzR+2USygkjY1lWyMgRGhOq2FPFusGm+/2z/SNwiJ5UrJm/hrt2T/Y1hkrWd3Qage1kuF6Hr5EkSnieqtJ6qSLnWq6vUG1PSeeGFGbdTyBtMKGIYrjAqgu0nZiZX1Noyl/E7gKUYEyOoU08 6a2UD4+P av4aQedcEhw9mRpRamkGODabZENRqaCkDl4GEhwDI4W9tfaeh7irMQRBIQviO1sDnxD5nEypL3Hm4F9WKJ9TPjnzt6O0CrzJA9Bv0JecNkJCVaTHDrYHOqNHa1k2f7ZTikaWbE1Y+aYcG+9Pw7i18hmBF/g== 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 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); -- 2.30.2