Merge http://jdike.stearns.org:5000/highmem-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

arch/um/config.in

@@ -32,6 +32,7 @@ bool 'Symmetric multi-processing support' CONFIG_UML_SMP
 define_bool CONFIG_SMP $CONFIG_UML_SMP
 int 'Nesting level' CONFIG_NEST_LEVEL 0
 int 'Kernel address space size (in .5G units)' CONFIG_KERNEL_HALF_GIGS 1
+bool 'Highmem support' CONFIG_HIGHMEM
 endmenu
 
 mainmenu_option next_comment

arch/um/defconfig

@@ -31,6 +31,7 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_SMP is not set
 CONFIG_NEST_LEVEL=0
 CONFIG_KERNEL_HALF_GIGS=1
+# CONFIG_HIGHMEM is not set
 
 #
 # Loadable module support

arch/um/include/mem_user.h

@@ -34,6 +34,7 @@
 
 struct mem_region {
 	char *driver;
+	unsigned long start_pfn;
 	unsigned long start;
 	unsigned long len;
 	void *mem_map;
@@ -51,8 +52,8 @@ extern unsigned long task_size;
 extern int init_mem_user(void);
 extern int create_mem_file(unsigned long len);
 extern void setup_range(int fd, char *driver, unsigned long start,
-			unsigned long total, struct mem_region *region,
-			void *reserved);
+			unsigned long pfn, unsigned long total, int need_vm, 
+			struct mem_region *region, void *reserved);
 extern void map(unsigned long virt, unsigned long p, unsigned long len, 
 		int r, int w, int x);
 extern int unmap(void *addr, int len);
@@ -62,8 +63,6 @@ extern void setup_memory(void *entry);
 extern unsigned long find_iomem(char *driver, unsigned long *len_out);
 extern int init_maps(struct mem_region *region);
 extern int nregions(void);
-extern void setup_one_range(int n, int fd, char *driver, unsigned long start, 
-			    unsigned long len, struct mem_region *region);
 extern int reserve_vm(unsigned long start, unsigned long end, void *e);
 extern unsigned long get_vm(unsigned long len);
 extern void setup_physmem(unsigned long start, unsigned long usable,

arch/um/include/user_util.h

@@ -27,6 +27,7 @@ extern unsigned long uml_physmem;
 extern unsigned long uml_reserved;
 extern unsigned long end_vm;
 extern unsigned long start_vm;
+extern unsigned long highmem;
 
 extern int tracing_pid;
 extern int honeypot;

arch/um/kernel/mem_user.c

@@ -77,25 +77,6 @@ int create_mem_file(unsigned long len)
 	return(fd);
 }
 
-void setup_one_range(int n, int fd, char *driver, unsigned long start, 
-		     unsigned long len, struct mem_region *region)
-{
-	if(fd == -1)
-		fd = create_mem_file(len);
-	if(region == NULL){
-		region = malloc(sizeof(*region));
-		if(region == NULL){
-			perror("Allocating mem_region");
-			exit(1);
-		}
-	}
-	*region = ((struct mem_region) { driver :	driver, 
-					 start :	start, 
-					 len :		len, 
-					 fd :		fd } );
-	regions[n] = region;
-}
-
 int setup_region(struct mem_region *region, void *entry)
 {
 	void *loc, *start;

arch/um/kernel/process_kern.c

@@ -528,7 +528,7 @@ unsigned long um_virt_to_phys(void *t, unsigned long addr)
 
 char *current_cmd(void)
 {
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) || defined(CONFIG_HIGHMEM)
 	return("(Unknown)");
 #else
 	unsigned long addr = um_virt_to_phys(current, current->mm->arg_start);

arch/um/kernel/tlb.c

@@ -178,6 +178,11 @@ void flush_tlb_kernel_vm(void)
 	flush_tlb_kernel_range(start_vm, end_vm);
 }
 
