Attachment 47442 Details for Bug 100718

[patch] ppc64-hugepage-secfix-CAN-2005-0916.patch

ppc64-hugepage-secfix-CAN-2005-0916.patch (text/plain), 3.76 KB, created by Marcus Meissner on 2005-08-24 17:07:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2005-08-24 17:07:09 UTC

Size: 3.76 KB

patch

obsolete

>diff -ru linux-2.6.5/arch/ppc64/mm/hugetlbpage.c linux-2.6.5.new/arch/ppc64/mm/hugetlbpage.c
>--- linux-2.6.5/arch/ppc64/mm/hugetlbpage.c	2005-08-24 17:37:48.000000000 +0200
>+++ linux-2.6.5.new/arch/ppc64/mm/hugetlbpage.c	2005-08-24 17:33:40.000000000 +0200
>@@ -606,7 +606,7 @@
> 		vma = find_vma(mm, addr);
> 		if (((TASK_SIZE - len) >= addr)
> 		    && (!vma || (addr+len) <= vma->vm_start)
>-		    && !is_hugepage_only_range(addr,len))
>+		    && !is_hugepage_only_range_mm(mm, addr,len))
> 			return addr;
> 	}
> 	start_addr = addr = mm->free_area_cache;
>@@ -617,7 +617,7 @@
> 		unsigned long __heap_stack_gap;
> 		BUG_ON(vma && (addr >= vma->vm_end));
> 
>-		if (touches_hugepage_low_range(addr, len)) {
>+		if (touches_hugepage_low_range_mm(mm, addr, len)) {
> 			addr = ALIGN(addr+1, 1<<SID_SHIFT);
> 			vma = find_vma(mm, addr);
> 			continue;
>diff -ru linux-2.6.5/include/asm-ppc64/page.h linux-2.6.5.new/include/asm-ppc64/page.h
>--- linux-2.6.5/include/asm-ppc64/page.h	2005-08-24 17:35:45.000000000 +0200
>+++ linux-2.6.5.new/include/asm-ppc64/page.h	2005-08-24 17:46:49.000000000 +0200
>@@ -43,8 +43,8 @@
> #define ARCH_HAS_HUGEPAGE_ONLY_RANGE
> #define ARCH_HAS_PREPARE_HUGEPAGE_RANGE
> 
>-#define touches_hugepage_low_range(addr, len) \
>-	(LOW_ESID_MASK((addr), (len)) & current->mm->context.htlb_segs)
>+#define touches_hugepage_low_range_mm(mm, addr, len) \
>+	(LOW_ESID_MASK((addr), (len)) & mm->context.htlb_segs)
> #define touches_hugepage_high_range(addr, len) \
> 	(((addr) > (TASK_HPAGE_BASE-(len))) && ((addr) < TASK_HPAGE_END))
> 
>@@ -56,9 +56,13 @@
> #define within_hugepage_high_range(addr, len) (((addr) >= TASK_HPAGE_BASE) \
> 	  && ((addr)+(len) <= TASK_HPAGE_END) && ((addr)+(len) >= (addr)))
> 
>-#define is_hugepage_only_range(addr, len) \
>+#define is_hugepage_only_range_mm(mm, addr, len) \
> 	(touches_hugepage_high_range((addr), (len)) || \
>-	  touches_hugepage_low_range((addr), (len)))
>+	  touches_hugepage_low_range_mm(mm, (addr), (len)))
>+
>+#define is_hugepage_only_range(addr, len) \
>+	is_hugepage_only_range_mm(current->mm, addr, len)
>+
> #define hugetlb_free_pgtables free_pgtables
> #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
> 
>diff -ru linux-2.6.5/include/linux/hugetlb.h linux-2.6.5.new/include/linux/hugetlb.h
>--- linux-2.6.5/include/linux/hugetlb.h	2005-08-24 17:37:30.000000000 +0200
>+++ linux-2.6.5.new/include/linux/hugetlb.h	2005-08-24 17:42:16.000000000 +0200
>@@ -47,6 +47,7 @@
> 
> #ifndef ARCH_HAS_HUGEPAGE_ONLY_RANGE
> #define is_hugepage_only_range(addr, len)	0
>+#define is_hugepage_only_range_mm(mm,addr, len)	0
> #define hugetlb_free_pgtables(tlb, prev, start, end) do { } while (0)
> #endif
> 
>@@ -84,6 +85,7 @@
> #define prepare_hugepage_range(addr, len)	(-EINVAL)
> #define pmd_huge(x)	0
> #define is_hugepage_only_range(addr, len)	0
>+#define is_hugepage_only_range_mm(mm,addr, len)	0
> #define hugetlb_free_pgtables(tlb, prev, start, end) do { } while (0)
> 
> #ifndef HPAGE_MASK
>diff -ru linux-2.6.5/mm/mmap.c linux-2.6.5.new/mm/mmap.c
>--- linux-2.6.5/mm/mmap.c	2005-08-24 17:38:41.000000000 +0200
>+++ linux-2.6.5.new/mm/mmap.c	2005-08-24 17:34:56.000000000 +0200
>@@ -1382,7 +1382,7 @@
> 	unmap_vmas(&tlb, mm, vma, start, end, &nr_accounted, NULL);
> 	vm_unacct_memory(nr_accounted);
> 
>-	if (is_hugepage_only_range(start, end - start))
>+	if (is_hugepage_only_range_mm(mm, start, end - start))
> 		hugetlb_free_pgtables(tlb, prev, start, end);
> 	else
> 		free_pgtables(tlb, prev, start, end);
>--- linux-2.6.5/include/asm-ia64/page.h	2004-04-04 05:36:19.000000000 +0200
>+++ linux-2.6.5.new/include/asm-ia64/page.h	2005-08-24 17:30:04.000000000 +0200
>@@ -123,6 +123,7 @@
> # define is_hugepage_only_range(addr, len)		\
> 	 (REGION_NUMBER(addr) == REGION_HPAGE &&	\
> 	  REGION_NUMBER((addr)+(len)) == REGION_HPAGE)
>+# define is_hugepage_only_range_mm(mm, addr, len) is_hugepage_only_range(addr, len)
> extern unsigned int hpage_shift;
> #endif
>

Actions: View | Diff

Attachments on bug 100718: 44804 | 47437 | 47442