patch-2.3.16 linux/ipc/shm.c

• Lines: 84
• Date: Mon Aug 30 13:47:18 1999
• Orig file: v2.3.15/linux/ipc/shm.c
• Orig date: Thu Aug 26 13:05:41 1999

diff -u --recursive --new-file v2.3.15/linux/ipc/shm.c linux/ipc/shm.c
@@ -6,6 +6,7 @@
  * Fixed the shm swap deallocation (shm_unuse()), August 1998 Andrea Arcangeli.
  *
  * /proc/sysvipc/shm support (c) 1999 Dragos Acostachioaie <dragos@iname.com>
+ * BIGMEM support, Andrea Arcangeli <andrea@suse.de>
  */
 
 #include <linux/config.h>
@@ -17,6 +18,7 @@
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
 #include <linux/proc_fs.h>
+#include <linux/bigmem.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -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--;
 		}
@@ -719,10 +724,12 @@
 	int loop = 0;
 	int counter;
 	struct page * page_map;
+	int ret = 0;
 	
+	lock_kernel();
 	counter = shm_rss >> prio;
 	if (!counter || !(swap_nr = get_swap_page()))
-		return 0;
+		goto out_unlock;
 
  check_id:
 	shp = shm_segs[swap_id];
@@ -750,15 +757,19 @@
 	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 */
 		failed:
 		swap_free (swap_nr);
-		return 0;
+		goto out_unlock;
 	}
 	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);
 	add_to_swap_cache(page_map, swap_nr);
@@ -768,7 +779,10 @@
 	swap_successes++;
 	shm_swp++;
 	shm_rss--;
-	return 1;
+	ret = 1;
+ out_unlock:
+	unlock_kernel();
+	return ret;
 }
 
 /*