+void __flush_tlb_one(unsigned long addr)
+{
+	flush_tlb_kernel_range(addr, addr + PAGE_SIZE);
+}
+  
 void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, 
 		     unsigned long end)
 {

arch/um/kernel/um_arch.c

@@ -4,6 +4,7 @@
  */
 
 #include "linux/config.h"
+#include "linux/kernel.h"
 #include "linux/sched.h"
 #include "linux/notifier.h"
 #include "linux/mm.h"
@@ -109,8 +110,6 @@ static int start_kernel_proc(void *unused)
 	return(0);
 }
 
-extern unsigned long high_physmem;
-
 #ifdef CONFIG_HOST_2G_2G
 #define TOP 0x80000000
 #else
@@ -160,7 +159,7 @@ void set_cmdline(char *cmd)
 
 	snprintf(ptr, (argv1_end - ptr) * sizeof(*ptr), " [%s]", cmd);
 	memset(argv1_begin + strlen(argv1_begin), '\0', 
-	       argv1_end - argv1_begin - strlen(argv1_begin));  
+	       argv1_end - argv1_begin - strlen(argv1_begin));
 }
 
 static char *usage_string = 
@@ -263,10 +262,12 @@ unsigned long brk_start;
 
 static struct vm_reserved kernel_vm_reserved;
 
+#define MIN_VMALLOC (32 * 1024 * 1024)
+
 int linux_main(int argc, char **argv)
 {
 	unsigned long avail;
-	unsigned long virtmem_size;
+	unsigned long virtmem_size, max_physmem;
 	unsigned int i, add, err;
 	void *sp;
 
@@ -278,7 +279,7 @@ int linux_main(int argc, char **argv)
 	}
 	if(have_root == 0) add_arg(saved_command_line, DEFAULT_COMMAND_LINE);
 
-	if(!jail)
+	if(!jail || debug)
 		remap_data(ROUND_DOWN(&_stext), ROUND_UP(&_etext), 1);
 	remap_data(ROUND_DOWN(&_sdata), ROUND_UP(&_edata), 1);
 	brk_start = (unsigned long) sbrk(0);
@@ -295,20 +296,20 @@ int linux_main(int argc, char **argv)
 	argv1_end = &argv[1][strlen(argv[1])];
   
 	set_usable_vm(uml_physmem, get_kmem_end());
+
+	highmem = 0;
+	max_physmem = get_kmem_end() - uml_physmem - MIN_VMALLOC;
+	if(physmem_size > max_physmem){
+		highmem = physmem_size - max_physmem;
+		physmem_size -= highmem;
+	}
+
 	high_physmem = uml_physmem + physmem_size;
 	high_memory = (void *) high_physmem;
-	setup_physmem(uml_physmem, uml_reserved, physmem_size);
-
-	/* Kernel vm starts after physical memory and is either the size
-	 * of physical memory or the remaining space left in the kernel
-	 * area of the address space, whichever is smaller.
-	 */
 
 	start_vm = VMALLOC_START;
-	if(start_vm >= get_kmem_end())
-		panic("Physical memory too large to allow any kernel "
-		      "virtual memory");
 
+	setup_physmem(uml_physmem, uml_reserved, physmem_size);
 	virtmem_size = physmem_size;
 	avail = get_kmem_end() - start_vm;
 	if(physmem_size > avail) virtmem_size = avail;

include/asm-um/fixmap.h

