From: Punit Agrawal <punit.agrawal@arm.com>
To: will.deacon@arm.com, catalin.marinas@arm.com
Cc: Steve Capper <steve.capper@arm.com>,
linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org,
mark.rutland@arm.com, David Woods <dwoods@mellanox.com>,
Punit Agrawal <punit.agrawal@arm.com>
Subject: [PATCH v6 2/9] arm64: hugetlb: Introduce pte_pgprot helper
Date: Thu, 10 Aug 2017 18:08:59 +0100 [thread overview]
Message-ID: <20170810170906.30772-3-punit.agrawal@arm.com> (raw)
In-Reply-To: <20170810170906.30772-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 7b61e4833432..cb84ca33bc6b 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)));
@@ -223,9 +233,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);
pfn = pte_pfn(pte);
ncontig = find_num_contig(vma->vm_mm, addr, ptep,
--
2.13.2
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-08-10 17:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-10 17:08 [PATCH v6 0/9] arm64: Enable contiguous pte hugepage support Punit Agrawal
2017-08-10 17:08 ` [PATCH v6 1/9] arm64: hugetlb: set_huge_pte_at Add WARN_ON on !pte_present Punit Agrawal
2017-08-10 17:08 ` Punit Agrawal [this message]
2017-08-10 17:09 ` [PATCH v6 3/9] arm64: hugetlb: Spring clean huge pte accessors Punit Agrawal
2017-08-10 17:09 ` [PATCH v6 4/9] arm64: hugetlb: Add break-before-make logic for contiguous entries Punit Agrawal
2017-08-17 18:03 ` Catalin Marinas
2017-08-18 10:30 ` Punit Agrawal
2017-08-18 10:43 ` Catalin Marinas
2017-08-18 12:48 ` Punit Agrawal
2017-08-10 17:09 ` [PATCH v6 5/9] arm64: hugetlb: Handle swap entries in huge_pte_offset() for contiguous hugepages Punit Agrawal
2017-08-18 11:20 ` Catalin Marinas
2017-08-18 13:49 ` Punit Agrawal
2017-08-10 17:09 ` [PATCH v6 6/9] arm64: hugetlb: Override huge_pte_clear() to support " Punit Agrawal
2017-08-10 17:09 ` [PATCH v6 7/9] arm64: hugetlb: Override set_huge_swap_pte_at() " Punit Agrawal
2017-08-10 17:09 ` [PATCH v6 8/9] arm64: Re-enable support for " Punit Agrawal
2017-08-10 17:09 ` [PATCH v6 9/9] arm64: hugetlb: Cleanup setup_hugepagesz 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=20170810170906.30772-3-punit.agrawal@arm.com \
--to=punit.agrawal@arm.com \
--cc=catalin.marinas@arm.com \
--cc=dwoods@mellanox.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mm@kvack.org \
--cc=mark.rutland@arm.com \
--cc=steve.capper@arm.com \
--cc=will.deacon@arm.com \
/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 NNTP newsgroup(s).