 106c992a5e
			
		
	
	
	106c992a5e
	
	
	
		
			
			Commit abf09bed3c ("s390/mm: implement software dirty bits")
introduced another difference in the pte layout vs.  the pmd layout on
s390, thoroughly breaking the s390 support for hugetlbfs.  This requires
replacing some more pte_xxx functions in mm/hugetlbfs.c with a
huge_pte_xxx version.
This patch introduces those huge_pte_xxx functions and their generic
implementation in asm-generic/hugetlb.h, which will now be included on
all architectures supporting hugetlbfs apart from s390.  This change
will be a no-op for those architectures.
[akpm@linux-foundation.org: fix warning]
Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Hugh Dickins <hughd@google.com>
Cc: Hillf Danton <dhillf@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.cz>	[for !s390 parts]
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
	
			
		
			
				
	
	
		
			135 lines
		
	
	
	
		
			3.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			135 lines
		
	
	
	
		
			3.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright 2010 Tilera Corporation. All Rights Reserved.
 | |
|  *
 | |
|  *   This program is free software; you can redistribute it and/or
 | |
|  *   modify it under the terms of the GNU General Public License
 | |
|  *   as published by the Free Software Foundation, version 2.
 | |
|  *
 | |
|  *   This program is distributed in the hope that it will be useful, but
 | |
|  *   WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|  *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
 | |
|  *   NON INFRINGEMENT.  See the GNU General Public License for
 | |
|  *   more details.
 | |
|  */
 | |
| 
 | |
| #ifndef _ASM_TILE_HUGETLB_H
 | |
| #define _ASM_TILE_HUGETLB_H
 | |
| 
 | |
| #include <asm/page.h>
 | |
| #include <asm-generic/hugetlb.h>
 | |
| 
 | |
| 
 | |
| static inline int is_hugepage_only_range(struct mm_struct *mm,
 | |
| 					 unsigned long addr,
 | |
| 					 unsigned long len) {
 | |
| 	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 hugetlb_prefault_arch_hook(struct mm_struct *mm)
 | |
| {
 | |
| }
 | |
| 
 | |
| static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,
 | |
| 					  unsigned long addr, unsigned long end,
 | |
| 					  unsigned long floor,
 | |
| 					  unsigned long ceiling)
 | |
| {
 | |
| 	free_pgd_range(tlb, addr, end, floor, ceiling);
 | |
| }
 | |
| 
 | |
| static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
 | |
| 				   pte_t *ptep, pte_t pte)
 | |
| {
 | |
| 	set_pte(ptep, pte);
 | |
| }
 | |
| 
 | |
| static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
 | |
| 					    unsigned long addr, pte_t *ptep)
 | |
| {
 | |
| 	return ptep_get_and_clear(mm, addr, ptep);
 | |
| }
 | |
| 
 | |
| static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
 | |
| 					 unsigned long addr, pte_t *ptep)
 | |
| {
 | |
| 	ptep_clear_flush(vma, addr, ptep);
 | |
| }
 | |
| 
 | |
| static inline int huge_pte_none(pte_t pte)
 | |
| {
 | |
| 	return pte_none(pte);
 | |
| }
 | |
| 
 | |
| static inline pte_t huge_pte_wrprotect(pte_t pte)
 | |
| {
 | |
| 	return pte_wrprotect(pte);
 | |
| }
 | |
| 
 | |
| static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
 | |
| 					   unsigned long addr, pte_t *ptep)
 | |
| {
 | |
| 	ptep_set_wrprotect(mm, addr, ptep);
 | |
| }
 | |
| 
 | |
| static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
 | |
| 					     unsigned long addr, pte_t *ptep,
 | |
| 					     pte_t pte, int dirty)
 | |
| {
 | |
| 	return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
 | |
| }
 | |
| 
 | |
| static inline pte_t huge_ptep_get(pte_t *ptep)
 | |
| {
 | |
| 	return *ptep;
 | |
| }
 | |
| 
 | |
| static inline int arch_prepare_hugepage(struct page *page)
 | |
| {
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| static inline void arch_release_hugepage(struct page *page)
 | |
| {
 | |
| }
 | |
| 
 | |
| static inline void arch_clear_hugepage_flags(struct page *page)
 | |
| {
 | |
| }
 | |
| 
 | |
| #ifdef CONFIG_HUGETLB_SUPER_PAGES
 | |
| static inline pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma,
 | |
| 				       struct page *page, int writable)
 | |
| {
 | |
| 	size_t pagesize = huge_page_size(hstate_vma(vma));
 | |
| 	if (pagesize != PUD_SIZE && pagesize != PMD_SIZE)
 | |
| 		entry = pte_mksuper(entry);
 | |
| 	return entry;
 | |
| }
 | |
| #define arch_make_huge_pte arch_make_huge_pte
 | |
| 
 | |
| /* Sizes to scale up page size for PTEs with HV_PTE_SUPER bit. */
 | |
| enum {
 | |
| 	HUGE_SHIFT_PGDIR = 0,
 | |
| 	HUGE_SHIFT_PMD = 1,
 | |
| 	HUGE_SHIFT_PAGE = 2,
 | |
| 	HUGE_SHIFT_ENTRIES
 | |
| };
 | |
| extern int huge_shift[HUGE_SHIFT_ENTRIES];
 | |
| #endif
 | |
| 
 | |
| #endif /* _ASM_TILE_HUGETLB_H */
 |