+#ifndef __UM_FIXMAP_H
+#define __UM_FIXMAP_H
+
+#include <linux/config.h>
+#include <asm/kmap_types.h>
+
+/*
+ * Here we define all the compile-time 'special' virtual
+ * addresses. The point is to have a constant address at
+ * compile time, but to set the physical address only
+ * in the boot process. We allocate these special  addresses
+ * from the end of virtual memory (0xfffff000) backwards.
+ * Also this lets us do fail-safe vmalloc(), we
+ * can guarantee that these special addresses and
+ * vmalloc()-ed addresses never overlap.
+ *
+ * these 'compile-time allocated' memory buffers are
+ * fixed-size 4k pages. (or larger if used with an increment
+ * highger than 1) use fixmap_set(idx,phys) to associate
+ * physical memory with fixmap indices.
+ *
+ * TLB entries of such buffers will not be flushed across
+ * task switches.
+ */
+
+/*
+ * on UP currently we will have no trace of the fixmap mechanizm,
+ * no page table allocations, etc. This might change in the
+ * future, say framebuffers for the console driver(s) could be
+ * fix-mapped?
+ */
+enum fixed_addresses {
+#ifdef CONFIG_HIGHMEM
+	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */
+	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
+#endif
+	__end_of_fixed_addresses
+};
+
+extern void __set_fixmap (enum fixed_addresses idx,
+			  unsigned long phys, pgprot_t flags);
+
+#define set_fixmap(idx, phys) \
+		__set_fixmap(idx, phys, PAGE_KERNEL)
+/*
+ * Some hardware wants to get fixmapped without caching.
+ */
+#define set_fixmap_nocache(idx, phys) \
+		__set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
+/*
+ * used by vmalloc.c.
+ *
+ * Leave one empty page between vmalloc'ed areas and
+ * the start of the fixmap, and leave one page empty
+ * at the top of mem..
+ */
+extern unsigned long get_kmem_end(void);
+
+#define FIXADDR_TOP	(get_kmem_end() - 0x2000)
+#define FIXADDR_SIZE	(__end_of_fixed_addresses << PAGE_SHIFT)
+#define FIXADDR_START	(FIXADDR_TOP - FIXADDR_SIZE)
+
+#define __fix_to_virt(x)	(FIXADDR_TOP - ((x) << PAGE_SHIFT))
+#define __virt_to_fix(x)      ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
+
+extern void __this_fixmap_does_not_exist(void);
+
+/*
+ * 'index to address' translation. If anyone tries to use the idx
+ * directly without tranlation, we catch the bug with a NULL-deference
+ * kernel oops. Illegal ranges of incoming indices are caught too.
+ */
+static inline unsigned long fix_to_virt(const unsigned int idx)
+{
+	/*
+	 * this branch gets completely eliminated after inlining,
+	 * except when someone tries to use fixaddr indices in an
+	 * illegal way. (such as mixing up address types or using
+	 * out-of-range indices).
+	 *
+	 * If it doesn't get removed, the linker will complain
+	 * loudly with a reasonably clear error message..
+	 */
+	if (idx >= __end_of_fixed_addresses)
+		__this_fixmap_does_not_exist();
+
+        return __fix_to_virt(idx);
+}
+
+static inline unsigned long virt_to_fix(const unsigned long vaddr)
+{
+      BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);
+      return __virt_to_fix(vaddr);
+}
+
+#endif

include/asm-um/highmem.h

 #ifndef __UM_HIGHMEM_H
 #define __UM_HIGHMEM_H
 
+#include "asm/page.h"
+#include "asm/fixmap.h"
 #include "asm/arch/highmem.h"
 
+#undef PKMAP_BASE
+
+#define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK)
+
 #endif

include/asm-um/page.h

@@ -43,10 +43,11 @@ extern void *region_va(unsigned long phys);
 #define __pa(virt) region_pa((void *) (virt))
 #define __va(phys) region_va((unsigned long) (phys))
 
+extern unsigned long page_to_pfn(struct page *page);
+extern struct page *pfn_to_page(unsigned long pfn);
+
 extern struct page *phys_to_page(unsigned long phys);
 
-#define pfn_to_page(pfn) (phys_to_page(pfn << PAGE_SHIFT))
-#define page_to_pfn(page) (page_to_phys(page) >> PAGE_SHIFT)
 #define virt_to_page(v) (phys_to_page(__pa(v)))
 
 extern struct page *page_mem_map(struct page *page);

include/asm-um/pgalloc.h

