From: punit.agrawal@arm.com (Punit Agrawal)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/7] arm64: hugetlb: Introduce pte_pgprot helper
Date: Mon, 27 Mar 2017 10:27:23 +0100 [thread overview]
Message-ID: <20170327092726.31730-5-punit.agrawal@arm.com> (raw)
In-Reply-To: <20170327092726.31730-1-punit.agrawal@arm.com>
From: Steve Capper <steve.capper@arm.com>
Rather than xor pte bits in various places, use this helper function.
Cc: David Woods <dwoods@mellanox.com>
Signed-off-by: Steve Capper <steve.capper@arm.com>
Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
---
arch/arm64/mm/hugetlbpage.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
index 81bc6e4cf714..44d637eb32a7 100644
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@ -41,6 +41,16 @@ int pud_huge(pud_t pud)
#endif
}
+/*
+ * Select all bits except the pfn
+ */
+static inline pgprot_t pte_pgprot(pte_t pte)
+{
+ unsigned long pfn = pte_pfn(pte);
+
+ return __pgprot(pte_val(pfn_pte(pfn, __pgprot(0))) ^ pte_val(pte));
+}
+
static int find_num_contig(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, size_t *pgsize)
{
@@ -80,7 +90,7 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
ncontig = find_num_contig(mm, addr, ptep, &pgsize);
pfn = pte_pfn(pte);
- hugeprot = __pgprot(pte_val(pfn_pte(pfn, __pgprot(0))) ^ pte_val(pte));
+ hugeprot = pte_pgprot(pte);
for (i = 0; i < ncontig; i++) {
pr_debug("%s: set pte %p to 0x%llx\n", __func__, ptep,
pte_val(pfn_pte(pfn, hugeprot)));
@@ -235,9 +245,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma,
size_t pgsize = 0;
unsigned long pfn = pte_pfn(pte);
/* Select all bits except the pfn */
- pgprot_t hugeprot =
- __pgprot(pte_val(pfn_pte(pfn, __pgprot(0))) ^
- pte_val(pte));
+ pgprot_t hugeprot = pte_pgprot(pte);
cpte = huge_pte_offset(vma->vm_mm, addr);
pfn = pte_pfn(*cpte);
--
2.11.0
next prev parent reply other threads:[~2017-03-27 9:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-27 9:27 [PATCH v2 0/7] arm64: hugetlb cleanup + break-before-make fixes Punit Agrawal
2017-03-27 9:27 ` [PATCH v2 1/7] arm64: hugetlb: set_huge_pte_at Add WARN_ON on !pte_present Punit Agrawal
2017-03-27 9:27 ` [PATCH v2 2/7] arm64: hugetlb: Cleanup setup_hugepagesz Punit Agrawal
2017-03-27 9:27 ` Punit Agrawal
2017-03-27 9:27 ` [PATCH v2 3/7] arm64: hugetlb: Refactor find_num_contig Punit Agrawal
2017-03-27 9:27 ` Punit Agrawal [this message]
2017-03-27 9:27 ` [PATCH v2 5/7] arm64: hugetlb: Remove spurious calls to huge_ptep_offset Punit Agrawal
2017-03-27 9:27 ` [PATCH v2 6/7] arm64: hugetlb: Spring clean huge pte accessors Punit Agrawal
2017-03-27 9:27 ` [PATCH v2 7/7] arm64: hugetlb: Add break-before-make logic for contiguous entries Punit Agrawal
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=20170327092726.31730-5-punit.agrawal@arm.com \
--to=punit.agrawal@arm.com \
--cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.