Skip to contentSkip to conversation

Remove LARGE_PAGE_SHIFT constant

PPC64 David Gibson 4 participants 7 messages Sep 17, 2004 – Sep 18, 2004

lore
Share & tools
lore
#0 lore raw

Andrew, please apply:

For historical reasons, ppc64 has ended up with two #defines for the size of a large (16M) page: LARGE_PAGE_SHIFT and HPAGE_SHIFT. This patch removes LARGE_PAGE_SHIFT in favour of the more widely used HPAGE_SHIFT.

arch/ppc64/kernel/pSeries_htab.c +1 -1
Index: working-2.6/arch/ppc64/kernel/pSeries_htab.c
===================================================================
@@ -325,7 +325,7 @@
 		va = (vsid << 28) | (batch->addr[i] & 0x0fffffff);
 		batch->vaddr[j] = va;
 		if (large)
-			vpn = va >> LARGE_PAGE_SHIFT;
+			vpn = va >> HPAGE_SHIFT;
 		else
 			vpn = va >> PAGE_SHIFT;
 		hash = hpt_hash(vpn, large);
include/asm-ppc64/mmu.h +0 -2
Index: working-2.6/include/asm-ppc64/mmu.h
===================================================================
@@ -119,8 +119,6 @@
 #define PT_SHIFT (12)			/* Page Table */
 #define PT_MASK  0x02FF
 
-#define LARGE_PAGE_SHIFT 24
-
 static inline unsigned long hpt_hash(unsigned long vpn, int large)
 {
 	unsigned long vsid;
arch/ppc64/mm/hash_utils.c +2 -2
Index: working-2.6/arch/ppc64/mm/hash_utils.c
===================================================================
@@ -100,7 +100,7 @@
 		int ret;
 
 		if (large)
-			vpn = va >> LARGE_PAGE_SHIFT;
+			vpn = va >> HPAGE_SHIFT;
 		else
 			vpn = va >> PAGE_SHIFT;
 
@@ -332,7 +332,7 @@
 
 	va = (vsid << 28) | (ea & 0x0fffffff);
 	if (large)
-		vpn = va >> LARGE_PAGE_SHIFT;
+		vpn = va >> HPAGE_SHIFT;
 	else
 		vpn = va >> PAGE_SHIFT;
 	hash = hpt_hash(vpn, large);
arch/ppc64/mm/hugetlbpage.c +1 -1
Index: working-2.6/arch/ppc64/mm/hugetlbpage.c
===================================================================
@@ -853,7 +853,7 @@
 	vsid = get_vsid(context.id, ea);
 
 	va = (vsid << 28) | (ea & 0x0fffffff);
-	vpn = va >> LARGE_PAGE_SHIFT;
+	vpn = va >> HPAGE_SHIFT;
 	hash = hpt_hash(vpn, 1);
 	if (hugepte_val(pte) & _HUGEPAGE_SECONDARY)
 		hash = ~hash;
Signature · 4 lines
David Gibson			| For every complex problem there is a
david AT gibson.dropbear.id.au	| solution which is simple, neat and
				| wrong.
http://www.ozlabs.org/people/dgibson
#1 lore raw
Quoted 6 lines · David Gibson

Andrew, please apply:

For historical reasons, ppc64 has ended up with two #defines for the size of a large (16M) page: LARGE_PAGE_SHIFT and HPAGE_SHIFT. This patch removes LARGE_PAGE_SHIFT in favour of the more widely used HPAGE_SHIFT.

Nitpicking, "LARGE_PAGE_xxx" is used by x86/x86_64:

#define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
#define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)

Wouldnt it be nice to keep consistency between archs?

#2 lore raw
Quoted 8 lines · Marcelo Tosatti
Quoted 6 lines · David Gibson

Andrew, please apply:

For historical reasons, ppc64 has ended up with two #defines for the size of a large (16M) page: LARGE_PAGE_SHIFT and HPAGE_SHIFT. This patch removes LARGE_PAGE_SHIFT in favour of the more widely used HPAGE_SHIFT.

Quoted 6 lines

Nitpicking, "LARGE_PAGE_xxx" is used by x86/x86_64:

#define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
#define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)

Wouldnt it be nice to keep consistency between archs?

Actually, if everybody makes sure to define PMD_SHIFT, we should be able to use common macros, right?

-- Dave

#3 lore raw
Quoted 11 lines · Dave Hansen
Quoted 10 lines · Marcelo Tosatti
Quoted 6 lines · David Gibson

Andrew, please apply:

For historical reasons, ppc64 has ended up with two #defines for the size of a large (16M) page: LARGE_PAGE_SHIFT and HPAGE_SHIFT. This patch removes LARGE_PAGE_SHIFT in favour of the more widely used HPAGE_SHIFT.

Nitpicking, "LARGE_PAGE_xxx" is used by x86/x86_64:

Quoted 7 lines
Quoted 4 lines

#define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
#define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)

Wouldnt it be nice to keep consistency between archs?

Actually, if everybody makes sure to define PMD_SHIFT, we should be able to use common macros, right?

Yeap.

#4 lore raw
Quoted 15 lines · Marcelo Tosatti
Quoted 14 lines · Dave Hansen
Quoted 13 lines · Marcelo Tosatti
Quoted 6 lines · David Gibson

Andrew, please apply:

For historical reasons, ppc64 has ended up with two #defines for the size of a large (16M) page: LARGE_PAGE_SHIFT and HPAGE_SHIFT. This patch removes LARGE_PAGE_SHIFT in favour of the more widely used HPAGE_SHIFT.

Nitpicking, "LARGE_PAGE_xxx" is used by x86/x86_64:

#define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
#define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

Wouldnt it be nice to keep consistency between archs?

Actually, if everybody makes sure to define PMD_SHIFT, we should be able to use common macros, right?

Yeap.

No. The large page shift is not necessarily the same as the PMD_SHIFT. It's the same on x86, but it is less on sparc64 and sh, and greater on ppc64.

Signature · 4 lines
David Gibson			| For every complex problem there is a
david AT gibson.dropbear.id.au	| solution which is simple, neat and
				| wrong.
http://www.ozlabs.org/people/dgibson
#5 lore raw
In reply to Dave Hansen
Quoted 2 lines · Dave Hansen

Actually, if everybody makes sure to define PMD_SHIFT, we should be able to use common macros, right?

No, because LARGE_PAGE_SHIFT != PMD_SHIFT on ppc64.

Paul.

#6 lore raw
In reply to Marcelo Tosatti
Quoted 8 lines · Marcelo Tosatti
Quoted 6 lines · David Gibson

Andrew, please apply:

For historical reasons, ppc64 has ended up with two #defines for the size of a large (16M) page: LARGE_PAGE_SHIFT and HPAGE_SHIFT. This patch removes LARGE_PAGE_SHIFT in favour of the more widely used HPAGE_SHIFT.

Quoted 6 lines

Nitpicking, "LARGE_PAGE_xxx" is used by x86/x86_64:

#define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
#define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)

Wouldnt it be nice to keep consistency between archs?

Hrm... they are indeed there. However *all* archs, including x86 and x86_64 have HPAGE_SHIFT et al - it's used in generic code, so x86 has the duplicate #defines as well.

Actually.. I guess the distinction is that LARGE_PAGE_* refer to the hardware large page size, whereas HPAGE_SIZE refers to the software page size used for hugetlbfs. I think those are identical for all arches at the moment, but they wouldn't have to be.

Signature · 4 lines
David Gibson			| For every complex problem there is a
david AT gibson.dropbear.id.au	| solution which is simple, neat and
				| wrong.
http://www.ozlabs.org/people/dgibson