From: Alexandre Ghiti <alex@ghiti.fr>
To: linux@armlinux.org.uk, catalin.marinas@arm.com,
will.deacon@arm.com, tony.luck@intel.com, fenghua.yu@intel.com,
ralf@linux-mips.org, paul.burton@mips.com, jhogan@kernel.org,
jejb@parisc-linux.org, deller@gmx.de, benh@kernel.crashing.org,
paulus@samba.org, mpe@ellerman.id.au, ysato@users.sourceforge.jp,
dalias@libc.org, davem@davemloft.net, tglx@linutronix.de,
mingo@redhat.com, hpa@zytor.com, x86@kernel.org, arnd@arndb.de,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-mips@linux-mips.org, linux-parisc@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org,
sparclinux@vger.kernel.org, linux-arch@vger.kernel.org
Cc: Alexandre Ghiti <alex@ghiti.fr>
Subject: [PATCH v4 08/11] hugetlb: Introduce generic version of prepare_hugepage_range
Date: Thu, 5 Jul 2018 11:07:13 +0000 [thread overview]
Message-ID: <20180705110716.3919-9-alex@ghiti.fr> (raw)
Message-ID: <20180705110713.HRdhhvPrFOxLTSmc7HjF9QRGyff0KEvM0veEpTQz5_I@z> (raw)
In-Reply-To: <20180705110716.3919-1-alex@ghiti.fr>
arm, arm64, powerpc, sparc, x86 architectures use the same version of
prepare_hugepage_range, so move this generic implementation into
asm-generic/hugetlb.h.
Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
---
arch/arm/include/asm/hugetlb.h | 11 -----------
arch/arm64/include/asm/hugetlb.h | 11 -----------
arch/ia64/include/asm/hugetlb.h | 1 +
arch/mips/include/asm/hugetlb.h | 1 +
arch/parisc/include/asm/hugetlb.h | 1 +
arch/powerpc/include/asm/hugetlb.h | 15 ---------------
arch/sh/include/asm/hugetlb.h | 1 +
arch/sparc/include/asm/hugetlb.h | 16 ----------------
arch/x86/include/asm/hugetlb.h | 15 ---------------
include/asm-generic/hugetlb.h | 15 +++++++++++++++
10 files changed, 19 insertions(+), 68 deletions(-)
diff --git a/arch/arm/include/asm/hugetlb.h b/arch/arm/include/asm/hugetlb.h
index 1e718a626ef9..34fb401efe81 100644
--- a/arch/arm/include/asm/hugetlb.h
+++ b/arch/arm/include/asm/hugetlb.h
@@ -32,17 +32,6 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,
return 0;
}
-static inline int prepare_hugepage_range(struct file *file,
- unsigned long addr, unsigned long len)
-{
- struct hstate *h = hstate_file(file);
- if (len & ~huge_page_mask(h))
- return -EINVAL;
- if (addr & ~huge_page_mask(h))
- return -EINVAL;
- return 0;
-}
-
static inline void arch_clear_hugepage_flags(struct page *page)
{
clear_bit(PG_dcache_clean, &page->flags);
diff --git a/arch/arm64/include/asm/hugetlb.h b/arch/arm64/include/asm/hugetlb.h
index 1fd64ebf0cd7..3e7f6e69b28d 100644
--- a/arch/arm64/include/asm/hugetlb.h
+++ b/arch/arm64/include/asm/hugetlb.h
@@ -31,17 +31,6 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,
return 0;
}
-static inline int prepare_hugepage_range(struct file *file,
- unsigned long addr, unsigned long len)
-{
- struct hstate *h = hstate_file(file);
- if (len & ~huge_page_mask(h))
- return -EINVAL;
- if (addr & ~huge_page_mask(h))
- return -EINVAL;
- return 0;
-}
-
static inline void arch_clear_hugepage_flags(struct page *page)
{
clear_bit(PG_dcache_clean, &page->flags);
diff --git a/arch/ia64/include/asm/hugetlb.h b/arch/ia64/include/asm/hugetlb.h
index 82fe3d7a38d9..cbe296271030 100644
--- a/arch/ia64/include/asm/hugetlb.h
+++ b/arch/ia64/include/asm/hugetlb.h
@@ -9,6 +9,7 @@ void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr,
unsigned long end, unsigned long floor,
unsigned long ceiling);
+#define __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE
int prepare_hugepage_range(struct file *file,
unsigned long addr, unsigned long len);
diff --git a/arch/mips/include/asm/hugetlb.h b/arch/mips/include/asm/hugetlb.h
index b3d6bb53ee6e..6ff2531cfb1d 100644
--- a/arch/mips/include/asm/hugetlb.h
+++ b/arch/mips/include/asm/hugetlb.h
@@ -18,6 +18,7 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,
return 0;
}
+#define __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE
static inline int prepare_hugepage_range(struct file *file,
unsigned long addr,
unsigned long len)
diff --git a/arch/parisc/include/asm/hugetlb.h b/arch/parisc/include/asm/hugetlb.h
index 5a102d7251e4..fb7e0fd858a3 100644
--- a/arch/parisc/include/asm/hugetlb.h
+++ b/arch/parisc/include/asm/hugetlb.h
@@ -22,6 +22,7 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,
* If the arch doesn't supply something else, assume that hugepage
* size aligned regions are ok without further preparation.
*/
+#define __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE
static inline int prepare_hugepage_range(struct file *file,
unsigned long addr, unsigned long len)
{
diff --git a/arch/powerpc/include/asm/hugetlb.h b/arch/powerpc/include/asm/hugetlb.h
index 7123599089c6..69c14ecac133 100644
--- a/arch/powerpc/include/asm/hugetlb.h
+++ b/arch/powerpc/include/asm/hugetlb.h
@@ -117,21 +117,6 @@ void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr,
unsigned long end, unsigned long floor,
unsigned long ceiling);
-/*
- * If the arch doesn't supply something else, assume that hugepage
- * size aligned regions are ok without further preparation.
- */
-static inline int prepare_hugepage_range(struct file *file,
- unsigned long addr, unsigned long len)
-{
- struct hstate *h = hstate_file(file);
- if (len & ~huge_page_mask(h))
- return -EINVAL;
- if (addr & ~huge_page_mask(h))
- return -EINVAL;
- return 0;
-}
-
#define __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR
static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
unsigned long addr, pte_t *ptep)
diff --git a/arch/sh/include/asm/hugetlb.h b/arch/sh/include/asm/hugetlb.h
index 54f65094efe6..f1bbd255ee43 100644
--- a/arch/sh/include/asm/hugetlb.h
+++ b/arch/sh/include/asm/hugetlb.h
@@ -15,6 +15,7 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,
* If the arch doesn't supply something else, assume that hugepage
* size aligned regions are ok without further preparation.
*/
+#define __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE
static inline int prepare_hugepage_range(struct file *file,
unsigned long addr, unsigned long len)
{
diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/hugetlb.h
index f661362376e0..2101ea217f33 100644
--- a/arch/sparc/include/asm/hugetlb.h
+++ b/arch/sparc/include/asm/hugetlb.h
@@ -26,22 +26,6 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,
return 0;
}
-/*
- * If the arch doesn't supply something else, assume that hugepage
- * size aligned regions are ok without further preparation.
- */
-static inline int prepare_hugepage_range(struct file *file,
- unsigned long addr, unsigned long len)
-{
- struct hstate *h = hstate_file(file);
-
- if (len & ~huge_page_mask(h))
- return -EINVAL;
- if (addr & ~huge_page_mask(h))
- return -EINVAL;
- return 0;
-}
-
#define __HAVE_ARCH_HUGE_PTEP_CLEAR_FLUSH
static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
unsigned long addr, pte_t *ptep)
diff --git a/arch/x86/include/asm/hugetlb.h b/arch/x86/include/asm/hugetlb.h
index 19668672ab37..2e5117d37c7d 100644
--- a/arch/x86/include/asm/hugetlb.h
+++ b/arch/x86/include/asm/hugetlb.h
@@ -12,21 +12,6 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,
return 0;
}
-/*
- * If the arch doesn't supply something else, assume that hugepage
- * size aligned regions are ok without further preparation.
- */
-static inline int prepare_hugepage_range(struct file *file,
- unsigned long addr, unsigned long len)
-{
- struct hstate *h = hstate_file(file);
- if (len & ~huge_page_mask(h))
- return -EINVAL;
- if (addr & ~huge_page_mask(h))
- return -EINVAL;
- return 0;
-}
-
static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
unsigned long addr, pte_t *ptep)
{
diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h
index cd9697672b79..6c0c8b0c71e0 100644
--- a/include/asm-generic/hugetlb.h
+++ b/include/asm-generic/hugetlb.h
@@ -87,4 +87,19 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)
}
#endif
+#ifndef __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE
+static inline int prepare_hugepage_range(struct file *file,
+ unsigned long addr, unsigned long len)
+{
+ struct hstate *h = hstate_file(file);
+
+ if (len & ~huge_page_mask(h))
+ return -EINVAL;
+ if (addr & ~huge_page_mask(h))
+ return -EINVAL;
+
+ return 0;
+}
+#endif
+
#endif /* _ASM_GENERIC_HUGETLB_H */
--
2.16.2
next prev parent reply other threads:[~2018-07-05 11:17 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-05 11:07 [PATCH v4 00/11] hugetlb: Factorize hugetlb architecture primitives Alexandre Ghiti
2018-07-05 11:07 ` Alexandre Ghiti
2018-07-05 11:07 ` [PATCH v4 01/11] hugetlb: Harmonize hugetlb.h arch specific defines with pgtable.h Alexandre Ghiti
2018-07-05 11:07 ` Alexandre Ghiti
2018-07-26 18:40 ` Mike Kravetz
2018-07-26 18:40 ` Mike Kravetz
2018-07-05 11:07 ` [PATCH v4 02/11] hugetlb: Introduce generic version of hugetlb_free_pgd_range Alexandre Ghiti
2018-07-05 11:07 ` Alexandre Ghiti
2018-07-26 18:45 ` Mike Kravetz
2018-07-26 18:45 ` Mike Kravetz
2018-07-05 11:07 ` [PATCH v4 03/11] hugetlb: Introduce generic version of set_huge_pte_at Alexandre Ghiti
2018-07-05 11:07 ` Alexandre Ghiti
2018-07-26 19:00 ` Mike Kravetz
2018-07-26 19:00 ` Mike Kravetz
2018-07-05 11:07 ` [PATCH v4 04/11] hugetlb: Introduce generic version of huge_ptep_get_and_clear Alexandre Ghiti
2018-07-05 11:07 ` Alexandre Ghiti
2018-07-26 19:02 ` Mike Kravetz
2018-07-26 19:02 ` Mike Kravetz
2018-07-05 11:07 ` [PATCH v4 05/11] hugetlb: Introduce generic version of huge_ptep_clear_flush Alexandre Ghiti
2018-07-05 11:07 ` Alexandre Ghiti
2018-07-26 19:03 ` Mike Kravetz
2018-07-26 19:03 ` Mike Kravetz
2018-07-05 11:07 ` [PATCH v4 06/11] hugetlb: Introduce generic version of huge_pte_none Alexandre Ghiti
2018-07-05 11:07 ` Alexandre Ghiti
2018-07-26 19:04 ` Mike Kravetz
2018-07-26 19:04 ` Mike Kravetz
2018-07-05 11:07 ` [PATCH v4 07/11] hugetlb: Introduce generic version of huge_pte_wrprotect Alexandre Ghiti
2018-07-05 11:07 ` Alexandre Ghiti
2018-07-26 19:05 ` Mike Kravetz
2018-07-26 19:05 ` Mike Kravetz
2018-07-05 11:07 ` Alexandre Ghiti [this message]
2018-07-05 11:07 ` [PATCH v4 08/11] hugetlb: Introduce generic version of prepare_hugepage_range Alexandre Ghiti
2018-07-26 19:05 ` Mike Kravetz
2018-07-26 19:05 ` Mike Kravetz
2018-07-05 11:07 ` [PATCH v4 09/11] hugetlb: Introduce generic version of huge_ptep_set_wrprotect Alexandre Ghiti
2018-07-05 11:07 ` Alexandre Ghiti
2018-07-26 19:10 ` Mike Kravetz
2018-07-26 19:10 ` Mike Kravetz
2018-07-05 11:07 ` [PATCH v4 10/11] hugetlb: Introduce generic version of huge_ptep_set_access_flags Alexandre Ghiti
2018-07-05 11:07 ` Alexandre Ghiti
2018-07-26 19:12 ` Mike Kravetz
2018-07-26 19:12 ` Mike Kravetz
2018-07-05 11:07 ` [PATCH v4 11/11] hugetlb: Introduce generic version of huge_ptep_get Alexandre Ghiti
2018-07-05 11:07 ` Alexandre Ghiti
2018-07-26 19:13 ` Mike Kravetz
2018-07-26 19:13 ` Mike Kravetz
2018-07-09 14:16 ` [PATCH v4 00/11] hugetlb: Factorize hugetlb architecture primitives Michal Hocko
2018-07-09 14:16 ` Michal Hocko
2018-07-20 18:37 ` Alex Ghiti
2018-07-20 18:37 ` Alex Ghiti
2018-07-21 0:24 ` Mike Kravetz
2018-07-21 0:24 ` Mike Kravetz
2018-07-26 11:46 ` Michael Ellerman
2018-07-26 11:46 ` Michael Ellerman
2018-07-26 19:16 ` Mike Kravetz
2018-07-26 19:16 ` Mike Kravetz
2018-07-27 6:51 ` Alexandre Ghiti
2018-07-27 6:51 ` Alexandre Ghiti
2018-07-23 14:00 ` Michael Ellerman
2018-07-23 14:00 ` Michael Ellerman
2018-07-23 17:41 ` Alex Ghiti
2018-07-23 17:41 ` Alex Ghiti
2018-07-26 5:41 ` Alex Ghiti
2018-07-26 5:41 ` Alex Ghiti
2018-07-26 12:59 ` Helge Deller
2018-07-26 12:59 ` Helge Deller
2018-07-26 17:01 ` Alex Ghiti
2018-07-26 17:01 ` Alex Ghiti
2018-07-26 19:13 ` Alex Ghiti
2018-07-26 19:13 ` Alex Ghiti
2018-07-26 21:08 ` Helge Deller
2018-07-26 21:08 ` Helge Deller
2018-07-26 15:13 ` LEROY Christophe
2018-07-26 15:13 ` LEROY Christophe
2018-07-26 16:46 ` Alex Ghiti
2018-07-26 16:46 ` Alex Ghiti
2018-07-25 0:34 ` Paul Burton
2018-07-25 0:34 ` Paul Burton
2018-07-25 7:38 ` Alexandre Ghiti
2018-07-25 7:38 ` Alexandre Ghiti
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=20180705110716.3919-9-alex@ghiti.fr \
--to=alex@ghiti.fr \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=catalin.marinas@arm.com \
--cc=dalias@libc.org \
--cc=davem@davemloft.net \
--cc=deller@gmx.de \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=jejb@parisc-linux.org \
--cc=jhogan@kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=paul.burton@mips.com \
--cc=paulus@samba.org \
--cc=ralf@linux-mips.org \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
--cc=ysato@users.sourceforge.jp \
/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).