@@ -8,6 +8,7 @@
 #define __UM_PGALLOC_H
 
 #include "linux/mm.h"
+#include "asm/fixmap.h"
 
 #define pmd_populate_kernel(mm, pmd, pte) \
 		set_pmd(pmd, __pmd(_PAGE_TABLE + (unsigned long) __pa(pte)))
@@ -15,7 +16,7 @@
 static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, 
 				struct page *pte)
 {
-	set_pmd(pmd, __pmd(_PAGE_TABLE + phys_addr(page_to_phys(pte))));
+	set_pmd(pmd, __pmd(_PAGE_TABLE + page_to_phys(pte)));
 }
 
 extern pgd_t *pgd_alloc(struct mm_struct *);

include/asm-um/pgtable.h

@@ -10,6 +10,7 @@
 #include "linux/sched.h"
 #include "asm/processor.h"
 #include "asm/page.h"
+#include "asm/fixmap.h"
 
 extern pgd_t swapper_pg_dir[1024];
 
@@ -62,12 +63,16 @@ extern unsigned long *empty_zero_page;
  */
 
 extern unsigned long high_physmem;
-extern unsigned long end_vm;
 
 #define VMALLOC_OFFSET	(__va_space)
 #define VMALLOC_START	(((unsigned long) high_physmem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
 #define VMALLOC_VMADDR(x) ((unsigned long)(x))
-#define VMALLOC_END	(end_vm)
+
+#if CONFIG_HIGHMEM
+# define VMALLOC_END	(PKMAP_BASE-2*PAGE_SIZE)
+#else
+# define VMALLOC_END	(FIXADDR_START-2*PAGE_SIZE)
+#endif
 
 #define _PAGE_PRESENT	0x001
 #define _PAGE_NEWPAGE	0x002
@@ -183,15 +188,17 @@ static inline void pgd_clear(pgd_t * pgdp)	{ }
 
 extern struct page *pte_mem_map(pte_t pte);
 extern struct page *phys_mem_map(unsigned long phys);
+extern unsigned long phys_to_pfn(unsigned long p);
+extern unsigned long pfn_to_phys(unsigned long pfn);
 
 #define pte_page(x) pfn_to_page(pte_pfn(x))
 #define pte_address(x) (__va(pte_val(x) & PAGE_MASK))
 #define mk_phys(a, r) ((a) + (r << REGION_SHIFT))
 #define phys_addr(p) ((p) & ~REGION_MASK)
 #define phys_page(p) (phys_mem_map(p) + ((phys_addr(p)) >> PAGE_SHIFT))
-#define pte_pfn(x) ((unsigned long)(((x).pte_low >> PAGE_SHIFT)))
-#define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
-#define pfn_pmd(pfn, prot)	__pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
+#define pte_pfn(x) phys_to_pfn(pte_val(x))
+#define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot))
+#define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot))
 
 static inline pte_t pte_mknewprot(pte_t pte)
 {
@@ -333,6 +340,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 
 /* to find an entry in a page-table-directory. */
 #define pgd_index(address) ((address >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
+#define __pgd_offset(address) pgd_index(address)
 
 /* to find an entry in a page-table-directory */
 #define pgd_offset(mm, address) \
@@ -341,6 +349,9 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 /* to find an entry in a kernel page-table-directory */
 #define pgd_offset_k(address) pgd_offset(&init_mm, address)
 
+#define __pmd_offset(address) \
+		(((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
+
 /* Find an entry in the second-level page table.. */
 static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
 {

include/asm-um/tlbflush.h

@@ -27,6 +27,7 @@ extern void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
 extern void flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr);
 extern void flush_tlb_kernel_vm(void);
 extern void flush_tlb_kernel_range(unsigned long start, unsigned long end);
+extern void __flush_tlb_one(unsigned long addr);
 
 static inline void flush_tlb_pgtables(struct mm_struct *mm,
 				      unsigned long start, unsigned long end)