shithub: riscv

Info  •  Files  •  Log  •  Branches

pc64: use 2MB pages for preallocpages()

--- a/sys/src/9/pc64/main.c

+++ b/sys/src/9/pc64/main.c

@@ -259,7 +259,7 @@

 preallocpages(void)

 {

 	Pallocmem *pm;

-	uintptr va;

+	uintptr va, base, top;

 	vlong size;

 	ulong np;

 	int i;

@@ -272,17 +272,18 @@

 	size = (uvlong)np * BY2PG;

 	size += sizeof(Page) + BY2PG;	/* round up */

 	size = (size / (sizeof(Page) + BY2PG)) * sizeof(Page);

-	size = PGROUND(size);

+	size = ROUND(size, PGLSZ(1));

-	np = size/BY2PG;

 	for(i=0; i<nelem(palloc.mem); i++){

 		pm = &palloc.mem[i];

-		if((pm->base + size) <= VMAPSIZE && pm->npage >= np){

-			va = VMAP + pm->base;

-			pmap(m->pml4, pm->base | PTEGLOBAL|PTEWRITE|PTEVALID, va, size);

+		base = ROUND(pm->base, PGLSZ(1));

+		top = pm->base + (uvlong)pm->npage * BY2PG;

+		if((base + size) <= VMAPSIZE && (top - base) >= size){

+			va = base + VMAP;

+			pmap(m->pml4, base | PTEGLOBAL|PTEWRITE|PTEVALID, va, size);

 			palloc.pages = (Page*)va;

-			pm->base += size;

-			pm->npage -= np;

+			pm->base = base + size;

+			pm->npage = (top - pm->base)/BY2PG;

 			break;

 		}

 	}

--- a/sys/src/9/pc64/mem.h

+++ b/sys/src/9/pc64/mem.h

@@ -22,7 +22,6 @@

 #define	BY2V		8			/* bytes per double word */

 #define	BY2PG		(0x1000ull)		/* bytes per page */

 #define	WD2PG		(BY2PG/BY2WD)		/* words per page */

-#define	BY2XPG		(2*MiB)			/* bytes per big page */

 #define	PGSHIFT		12			/* log(BY2PG) */

 #define	ROUND(s, sz)	(((s)+((sz)-1))&~((sz)-1))

 #define	PGROUND(s)	ROUND(s, BY2PG)