Changeset f1d1f5d3 in mainline

Timestamp:

2006-09-17T20:10:10Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

57da95c

Parents:

06e1e95

Message:

Fix bug in mm/as.c:

• as_area_destroy() should not work with AS but as

sparc64 work:

• start implementing TSB support

Location:

kernel

Files:

• arch/amd64/include/mm/as.h (modified) (1 diff)
• arch/ia32/include/mm/as.h (modified) (1 diff)
• arch/ia64/include/mm/as.h (modified) (1 diff)
• arch/mips32/include/mm/as.h (modified) (1 diff)
• arch/ppc32/include/mm/as.h (modified) (1 diff)
• arch/ppc64/include/mm/as.h (modified) (1 diff)
• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/include/mm/as.h (modified) (3 diffs)
• arch/sparc64/include/mm/tsb.h (added)
• arch/sparc64/src/mm/tsb.c (added)
• arch/xen32/include/mm/as.h (modified) (1 diff)
• genarch/src/mm/asid.c (modified) (2 diffs)
• generic/include/mm/as.h (modified) (1 diff)
• generic/src/mm/as.c (modified) (6 diffs)
• kernel.config (modified) (1 diff)

kernel/arch/amd64/include/mm/as.h

@@ -45 +45 @@
 #define USTACK_ADDRESS_ARCH     (USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1))
 
+typedef struct {
+} as_arch_t;
+
 #define as_install_arch(as)
+#define as_invalidate_translation_cache(as, page, cnt)
 
 extern void as_arch_init(void);

kernel/arch/ia32/include/mm/as.h

@@ -45 +45 @@
 #define USTACK_ADDRESS_ARCH     (USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1))
 
+typedef struct {
+} as_arch_t;
+
 #define as_install_arch(as)
+#define as_invalidate_translation_cache(as, page, cnt)
 
 extern void as_arch_init(void);

kernel/arch/ia64/include/mm/as.h

@@ -45 +45 @@
 #define USTACK_ADDRESS_ARCH     0x0000000ff0000000ULL
 
+typedef struct {
+} as_arch_t;
+
+#define as_invalidate_translation_cache(as, page, cnt)
+
 extern void as_arch_init(void);
 

kernel/arch/mips32/include/mm/as.h

@@ -45 +45 @@
 #define USTACK_ADDRESS_ARCH     (0x80000000-PAGE_SIZE)
 
+typedef struct {
+} as_arch_t;
+
+#define as_invalidate_translation_cache(as, page, cnt)
+
 extern void as_arch_init(void);
 

kernel/arch/ppc32/include/mm/as.h

@@ -45 +45 @@
 #define USTACK_ADDRESS_ARCH     (0x7fffffff-(PAGE_SIZE-1))
 
+typedef struct {
+} as_arch_t;
+
+#define as_invalidate_translation_cache(as, page, cnt)
+
 extern void as_arch_init(void);
 

kernel/arch/ppc64/include/mm/as.h

@@ -45 +45 @@
 #define USTACK_ADDRESS_ARCH     (0x7fffffff-(PAGE_SIZE-1))
 
+typedef struct {
+} as_arch_t;
+
 #define as_install_arch(as)
+#define as_invalidate_translation_cache(as, page, cnt)
 
 extern void as_arch_init(void);

kernel/arch/sparc64/Makefile.inc

@@ -108 +108 @@
         arch/$(ARCH)/src/drivers/kbd.c
 
+ifdef CONFIG_TSB
+ARCH_SOURCES += \
+        arch/$(ARCH)/src/mm/tsb.c
+endif
+
 ifdef CONFIG_Z8530
 ARCH_SOURCES += \

kernel/arch/sparc64/include/mm/as.h

@@ -36 +36 @@
 #define KERN_sparc64_AS_H_
 
+#ifdef CONFIG_TSB
+#include <arch/mm/tsb.h>
+#endif
+
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      1
 
@@ -45 +49 @@
 #define USTACK_ADDRESS_ARCH     (0xffffffffffffffffULL-(PAGE_SIZE-1))
 
