diff -urN 2.3.14-pre2/Documentation/Configure.help 2.3.14-pre2-bigmem-O/Documentation/Configure.help --- 2.3.14-pre2/Documentation/Configure.help Wed Aug 18 22:25:39 1999 +++ 2.3.14-pre2-bigmem-O/Documentation/Configure.help Wed Aug 18 22:26:41 1999 @@ -168,6 +168,11 @@ on the Alpha. The only time you would ever not say Y is to say M in order to debug the code. Say Y unless you know what you are doing. +Big memory support +CONFIG_BIGMEM + This option is required if you want to utilize physical memory which + is not covered by the kernel virtual address space (> 1GB). + Normal PC floppy disk support CONFIG_BLK_DEV_FD If you want to use the floppy disk drive(s) of your PC under Linux, diff -urN 2.3.14-pre2/arch/i386/config.in 2.3.14-pre2-bigmem-O/arch/i386/config.in --- 2.3.14-pre2/arch/i386/config.in Wed Aug 18 22:25:39 1999 +++ 2.3.14-pre2-bigmem-O/arch/i386/config.in Wed Aug 18 22:26:41 1999 @@ -54,6 +54,7 @@ mainmenu_option next_comment comment 'General setup' +bool 'BIGMEM support' CONFIG_BIGMEM bool 'Networking support' CONFIG_NET bool 'PCI support' CONFIG_PCI if [ "$CONFIG_PCI" = "y" ]; then diff -urN 2.3.14-pre2/arch/i386/kernel/setup.c 2.3.14-pre2-bigmem-O/arch/i386/kernel/setup.c --- 2.3.14-pre2/arch/i386/kernel/setup.c Wed Aug 18 22:25:40 1999 +++ 2.3.14-pre2-bigmem-O/arch/i386/kernel/setup.c Wed Aug 18 22:26:41 1999 @@ -17,6 +17,8 @@ * * IDT Winchip tweaks, misc clean ups. * Dave Jones , August 1999 + * + * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999 */ /* @@ -42,6 +44,7 @@ #ifdef CONFIG_BLK_DEV_RAM #include #endif +#include #include #include #include @@ -447,12 +450,31 @@ #define VMALLOC_RESERVE (128 << 20) /* 128MB for vmalloc and initrd */ #define MAXMEM ((unsigned long)(-PAGE_OFFSET-VMALLOC_RESERVE)) +#ifdef CONFIG_BIGMEM + bigmem_start = bigmem_end = memory_end; +#endif if (memory_end > MAXMEM) { +#ifdef CONFIG_BIGMEM +#define MAXBIGMEM ((unsigned long)(~(VMALLOC_RESERVE-1))) + bigmem_start = MAXMEM; + bigmem_end = (memory_end < MAXBIGMEM) ? memory_end : MAXBIGMEM; +#endif memory_end = MAXMEM; +#ifdef CONFIG_BIGMEM + printk(KERN_NOTICE "%ldMB BIGMEM available.\n", + (bigmem_end-bigmem_start)>>20); +#else printk(KERN_WARNING "Warning only %ldMB will be used.\n", MAXMEM>>20); +#endif } +#if defined(CONFIG_BIGMEM) && defined(BIGMEM_DEBUG) + else { + memory_end -= memory_end/4; + bigmem_start = memory_end; + } +#endif memory_end += PAGE_OFFSET; *memory_start_p = memory_start; diff -urN 2.3.14-pre2/arch/i386/mm/Makefile 2.3.14-pre2-bigmem-O/arch/i386/mm/Makefile --- 2.3.14-pre2/arch/i386/mm/Makefile Mon Jan 18 02:28:56 1999 +++ 2.3.14-pre2-bigmem-O/arch/i386/mm/Makefile Wed Aug 18 22:26:41 1999 @@ -10,4 +10,8 @@ O_TARGET := mm.o O_OBJS := init.o fault.o ioremap.o extable.o +ifeq ($(CONFIG_BIGMEM),y) +O_OBJS += bigmem.o +endif + include $(TOPDIR)/Rules.make diff -urN 2.3.14-pre2/arch/i386/mm/bigmem.c 2.3.14-pre2-bigmem-O/arch/i386/mm/bigmem.c --- 2.3.14-pre2/arch/i386/mm/bigmem.c Thu Jan 1 01:00:00 1970 +++ 2.3.14-pre2-bigmem-O/arch/i386/mm/bigmem.c Wed Aug 18 22:26:41 1999 @@ -0,0 +1,30 @@ +/* + * BIGMEM IA32 code and variables. + */ + +#include +#include + +unsigned long bigmem_start, bigmem_end; + +/* NOTE: fixmap_init alloc all the fixmap pagetables contigous on the + physical space so we can cache the place of the first one and move + around without checking the pgd every time. */ +pte_t *kmap_pte; +pgprot_t kmap_prot; + +#define kmap_get_fixmap_pte(vaddr) \ + pte_offset(pmd_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr)) + +void __init kmap_init(void) +{ + unsigned long kmap_vstart; + + /* cache the first kmap pte */ + kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN); + kmap_pte = kmap_get_fixmap_pte(kmap_vstart); + + kmap_prot = PAGE_KERNEL; + if (boot_cpu_data.x86_capability & X86_FEATURE_PGE) + pgprot_val(kmap_prot) |= _PAGE_GLOBAL; +} diff -urN 2.3.14-pre2/arch/i386/mm/init.c 2.3.14-pre2-bigmem-O/arch/i386/mm/init.c --- 2.3.14-pre2/arch/i386/mm/init.c Thu Aug 12 02:53:18 1999 +++ 2.3.14-pre2-bigmem-O/arch/i386/mm/init.c Wed Aug 18 22:26:41 1999 @@ -2,6 +2,8 @@ * linux/arch/i386/mm/init.c * * Copyright (C) 1995 Linus Torvalds + * + * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999 */ #include @@ -20,6 +22,7 @@ #ifdef CONFIG_BLK_DEV_INITRD #include #endif +#include #include #include @@ -29,6 +32,7 @@ #include static unsigned long totalram = 0; +static unsigned long totalbig = 0; extern void show_net_buffers(void); extern unsigned long init_smp_mappings(unsigned long); @@ -150,6 +154,7 @@ { int i,free = 0,total = 0,reserved = 0; int shared = 0, cached = 0; + int bigmem = 0; printk("Mem-info:\n"); show_free_areas(); @@ -157,6 +162,8 @@ i = max_mapnr; while (i-- > 0) { total++; + if (PageBIGMEM(mem_map+i)) + bigmem++; if (PageReserved(mem_map+i)) reserved++; else if (PageSwapCache(mem_map+i)) @@ -167,6 +174,7 @@ shared += page_count(mem_map+i) - 1; } printk("%d pages of RAM\n",total); + printk("%d pages of BIGMEM\n",bigmem); printk("%d reserved pages\n",reserved); printk("%d pages shared\n",shared); printk("%d pages swap cached\n",cached); @@ -315,7 +323,12 @@ #endif local_flush_tlb(); +#ifndef CONFIG_BIGMEM return free_area_init(start_mem, end_mem); +#else + kmap_init(); /* run after fixmap_init */ + return free_area_init(start_mem, bigmem_end + PAGE_OFFSET); +#endif } /* @@ -364,8 +377,18 @@ unsigned long endbase; end_mem &= PAGE_MASK; +#ifdef CONFIG_BIGMEM + bigmem_start = PAGE_ALIGN(bigmem_start); + bigmem_end &= PAGE_MASK; +#endif high_memory = (void *) end_mem; +#ifndef CONFIG_BIGMEM max_mapnr = num_physpages = MAP_NR(end_mem); +#else + max_mapnr = num_physpages = PHYSMAP_NR(bigmem_end); + /* cache the bigmem_mapnr */ + bigmem_mapnr = PHYSMAP_NR(bigmem_start); +#endif /* clear the zero-page */ memset(empty_zero_page, 0, PAGE_SIZE); @@ -428,13 +451,25 @@ #endif free_page(tmp); } - printk("Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n", +#ifdef CONFIG_BIGMEM + for (tmp = bigmem_start; tmp < bigmem_end; tmp += PAGE_SIZE) { + clear_bit(PG_reserved, &mem_map[PHYSMAP_NR(tmp)].flags); + set_bit(PG_BIGMEM, &mem_map[PHYSMAP_NR(tmp)].flags); + atomic_set(&mem_map[PHYSMAP_NR(tmp)].count, 1); + free_page(tmp + PAGE_OFFSET); + totalbig += PAGE_SIZE; + } + totalram += totalbig; +#endif + printk("Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init, %dk bigmem)\n", (unsigned long) nr_free_pages << (PAGE_SHIFT-10), max_mapnr << (PAGE_SHIFT-10), codepages << (PAGE_SHIFT-10), reservedpages << (PAGE_SHIFT-10), datapages << (PAGE_SHIFT-10), - initpages << (PAGE_SHIFT-10)); + initpages << (PAGE_SHIFT-10), + (int) (totalbig >> 10) + ); if (boot_cpu_data.wp_works_ok < 0) test_wp_bit(); @@ -460,5 +495,7 @@ val->sharedram = 0; val->freeram = nr_free_pages << PAGE_SHIFT; val->bufferram = atomic_read(&buffermem); + val->totalbig = totalbig; + val->freebig = nr_free_bigpages << PAGE_SHIFT; return; } diff -urN 2.3.14-pre2/fs/proc/array.c 2.3.14-pre2-bigmem-O/fs/proc/array.c --- 2.3.14-pre2/fs/proc/array.c Wed Aug 18 22:25:44 1999 +++ 2.3.14-pre2-bigmem-O/fs/proc/array.c Wed Aug 18 22:26:41 1999 @@ -44,6 +44,8 @@ * * Al Viro : safe handling of mm_struct * + * Gerhard Wichert : added BIGMEM support + * Siemens AG */ #include @@ -373,6 +375,8 @@ "MemShared: %8lu kB\n" "Buffers: %8lu kB\n" "Cached: %8u kB\n" + "BigTotal: %8lu kB\n" + "BigFree: %8lu kB\n" "SwapTotal: %8lu kB\n" "SwapFree: %8lu kB\n", i.totalram >> 10, @@ -380,6 +384,8 @@ i.sharedram >> 10, i.bufferram >> 10, atomic_read(&page_cache_size) << (PAGE_SHIFT - 10), + i.totalbig >> 10, + i.freebig >> 10, i.totalswap >> 10, i.freeswap >> 10); } @@ -429,6 +435,8 @@ return pte_page(pte) + (ptr & ~PAGE_MASK); } +#include + static int get_array(struct mm_struct *mm, unsigned long start, unsigned long end, char * buffer) { unsigned long addr; @@ -441,6 +449,7 @@ addr = get_phys_addr(mm, start); if (!addr) return result; + addr = kmap(addr, KM_READ); do { c = *(char *) addr; if (!c) @@ -448,12 +457,19 @@ if (size < PAGE_SIZE) buffer[size++] = c; else + { + kunmap(addr, KM_READ); return result; + } addr++; start++; if (!c && start >= end) + { + kunmap(addr, KM_READ); return result; + } } while (addr & ~PAGE_MASK); + kunmap(addr, KM_READ); } return result; } diff -urN 2.3.14-pre2/fs/proc/mem.c 2.3.14-pre2-bigmem-O/fs/proc/mem.c --- 2.3.14-pre2/fs/proc/mem.c Tue Jul 13 02:02:09 1999 +++ 2.3.14-pre2-bigmem-O/fs/proc/mem.c Wed Aug 18 22:26:41 1999 @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -120,7 +121,9 @@ i = PAGE_SIZE-(addr & ~PAGE_MASK); if (i > scount) i = scount; + page = (char *) kmap((unsigned long) page, KM_READ); copy_to_user(tmp, page, i); + kunmap((unsigned long) page, KM_READ); addr += i; tmp += i; scount -= i; @@ -177,7 +180,9 @@ i = PAGE_SIZE-(addr & ~PAGE_MASK); if (i > count) i = count; + page = (unsigned long) kmap((unsigned long) page, KM_WRITE); copy_from_user(page, tmp, i); + kunmap((unsigned long) page, KM_WRITE); addr += i; tmp += i; count -= i; diff -urN 2.3.14-pre2/include/asm-i386/bigmem.h 2.3.14-pre2-bigmem-O/include/asm-i386/bigmem.h --- 2.3.14-pre2/include/asm-i386/bigmem.h Thu Jan 1 01:00:00 1970 +++ 2.3.14-pre2-bigmem-O/include/asm-i386/bigmem.h Wed Aug 18 22:26:41 1999 @@ -0,0 +1,69 @@ +/* + * bigmem.h: virtual kernel memory mappings for big memory + * + * Used in CONFIG_BIGMEM systems for memory pages which are not + * addressable by direct kernel virtual adresses. + * + * Copyright (C) 1999 Gerhard Wichert, Siemens AG + * Gerhard.Wichert@pdb.siemens.de + */ + +#ifndef _ASM_BIGMEM_H +#define _ASM_BIGMEM_H + +#include + +#define BIGMEM_DEBUG /* undef for production */ + +/* declarations for bigmem.c */ +extern unsigned long bigmem_start, bigmem_end; +extern int nr_free_bigpages; + +extern pte_t *kmap_pte; +extern pgprot_t kmap_prot; + +extern void kmap_init(void) __init; + +/* kmap helper functions necessary to access the bigmem pages in kernel */ +#include +#include + +extern inline unsigned long kmap(unsigned long kaddr, enum km_type type) +{ + if (__pa(kaddr) < bigmem_start) + return kaddr; + { + enum fixed_addresses idx = type+KM_TYPE_NR*smp_processor_id(); + unsigned long vaddr = __fix_to_virt(FIX_KMAP_BEGIN+idx); + +#ifdef BIGMEM_DEBUG + if (!pte_none(*(kmap_pte-idx))) + { + __label__ here; + here: + printk(KERN_ERR "not null pte on CPU %d from %p\n", + smp_processor_id(), &&here); + } +#endif + set_pte(kmap_pte-idx, mk_pte(kaddr & PAGE_MASK, kmap_prot)); + __flush_tlb_one(vaddr); + + return vaddr | (kaddr & ~PAGE_MASK); + } +} + +extern inline void kunmap(unsigned long vaddr, enum km_type type) +{ +#ifdef BIGMEM_DEBUG + enum fixed_addresses idx = type+KM_TYPE_NR*smp_processor_id(); + if ((vaddr & PAGE_MASK) == __fix_to_virt(FIX_KMAP_BEGIN+idx)) + { + /* force other mappings to Oops if they'll try to access + this pte without first remap it */ + pte_clear(kmap_pte-idx); + __flush_tlb_one(vaddr); + } +#endif +} + +#endif /* _ASM_BIGMEM_H */ diff -urN 2.3.14-pre2/include/asm-i386/fixmap.h 2.3.14-pre2-bigmem-O/include/asm-i386/fixmap.h --- 2.3.14-pre2/include/asm-i386/fixmap.h Wed Aug 18 19:19:24 1999 +++ 2.3.14-pre2-bigmem-O/include/asm-i386/fixmap.h Wed Aug 18 22:26:41 1999 @@ -6,6 +6,8 @@ * for more details. * * Copyright (C) 1998 Ingo Molnar + * + * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999 */ #ifndef _ASM_FIXMAP_H @@ -15,6 +17,10 @@ #include #include #include +#ifdef CONFIG_BIGMEM +#include +#include +#endif /* * Here we define all the compile-time 'special' virtual @@ -54,6 +60,10 @@ FIX_CO_APIC, /* Cobalt APIC Redirection Table */ FIX_LI_PCIA, /* Lithium PCI Bridge A */ FIX_LI_PCIB, /* Lithium PCI Bridge B */ +#endif +#ifdef CONFIG_BIGMEM + 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 }; diff -urN 2.3.14-pre2/include/asm-i386/io.h 2.3.14-pre2-bigmem-O/include/asm-i386/io.h --- 2.3.14-pre2/include/asm-i386/io.h Wed Aug 18 19:19:26 1999 +++ 2.3.14-pre2-bigmem-O/include/asm-i386/io.h Wed Aug 18 22:26:41 1999 @@ -27,6 +27,7 @@ /* * Bit simplified and optimized by Jan Hubicka + * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999. */ #ifdef SLOW_IO_BY_JUMPING @@ -109,12 +110,20 @@ */ extern inline unsigned long virt_to_phys(volatile void * address) { +#ifdef CONFIG_BIGMEM + return __pa(address); +#else return __io_phys(address); +#endif } extern inline void * phys_to_virt(unsigned long address) { +#ifdef CONFIG_BIGMEM + return __va(address); +#else return __io_virt(address); +#endif } extern void * __ioremap(unsigned long offset, unsigned long size, unsigned long flags); diff -urN 2.3.14-pre2/include/asm-i386/kmap_types.h 2.3.14-pre2-bigmem-O/include/asm-i386/kmap_types.h --- 2.3.14-pre2/include/asm-i386/kmap_types.h Thu Jan 1 01:00:00 1970 +++ 2.3.14-pre2-bigmem-O/include/asm-i386/kmap_types.h Wed Aug 18 22:26:41 1999 @@ -0,0 +1,10 @@ +#ifndef _ASM_KMAP_TYPES_H +#define _ASM_KMAP_TYPES_H + +enum km_type { + KM_READ, + KM_WRITE, + KM_TYPE_NR, +}; + +#endif diff -urN 2.3.14-pre2/include/asm-i386/page.h 2.3.14-pre2-bigmem-O/include/asm-i386/page.h --- 2.3.14-pre2/include/asm-i386/page.h Wed Aug 18 19:19:23 1999 +++ 2.3.14-pre2-bigmem-O/include/asm-i386/page.h Wed Aug 18 22:26:41 1999 @@ -101,6 +101,7 @@ #define __pa(x) ((unsigned long)(x)-PAGE_OFFSET) #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) #define MAP_NR(addr) (__pa(addr) >> PAGE_SHIFT) +#define PHYSMAP_NR(addr) ((unsigned long)(addr) >> PAGE_SHIFT) #endif /* __KERNEL__ */ diff -urN 2.3.14-pre2/include/linux/bigmem.h 2.3.14-pre2-bigmem-O/include/linux/bigmem.h --- 2.3.14-pre2/include/linux/bigmem.h Thu Jan 1 01:00:00 1970 +++ 2.3.14-pre2-bigmem-O/include/linux/bigmem.h Wed Aug 18 22:26:41 1999 @@ -0,0 +1,48 @@ +#ifndef _LINUX_BIGMEM_H +#define _LINUX_BIGMEM_H + +#include + +#ifdef CONFIG_BIGMEM + +#include + +/* declarations for linux/mm/bigmem.c */ +extern unsigned long bigmem_mapnr; +extern int nr_free_bigpages; + +extern struct page * prepare_bigmem_swapout(struct page *); +extern struct page * replace_with_bigmem(struct page *); + +#else /* CONFIG_BIGMEM */ + +#define prepare_bigmem_swapout(page) page +#define replace_with_bigmem(page) page +#define kmap(kaddr, type) kaddr +#define kunmap(vaddr, type) do { } while (0) +#define nr_free_bigpages 0 + +#endif /* CONFIG_BIGMEM */ + +/* when CONFIG_BIGMEM is not set these will be plain clear/copy_page */ +extern inline void clear_bigpage(unsigned long kaddr) +{ + unsigned long vaddr; + + vaddr = kmap(kaddr, KM_WRITE); + clear_page(vaddr); + kunmap(vaddr, KM_WRITE); +} + +extern inline void copy_bigpage(unsigned long to, unsigned long from) +{ + unsigned long vfrom, vto; + + vfrom = kmap(from, KM_READ); + vto = kmap(to, KM_WRITE); + copy_page(vto, vfrom); + kunmap(vfrom, KM_READ); + kunmap(vto, KM_WRITE); +} + +#endif /* _LINUX_BIGMEM_H */ diff -urN 2.3.14-pre2/include/linux/kernel.h 2.3.14-pre2-bigmem-O/include/linux/kernel.h --- 2.3.14-pre2/include/linux/kernel.h Thu Aug 12 02:53:24 1999 +++ 2.3.14-pre2-bigmem-O/include/linux/kernel.h Wed Aug 18 22:26:41 1999 @@ -90,10 +90,11 @@ unsigned long freeram; /* Available memory size */ unsigned long sharedram; /* Amount of shared memory */ unsigned long bufferram; /* Memory used by buffers */ + unsigned long totalbig; /* Total big memory size */ + unsigned long freebig; /* Available big memory size */ unsigned long totalswap; /* Total swap space size */ unsigned long freeswap; /* swap space still available */ unsigned short procs; /* Number of current processes */ - char _f[22]; /* Pads structure to 64 bytes */ }; #endif diff -urN 2.3.14-pre2/include/linux/mm.h 2.3.14-pre2-bigmem-O/include/linux/mm.h --- 2.3.14-pre2/include/linux/mm.h Wed Aug 18 19:19:25 1999 +++ 2.3.14-pre2-bigmem-O/include/linux/mm.h Wed Aug 18 22:26:41 1999 @@ -153,6 +153,7 @@ #define PG_swap_cache 9 #define PG_skip 10 #define PG_swap_entry 11 +#define PG_BIGMEM 12 /* bits 21-30 unused */ #define PG_reserved 31 @@ -199,6 +200,11 @@ #define PageTestandClearSwapCache(page) \ (test_and_clear_bit(PG_swap_cache, &(page)->flags)) +#ifdef CONFIG_BIGMEM +#define PageBIGMEM(page) (test_bit(PG_BIGMEM, &(page)->flags)) +#else +#define PageBIGMEM(page) 0 /* needed to optimize away at compile time */ +#endif /* * Various page->flags bits: @@ -357,11 +363,17 @@ #define __GFP_HIGH 0x08 #define __GFP_IO 0x10 #define __GFP_SWAP 0x20 +#ifdef CONFIG_BIGMEM +#define __GFP_BIGMEM 0x40 +#else +#define __GFP_BIGMEM 0x0 /* noop */ +#endif #define __GFP_DMA 0x80 #define GFP_BUFFER (__GFP_LOW | __GFP_WAIT) #define GFP_ATOMIC (__GFP_HIGH) +#define GFP_BIGUSER (__GFP_LOW | __GFP_WAIT | __GFP_IO | __GFP_BIGMEM) #define GFP_USER (__GFP_LOW | __GFP_WAIT | __GFP_IO) #define GFP_KERNEL (__GFP_MED | __GFP_WAIT | __GFP_IO) #define GFP_NFS (__GFP_HIGH | __GFP_WAIT | __GFP_IO) @@ -371,6 +383,11 @@ platforms, used as appropriate on others */ #define GFP_DMA __GFP_DMA + +/* Flag - indicates that the buffer can be taken from big memory which is not + directly addressable by the kernel */ + +#define GFP_BIGMEM __GFP_BIGMEM /* vma is the first one with address < vma->vm_end, * and even address < vma->vm_start. Have to extend vma. */ diff -urN 2.3.14-pre2/ipc/shm.c 2.3.14-pre2-bigmem-O/ipc/shm.c --- 2.3.14-pre2/ipc/shm.c Thu Aug 12 02:53:25 1999 +++ 2.3.14-pre2-bigmem-O/ipc/shm.c Wed Aug 18 22:26:41 1999 @@ -6,6 +6,7 @@ * Fixed the shm swap deallocation (shm_unuse()), August 1998 Andrea Arcangeli. * * /proc/sysvipc/shm support (c) 1999 Dragos Acostachioaie + * BIGMEM support, Andrea Arcangeli */ #include @@ -17,6 +18,7 @@ #include #include #include +#include #include #include @@ -657,9 +659,10 @@ pte = __pte(shp->shm_pages[idx]); if (!pte_present(pte)) { if (pte_none(pte)) { - page = get_free_page(GFP_USER); + page = __get_free_page(GFP_BIGUSER); if (!page) goto oom; + clear_bigpage(page); if (pte_val(pte) != shp->shm_pages[idx]) goto changed; } else { @@ -677,6 +680,8 @@ if (!page_map) goto oom; delete_from_swap_cache(page_map); + page_map = replace_with_bigmem(page_map); + page = page_address(page_map); swap_free(entry); shm_swp--; } @@ -750,6 +755,8 @@ page_map = &mem_map[MAP_NR(pte_page(page))]; if ((gfp_mask & __GFP_DMA) && !PageDMA(page_map)) goto check_table; + if (!(gfp_mask & __GFP_BIGMEM) && PageBIGMEM(page_map)) + goto check_table; swap_attempts++; if (--counter < 0) { /* failed */ @@ -758,6 +765,8 @@ return 0; } if (page_count(mem_map + MAP_NR(pte_page(page))) != 1) + goto check_table; + if (!(page_map = prepare_bigmem_swapout(page_map))) goto check_table; shp->shm_pages[idx] = swap_nr; swap_duplicate(swap_nr); diff -urN 2.3.14-pre2/kernel/ptrace.c 2.3.14-pre2-bigmem-O/kernel/ptrace.c --- 2.3.14-pre2/kernel/ptrace.c Thu Jul 22 01:07:28 1999 +++ 2.3.14-pre2-bigmem-O/kernel/ptrace.c Wed Aug 18 22:26:41 1999 @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -52,7 +53,11 @@ dst = src; src = buf; } + src = (void *) kmap((unsigned long) src, KM_READ); + dst = (void *) kmap((unsigned long) dst, KM_WRITE); memcpy(dst, src, len); + kunmap((unsigned long) src, KM_READ); + kunmap((unsigned long) dst, KM_WRITE); } flush_page_to_ram(page); return len; diff -urN 2.3.14-pre2/mm/Makefile 2.3.14-pre2-bigmem-O/mm/Makefile --- 2.3.14-pre2/mm/Makefile Mon Jan 18 02:27:01 1999 +++ 2.3.14-pre2-bigmem-O/mm/Makefile Wed Aug 18 22:26:41 1999 @@ -12,4 +12,8 @@ vmalloc.o slab.o \ swap.o vmscan.o page_io.o page_alloc.o swap_state.o swapfile.o +ifeq ($(CONFIG_BIGMEM),y) +O_OBJS += bigmem.o +endif + include $(TOPDIR)/Rules.make diff -urN 2.3.14-pre2/mm/bigmem.c 2.3.14-pre2-bigmem-O/mm/bigmem.c --- 2.3.14-pre2/mm/bigmem.c Thu Jan 1 01:00:00 1970 +++ 2.3.14-pre2-bigmem-O/mm/bigmem.c Wed Aug 18 22:26:41 1999 @@ -0,0 +1,73 @@ +/* + * BIGMEM common code and variables. + * bigmem page conversions, Andrea Arcangeli + */ + +#include +#include +#include + +unsigned long bigmem_mapnr; +int nr_free_bigpages = 0; + +struct page * prepare_bigmem_swapout(struct page * page) +{ + /* if this is a bigmem page so it can't be swapped out directly + otherwise the b_data buffer addresses will break + the lowlevel device drivers. */ + if (PageBIGMEM(page)) + { + unsigned long regular_page; + unsigned long vaddr; + + regular_page = __get_free_page(GFP_ATOMIC); + if (!regular_page) + return NULL; + + vaddr = kmap(page_address(page), KM_READ); + copy_page(regular_page, vaddr); + kunmap(vaddr, KM_READ); + + /* ok, we can just forget about our bigmem page since + we stored its data into the new regular_page. */ + __free_page(page); + + page = MAP_NR(regular_page) + mem_map; + } + return page; +} + +struct page * replace_with_bigmem(struct page * page) +{ + if (!PageBIGMEM(page) && nr_free_bigpages) + { + unsigned long kaddr; + + kaddr = __get_free_page(GFP_ATOMIC|GFP_BIGMEM); + if (kaddr) + { + struct page * bigmem_page; + + bigmem_page = MAP_NR(kaddr) + mem_map; + if (PageBIGMEM(bigmem_page)) + { + unsigned long vaddr; + + vaddr = kmap(kaddr, KM_WRITE); + copy_page(vaddr, page_address(page)); + kunmap(vaddr, KM_WRITE); + + /* Preserve the caching of the swap_entry. */ + bigmem_page->offset = page->offset; + + /* We can just forget the old page since + we stored its data into the new + bigmem_page. */ + __free_page(page); + + page = bigmem_page; + } + } + } + return page; +} diff -urN 2.3.14-pre2/mm/filemap.c 2.3.14-pre2-bigmem-O/mm/filemap.c --- 2.3.14-pre2/mm/filemap.c Wed Aug 18 22:25:45 1999 +++ 2.3.14-pre2-bigmem-O/mm/filemap.c Wed Aug 18 22:26:41 1999 @@ -246,6 +246,9 @@ if ((gfp_mask & __GFP_DMA) && !PageDMA(page)) continue; + if (!(gfp_mask & __GFP_BIGMEM) && PageBIGMEM(page)) + continue; + count--; /* diff -urN 2.3.14-pre2/mm/memory.c 2.3.14-pre2-bigmem-O/mm/memory.c --- 2.3.14-pre2/mm/memory.c Thu Aug 12 02:53:25 1999 +++ 2.3.14-pre2-bigmem-O/mm/memory.c Wed Aug 18 22:26:41 1999 @@ -31,6 +31,9 @@ /* * 05.04.94 - Multi-page memory management added for v1.1. * Idea by Alex Bligh (alex@cconcepts.co.uk) + * + * 16.07.99 - Support of BIGMEM added by Gerhard Wichert, Siemens AG + * (Gerhard.Wichert@pdb.siemens.de) */ #include @@ -40,6 +43,7 @@ #include #include #include +#include #include #include @@ -56,10 +60,10 @@ static inline void copy_cow_page(unsigned long from, unsigned long to) { if (from == ZERO_PAGE(to)) { - clear_page(to); + clear_bigpage(to); return; } - copy_page(to, from); + copy_bigpage(to, from); } mem_map_t * mem_map = NULL; @@ -422,6 +426,8 @@ map = mem_map + MAP_NR(page); if (PageReserved(map)) return 0; + if (PageBIGMEM(map)) + return 0; return map; } @@ -807,7 +813,7 @@ * Ok, we need to copy. Oh, well.. */ spin_unlock(&tsk->mm->page_table_lock); - new_page = __get_free_page(GFP_USER); + new_page = __get_free_page(GFP_BIGUSER); if (!new_page) return -1; spin_lock(&tsk->mm->page_table_lock); @@ -995,6 +1001,8 @@ set_bit(PG_swap_entry, &page->flags); if (write_access && !is_page_shared(page)) { delete_from_swap_cache(page); + page = replace_with_bigmem(page); + pte = mk_pte(page_address(page), vma->vm_page_prot); pte = pte_mkwrite(pte_mkdirty(pte)); } set_pte(page_table, pte); @@ -1010,10 +1018,10 @@ { pte_t entry = pte_wrprotect(mk_pte(ZERO_PAGE(addr), vma->vm_page_prot)); if (write_access) { - unsigned long page = __get_free_page(GFP_USER); + unsigned long page = __get_free_page(GFP_BIGUSER); if (!page) return -1; - clear_page(page); + clear_bigpage(page); entry = pte_mkwrite(pte_mkdirty(mk_pte(page, vma->vm_page_prot))); vma->vm_mm->rss++; tsk->min_flt++; diff -urN 2.3.14-pre2/mm/page_alloc.c 2.3.14-pre2-bigmem-O/mm/page_alloc.c --- 2.3.14-pre2/mm/page_alloc.c Thu Aug 12 02:53:25 1999 +++ 2.3.14-pre2-bigmem-O/mm/page_alloc.c Wed Aug 18 22:26:41 1999 @@ -3,6 +3,7 @@ * * Copyright (C) 1991, 1992, 1993, 1994 Linus Torvalds * Swap reorganised 29.12.95, Stephen Tweedie + * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999 */ #include @@ -13,6 +14,7 @@ #include #include #include +#include /* export bigmem vars */ #include #include /* for copy_to/from_user */ @@ -45,7 +47,12 @@ #define memory_head(x) ((struct page *)(x)) +#ifdef CONFIG_BIGMEM +#define BIGMEM_LISTS_OFFSET NR_MEM_LISTS +static struct free_area_struct free_area[NR_MEM_LISTS*2]; +#else static struct free_area_struct free_area[NR_MEM_LISTS]; +#endif static inline void init_mem_queue(struct free_area_struct * head) { @@ -101,6 +108,12 @@ #define list(x) (mem_map+(x)) +#ifdef CONFIG_BIGMEM + if (map_nr >= bigmem_mapnr) { + area += BIGMEM_LISTS_OFFSET; + nr_free_bigpages -= mask; + } +#endif map_nr &= mask; nr_free_pages -= mask; while (mask + (1 << (NR_MEM_LISTS-1))) { @@ -160,6 +173,29 @@ change_bit((index) >> (1+(order)), (area)->map) #define CAN_DMA(x) (PageDMA(x)) #define ADDRESS(x) (PAGE_OFFSET + ((x) << PAGE_SHIFT)) + +#ifdef CONFIG_BIGMEM +#define RMQUEUEBIG(order, gfp_mask) \ +if (gfp_mask & __GFP_BIGMEM) { \ + struct free_area_struct * area = free_area+order+BIGMEM_LISTS_OFFSET; \ + unsigned long new_order = order; \ + do { struct page *prev = memory_head(area), *ret = prev->next; \ + if (memory_head(area) != ret) { \ + unsigned long map_nr; \ + (prev->next = ret->next)->prev = prev; \ + map_nr = ret - mem_map; \ + MARK_USED(map_nr, new_order, area); \ + nr_free_pages -= 1 << order; \ + nr_free_bigpages -= 1 << order; \ + EXPAND(ret, map_nr, order, new_order, area); \ + spin_unlock_irqrestore(&page_alloc_lock, flags); \ + return ADDRESS(map_nr); \ + } \ + new_order++; area++; \ + } while (new_order < NR_MEM_LISTS); \ +} +#endif + #define RMQUEUE(order, gfp_mask) \ do { struct free_area_struct * area = free_area+order; \ unsigned long new_order = order; \ @@ -221,6 +257,7 @@ int freed; static int low_on_memory = 0; +#ifndef CONFIG_BIGMEM if (nr_free_pages > freepages.min) { if (!low_on_memory) goto ok_to_allocate; @@ -231,6 +268,32 @@ } low_on_memory = 1; +#else + static int low_on_bigmemory = 0; + + if (gfp_mask & __GFP_BIGMEM) + { + if (nr_free_pages > freepages.min) { + if (!low_on_bigmemory) + goto ok_to_allocate; + if (nr_free_pages >= freepages.high) { + low_on_bigmemory = 0; + goto ok_to_allocate; + } + } + low_on_bigmemory = 1; + } else { + if (nr_free_pages-nr_free_bigpages > freepages.min) { + if (!low_on_memory) + goto ok_to_allocate; + if (nr_free_pages-nr_free_bigpages >= freepages.high) { + low_on_memory = 0; + goto ok_to_allocate; + } + } + low_on_memory = 1; + } +#endif current->flags |= PF_MEMALLOC; freed = try_to_free_pages(gfp_mask); current->flags &= ~PF_MEMALLOC; @@ -240,6 +303,9 @@ } ok_to_allocate: spin_lock_irqsave(&page_alloc_lock, flags); +#ifdef CONFIG_BIGMEM + RMQUEUEBIG(order, gfp_mask); +#endif RMQUEUE(order, gfp_mask); spin_unlock_irqrestore(&page_alloc_lock, flags); @@ -267,7 +333,9 @@ unsigned long order, flags; unsigned long total = 0; - printk("Free pages: %6dkB\n ( ",nr_free_pages<<(PAGE_SHIFT-10)); + printk("Free pages: %6dkB (%6dkB BigMem)\n ( ", + nr_free_pages<<(PAGE_SHIFT-10), + nr_free_bigpages<<(PAGE_SHIFT-10)); printk("Free: %d (%d %d %d)\n", nr_free_pages, freepages.min, @@ -280,6 +348,13 @@ for (tmp = free_area[order].next ; tmp != memory_head(free_area+order) ; tmp = tmp->next) { nr ++; } +#ifdef CONFIG_BIGMEM + for (tmp = free_area[BIGMEM_LISTS_OFFSET+order].next; + tmp != memory_head(free_area+BIGMEM_LISTS_OFFSET+order); + tmp = tmp->next) { + nr ++; + } +#endif total += nr * ((PAGE_SIZE>>10) << order); printk("%lu*%lukB ", nr, (unsigned long)((PAGE_SIZE>>10) << order)); } @@ -333,6 +408,9 @@ for (i = 0 ; i < NR_MEM_LISTS ; i++) { unsigned long bitmap_size; init_mem_queue(free_area+i); +#ifdef CONFIG_BIGMEM + init_mem_queue(free_area+BIGMEM_LISTS_OFFSET+i); +#endif mask += mask; end_mem = (end_mem + ~mask) & mask; bitmap_size = (end_mem - PAGE_OFFSET) >> (PAGE_SHIFT + i); @@ -341,6 +419,11 @@ free_area[i].map = (unsigned int *) start_mem; memset((void *) start_mem, 0, bitmap_size); start_mem += bitmap_size; +#ifdef CONFIG_BIGMEM + free_area[BIGMEM_LISTS_OFFSET+i].map = (unsigned int *) start_mem; + memset((void *) start_mem, 0, bitmap_size); + start_mem += bitmap_size; +#endif } return start_mem; } diff -urN 2.3.14-pre2/mm/vmalloc.c 2.3.14-pre2-bigmem-O/mm/vmalloc.c --- 2.3.14-pre2/mm/vmalloc.c Tue Jul 13 00:33:04 1999 +++ 2.3.14-pre2-bigmem-O/mm/vmalloc.c Wed Aug 18 22:26:41 1999 @@ -2,6 +2,7 @@ * linux/mm/vmalloc.c * * Copyright (C) 1993 Linus Torvalds + * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999 */ #include @@ -94,7 +95,7 @@ unsigned long page; if (!pte_none(*pte)) printk("alloc_area_pte: page already exists\n"); - page = __get_free_page(GFP_KERNEL); + page = __get_free_page(GFP_KERNEL|GFP_BIGMEM); if (!page) return -ENOMEM; set_pte(pte, mk_pte(page, PAGE_KERNEL)); diff -urN 2.3.14-pre2/mm/vmscan.c 2.3.14-pre2-bigmem-O/mm/vmscan.c --- 2.3.14-pre2/mm/vmscan.c Wed Aug 18 22:25:45 1999 +++ 2.3.14-pre2-bigmem-O/mm/vmscan.c Wed Aug 18 22:26:41 1999 @@ -17,6 +17,7 @@ #include #include #include +#include #include @@ -63,7 +64,8 @@ if (PageReserved(page) || PageLocked(page) - || ((gfp_mask & __GFP_DMA) && !PageDMA(page))) + || ((gfp_mask & __GFP_DMA) && !PageDMA(page)) + || (!(gfp_mask & __GFP_BIGMEM) && PageBIGMEM(page))) goto out_failed_unlock; /* @@ -154,6 +156,9 @@ if (!entry) goto out_failed_unlock; /* No swap space left */ + if (!(page = prepare_bigmem_swapout(page))) + goto out_swap_free_unlock; + vma->vm_mm->rss--; set_pte(page_table, __pte(entry)); spin_unlock(&vma->vm_mm->page_table_lock); @@ -174,6 +179,11 @@ spin_unlock(&vma->vm_mm->page_table_lock); out_failed: return 0; +out_swap_free_unlock: + swap_free(entry); + spin_unlock(&vma->vm_mm->page_table_lock); + return 0; + } /* @@ -484,7 +494,9 @@ * up on a more timely basis. */ do { - if (nr_free_pages >= freepages.high) + /* kswapd is critical to provide GFP_ATOMIC + allocations (not GFP_BIGMEM ones). */ + if (nr_free_pages - nr_free_bigpages >= freepages.high) break; if (!do_try_to_free_pages(GFP_KSWAPD))