migration cache, updated

DISCUSSION Ray Bryant 1 participant 1 message Jan 3, 2005

Subsystems (3)

Memory management MM core MM swap

lore

Share & tools

lore

Ray Bryant

author

2005-01-03 19:25 UTC #0 lore raw

Marcello and Takahashi-san,

In working with your migration cache patch, I found out that if CONFIG_MIGRATE_MEMORY is not set, then the kernel with your patch applied (on top of my "split out" version of the memory migration code from the hotplug patch) doesn't link. (It still expects migration_space, etc to be defined as externals, and these aren't defined if CONFIG_MIGRATE_MEMORY is not set.)

Now I realize your patch is probably not "final" (there are a couple of FIXME's still in there....), but I found the attached patch useful as it lets my patched kernel compile with or without CONFIG_MEMORY_MIGRATE set.

I hope you find this useful and will incorporate it into your migration cache patch.

Signature · 9 lines

Best Regards,
Ray
-----------------------------------------------
                  Ray Bryant
512-453-9679 (work)         512-507-7807 (cell)
[email protected]             [email protected]
The box said: "Requires Windows 98 or better",
           so I installed Linux.
-----------------------------------------------

Fix the migration cache patch so that it will link even if CONFIG_MEMORY_MIGRATE is not set.

Signed-off-by Ray Bryant <[email protected]>

include/linux/mm.h +8 -1

Index: linux-2.6.10-rc2-mm4-page-migration-only/include/linux/mm.h
===================================================================
@@ -279,6 +279,7 @@ struct page {
 #include <linux/swap.h>
 #include <linux/swapops.h> 
 
+#ifdef CONFIG_MEMORY_MIGRATE
 static inline int PageMigration(struct page *page)
 {
         swp_entry_t entry;

@@ -293,7 +294,9 @@ static inline int PageMigration(struct p
 
         return 1;
 }
-
+#else
+#define PageMigration(p)  0
+#endif /* CONFIG_MEMORY_MIGRATE */
 
 /*
  * Methods to modify the page usage count.

@@ -506,9 +509,13 @@ static inline struct address_space *page
 {
 	struct address_space *mapping = page->mapping;
 
+#ifdef CONFIG_MEMORY_MIGRATE
 	if (unlikely(PageMigration(page)))
 		mapping = &migration_space;
 	else if (unlikely(PageSwapCache(page)))
+#else
+ 	if (unlikely(PageSwapCache(page)))
+#endif
 		mapping = &swapper_space;
 	else if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
 		mapping = NULL;

include/linux/swapops.h +4 -0

Index: linux-2.6.10-rc2-mm4-page-migration-only/include/linux/swapops.h
===================================================================
@@ -70,6 +70,7 @@ static inline pte_t swp_entry_to_pte(swp
 	return __swp_entry_to_pte(arch_entry);
 }
 
+#ifdef CONFIG_MEMORY_MIGRATE
 static inline int pte_is_migration(pte_t pte)
 {
 	unsigned long swp_type;

@@ -81,6 +82,9 @@ static inline int pte_is_migration(pte_t
 
 	return swp_type == MIGRATION_TYPE;
 }
+#else
+#define pte_is_migration(x) 0
+#endif /* CONFIG_MEMORY_MIGRATE */
 
 static inline pte_t migration_entry_to_pte(swp_entry_t entry)
 {