Skip to contentSkip to conversation

Small hugetlbpage.c fix

PATCH Zoltan Menyhart 3 participants 4 messages May 5, 2006

lore
Share & tools
lore
#0 lore raw
arch/ia64/mm/hugetlbpage.c +2 -2
@@ -125,9 +125,9 @@
 
 	addr = htlbpage_to_page(addr);
 	end  = htlbpage_to_page(end);
-	if (is_hugepage_only_range(tlb->mm, floor, HPAGE_SIZE))
+	if (is_hugepage_only_range((*tlb)->mm, floor, HPAGE_SIZE))
 		floor = htlbpage_to_page(floor);
-	if (is_hugepage_only_range(tlb->mm, ceiling, HPAGE_SIZE))
+	if (is_hugepage_only_range((*tlb)->mm, ceiling, HPAGE_SIZE))
 		ceiling = htlbpage_to_page(ceiling);
 
 	free_pgd_range(tlb, addr, end, floor, ceiling);
#1 lore raw

Greg, Chris:

2.6.17-rcN has moved on and changed this in other ways, but this patch looks like a candidate for the stable series. What's there looks like it should kick a warning, if not a full blown error from the compiler for getting the type wrong.

-Tony

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Zoltan Menyhart
Sent: Friday, May 05, 2006 1:53 AM
To: [email protected]
Subject: Small hugetlbpage.c fix

arch/ia64/mm/hugetlbpage.c +2 -2
@@ -125,9 +125,9 @@
 
 	addr = htlbpage_to_page(addr);
 	end  = htlbpage_to_page(end);
-	if (is_hugepage_only_range(tlb->mm, floor, HPAGE_SIZE))
+	if (is_hugepage_only_range((*tlb)->mm, floor, HPAGE_SIZE))
 		floor = htlbpage_to_page(floor);
-	if (is_hugepage_only_range(tlb->mm, ceiling, HPAGE_SIZE))
+	if (is_hugepage_only_range((*tlb)->mm, ceiling, HPAGE_SIZE))
 		ceiling = htlbpage_to_page(ceiling);
 
 	free_pgd_range(tlb, addr, end, floor, ceiling);

-
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
In reply to Zoltan Menyhart

Zoltan Menyhart wrote on Friday, May 05, 2006 1:53 AM

Quoted 4 lines
arch/ia64/mm/hugetlbpage.c +0 -0
@@ -125,9 +125,9 @@
 

arch/ia64/mm/hugetlbpage.c line 133

Quoted 10 lines
arch/ia64/mm/hugetlbpage.c +2 -2
 	addr = htlbpage_to_page(addr);
 	end  = htlbpage_to_page(end);
-	if (is_hugepage_only_range(tlb->mm, floor, HPAGE_SIZE))
+	if (is_hugepage_only_range((*tlb)->mm, floor, HPAGE_SIZE))
 		floor = htlbpage_to_page(floor);
-	if (is_hugepage_only_range(tlb->mm, ceiling, HPAGE_SIZE))
+	if (is_hugepage_only_range((*tlb)->mm, ceiling, HPAGE_SIZE))
 		ceiling = htlbpage_to_page(ceiling);
 
 	free_pgd_range(tlb, addr, end, floor, ceiling);

Luck, Tony wrote on Friday, May 05, 2006 9:44 AM

Quoted 6 lines

Greg, Chris:

2.6.17-rcN has moved on and changed this in other ways, but this patch looks like a candidate for the stable series. What's there looks like it should kick a warning, if not a full blown error from the compiler for getting the type wrong.

What's the big fuss about it? The first argument is not even used in is_hugepage_only_range() for ia64. Plus the fix is a broken fix anyway.

- Ken

#3 lore raw
In reply to Zoltan Menyhart

Zoltan Menyhart wrote on Friday, May 05, 2006 1:53 AM

Quoted 4 lines
arch/ia64/mm/hugetlbpage.c +0 -0
@@ -125,9 +125,9 @@
 

arch/ia64/mm/hugetlbpage.c line 133

Quoted 10 lines
arch/ia64/mm/hugetlbpage.c +2 -2
 	addr = htlbpage_to_page(addr);
 	end  = htlbpage_to_page(end);
-	if (is_hugepage_only_range(tlb->mm, floor, HPAGE_SIZE))
+	if (is_hugepage_only_range((*tlb)->mm, floor, HPAGE_SIZE))
 		floor = htlbpage_to_page(floor);
-	if (is_hugepage_only_range(tlb->mm, ceiling, HPAGE_SIZE))
+	if (is_hugepage_only_range((*tlb)->mm, ceiling, HPAGE_SIZE))
 		ceiling = htlbpage_to_page(ceiling);
 
 	free_pgd_range(tlb, addr, end, floor, ceiling);

Sorry, I have to nak this one, for multiple reasons:

(1) A proper fix is already in the latest git tree.
(2) usage of is_hugepage_only_range() in function hugetlb_free_pgd_range is wrong here. Because in 2.6.16, is_hugepage_only_range on ia64 is defined to be within, where in here the real intent is to scale floor and ceiling addresses if they falls into hugetlb virtual address range. A proper fix should be:

- if (is_hugepage_only_range(tlb->mm, floor, HPAGE_SIZE))
+ if (REGION_NUMBER(floor) = RGN_HPAGE)
floor = htlbpage_to_page(floor);
- if (is_hugepage_only_range(tlb->mm, ceiling, HPAGE_SIZE))
+ if (REGION_NUMBER(ceiling) = RGN_HPAGE)
ceiling = htlbpage_to_page(ceiling);

we get away from this bug because such scenario is not possible on
ia64 because we have a virtual address hole at the end of each region used by the short format vhpt hash address.
(3) lastly, the first argument is not used on ia64. If the fix is for cosmetic reason, that's fine by me. But I object on the ground of correctness for the two reasons given above.

- Ken