From: Alexandre Ghiti <alexghiti@rivosinc.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Ryan Roberts <ryan.roberts@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Andrew Morton <akpm@linux-foundation.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org,
linux-mm@kvack.org
Cc: Alexandre Ghiti <alexghiti@rivosinc.com>
Subject: [PATCH 2/9] riscv: Safely remove huge_pte_offset() when manipulating NAPOT ptes
Date: Fri, 1 Mar 2024 10:14:48 +0100 [thread overview]
Message-ID: <20240301091455.246686-3-alexghiti@rivosinc.com> (raw)
In-Reply-To: <20240301091455.246686-1-alexghiti@rivosinc.com>
The pte_t pointer is expected to point to the first entry of the NAPOT
mapping so no need to use huge_pte_offset(), similarly to what is done
in arm64.
Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
---
arch/riscv/mm/hugetlbpage.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/riscv/mm/hugetlbpage.c b/arch/riscv/mm/hugetlbpage.c
index 3d84fbc5c572..2477d20c1497 100644
--- a/arch/riscv/mm/hugetlbpage.c
+++ b/arch/riscv/mm/hugetlbpage.c
@@ -274,7 +274,6 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma,
return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
pte_num = arch_contpte_get_num_contig(ptep, 0, &pgsize);
- ptep = huge_pte_offset(mm, addr, pte_num * pgsize);
orig_pte = get_clear_contig_flush(mm, addr, ptep, pte_num);
@@ -319,10 +318,8 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm,
}
pte_num = arch_contpte_get_num_contig(ptep, 0, &pgsize);
- ptep = huge_pte_offset(mm, addr, pte_num * pgsize);
orig_pte = get_clear_contig_flush(mm, addr, ptep, pte_num);
-
orig_pte = pte_wrprotect(orig_pte);
set_ptes(mm, addr, ptep, orig_pte, pte_num);
--
2.39.2
next prev parent reply other threads:[~2024-03-01 9:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-01 9:14 [PATCH 0/9] Merge arm64/riscv hugetlbfs contpte support Alexandre Ghiti
2024-03-01 9:14 ` [PATCH 1/9] riscv: Restore the pfn in a NAPOT pte when manipulated by core mm code Alexandre Ghiti
2024-03-01 9:14 ` Alexandre Ghiti [this message]
2024-03-01 9:14 ` [PATCH 3/9] mm: Use common huge_ptep_get() function for riscv/arm64 Alexandre Ghiti
2024-03-01 9:14 ` [PATCH 4/9] mm: Use common set_huge_pte_at() " Alexandre Ghiti
2024-03-01 9:14 ` [PATCH 5/9] mm: Use common huge_pte_clear() " Alexandre Ghiti
2024-03-01 9:14 ` [PATCH 6/9] mm: Use common huge_ptep_get_and_clear() " Alexandre Ghiti
2024-03-01 9:14 ` [PATCH 7/9] mm: Use common huge_ptep_set_access_flags() " Alexandre Ghiti
2024-03-01 9:14 ` [PATCH 8/9] mm: Use common huge_ptep_set_wrprotect() " Alexandre Ghiti
2024-03-01 9:14 ` [PATCH 9/9] mm: Use common huge_ptep_clear_flush() " Alexandre Ghiti
2024-03-01 10:45 ` [PATCH 0/9] Merge arm64/riscv hugetlbfs contpte support Ryan Roberts
2024-03-01 11:29 ` Alexandre Ghiti
2024-03-01 11:38 ` Ryan Roberts
2024-04-18 22:11 ` Palmer Dabbelt
2024-04-19 11:03 ` Will Deacon
2024-04-22 8:50 ` Alexandre Ghiti
2024-04-23 8:52 ` Ryan Roberts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240301091455.246686-3-alexghiti@rivosinc.com \
--to=alexghiti@rivosinc.com \
--cc=akpm@linux-foundation.org \
--cc=aou@eecs.berkeley.edu \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-riscv@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=ryan.roberts@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).