+typedef struct {
+#ifdef CONFIG_TSB
+        tsb_entry_t *itsb;
+        tsb_entry_t *dtsb;
+#endif
+} as_arch_t;
+
+#ifdef CONFIG_TSB
+#       define as_invalidate_translation_cache(as, page, cnt)   tsb_invalidate(as, page, cnt)
+#else
+#       define as_invalidate_translation_cache(as, page, cnt)
+#endif
+
 extern void as_arch_init(void);
 
@@ -51 +68 @@
 /** @}
  */
-

kernel/arch/xen32/include/mm/as.h

@@ -45 +45 @@
 #define USTACK_ADDRESS_ARCH     (USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1))
 
+typedef struct {
+} as_arch_t;
+
 #define as_install_arch(as)
+#define as_invalidate_translation_cache(as, page, cnt)
 
 extern void as_arch_init(void);

kernel/genarch/src/mm/asid.c

@@ -123 +123 @@
                  */
                 as->asid = ASID_INVALID;
+                
+                /*
+                 * If the architecture uses some software cache
+                 * of TLB entries (e.g. TSB on sparc64), the
+                 * cache must be invalidated as well.
+                 */
+                as_invalidate_translation_cache(as, 0, 0);
+                
                 mutex_unlock(&as->lock);
 
@@ -142 +150 @@
 
                 /*
-                 * Purge the allocated rid from TLBs.
+                 * Purge the allocated ASID from TLBs.
                  */
                 tlb_shootdown_start(TLB_INVL_ASID, asid, 0, 0);

kernel/generic/include/mm/as.h

@@ -94 +94 @@
         /** Address space identifier. Constant on architectures that do not support ASIDs.*/
         asid_t asid;
+        
+        /** Architecture specific content. */
+        as_arch_t arch;
 };
 

kernel/generic/src/mm/as.c

@@ -360 +360 @@
                                         i = (start_free - b) >> PAGE_WIDTH;
                                         if (!used_space_remove(area, start_free, c - i))
-                                                panic("Could not remove used space.");
+                                                panic("Could not remove used space.\n");
                                 } else {
                                         /*
@@ -390 +390 @@
                 tlb_invalidate_pages(AS->asid, area->base + pages*PAGE_SIZE, area->pages - pages);
                 tlb_shootdown_finalize();
+                
+                /*
+                 * Invalidate software translation caches (e.g. TSB on sparc64).
+                 */
+                as_invalidate_translation_cache(as, area->base + pages*PAGE_SIZE, area->pages - pages);
         } else {
                 /*
@@ -441 +446 @@
          * Start TLB shootdown sequence.
          */
-        tlb_shootdown_start(TLB_INVL_PAGES, AS->asid, area->base, area->pages);
+        tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base, area->pages);
 
         /*
@@ -464 +469 @@
                                                 b + j*PAGE_SIZE, PTE_GET_FRAME(pte));
                                 }
-                                page_mapping_remove(as, b + j*PAGE_SIZE);
+                                page_mapping_remove(as, b + j*PAGE_SIZE);                               
                                 page_table_unlock(as, false);
                         }
@@ -473 +478 @@
          * Finish TLB shootdown sequence.
          */
-        tlb_invalidate_pages(AS->asid, area->base, area->pages);
+        tlb_invalidate_pages(as->asid, area->base, area->pages);
         tlb_shootdown_finalize();
+        
+        /*
+         * Invalidate potential software translation caches (e.g. TSB on sparc64).
+         */
+        as_invalidate_translation_cache(as, area->base, area->pages);
         
         btree_destroy(&area->used_space);
@@ -488 +498 @@
          * Remove the empty area from address space.
          */
-        btree_remove(&AS->as_area_btree, base, NULL);
+        btree_remove(&as->as_area_btree, base, NULL);
         
         free(area);
         
-        mutex_unlock(&AS->lock);
+        mutex_unlock(&as->lock);
         interrupts_restore(ipl);
         return 0;

kernel/kernel.config

@@ -108 +108 @@
 ! [ARCH=ia64] CONFIG_VHPT (n/y)
 
+# Use TSB
+! [ARCH=sparc64] CONFIG_TSB (n/y)
+
 ## Run-time configuration directives