Changeset ef67bab in mainline for genarch


Ignore:
Timestamp:
2006-02-01T00:02:16Z (20 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
071a8ae6
Parents:
fc1e4f6
Message:

Memory management work.
Remove the last (i.e. 'root') argument from page_mapping_insert() and page_mapping_find().
Page table address is now extracted from the first (i.e. 'as') argument.
Add a lot of infrastructure to make the above possible.
sparc64 is now broken, most likely because of insufficient identity mapping of physical memory.

Location:
genarch
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed

  • genarch/Makefile.inc

    rfc1e4f6 ref67bab  
    4040ifeq ($(CONFIG_PAGE_PT),y)
    4141        GENARCH_SOURCES += \
    42                 genarch/src/mm/page_pt.c
     42                genarch/src/mm/page_pt.c \
     43                genarch/src/mm/as_pt.c
    4344endif
    4445ifeq ($(CONFIG_PAGE_HT),y)
    4546        GENARCH_SOURCES += \
    46                 genarch/src/mm/page_ht.c
     47                genarch/src/mm/page_ht.c \
     48                genarch/src/mm/as_ht.c
    4749endif
    4850ifeq ($(CONFIG_ASID),y)

  • genarch/include/mm/page_ht.h

    rfc1e4f6 ref67bab  
    3939#include <typedefs.h>
    4040
    41 /** Number of slots in page hash table. */
    42 #define HT_ENTRIES                      HT_ENTRIES_ARCH
     41/** Page hash table size. */
     42#define HT_WIDTH                        HT_WIDTH_ARCH
     43#define HT_SIZE                         (1<<HT_WIDTH)
     44#define HT_ENTRIES                      (HT_SIZE/sizeof(pte_t))
    4345
    4446/** Hash function.
    … …  
    100102#define HT_SET_RECORD(t, page, asid, frame, flags)      HT_SET_RECORD_ARCH(t, page, asid, frame, flags)
    101103
    102 
    103104extern page_operations_t page_ht_operations;
    104105extern spinlock_t page_ht_lock;

  • genarch/include/mm/page_pt.h

    rfc1e4f6 ref67bab  
    8888extern page_operations_t page_pt_operations;
    8989
    90 extern void page_mapping_insert_pt(as_t *as, __address page, __address frame, int flags, __address root);
    91 extern pte_t *page_mapping_find_pt(as_t *as, __address page, __address root);
     90extern void page_mapping_insert_pt(as_t *as, __address page, __address frame, int flags);
     91extern pte_t *page_mapping_find_pt(as_t *as, __address page);
    9292
    9393#endif

  • genarch/src/acpi/acpi.c

    rfc1e4f6 ref67bab  
    8080static void map_sdt(struct acpi_sdt_header *sdt)
    8181{
    82         page_mapping_insert(AS_KERNEL, (__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
     82        page_mapping_insert(AS_KERNEL, (__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE);
    8383        map_structure((__address) sdt, sdt->length);
    8484}

  • genarch/src/mm/page_ht.c

    rfc1e4f6 ref67bab  
    3939#include <arch.h>
    4040#include <debug.h>
     41#include <memstr.h>
    4142
    4243/**
    43  * This lock protects the page hash table. Note that software must
    44  * be still careful about ordering of writes to ensure consistent
    45  * view of the page hash table for hardware helpers such as VHPT
    46  * walker on ia64.
     44 * This lock protects the page hash table.
    4745 */
    4846SPINLOCK_INITIALIZE(page_ht_lock);
    … …  
    5452pte_t *page_ht = NULL;
    5553
    56 static void ht_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root);
    57 static pte_t *ht_mapping_find(as_t *as, __address page, __address root);
     54static void ht_mapping_insert(as_t *as, __address page, __address frame, int flags);
     55static pte_t *ht_mapping_find(as_t *as, __address page);
    5856
    5957page_operations_t page_ht_operations = {
    6058        .mapping_insert = ht_mapping_insert,
    61         .mapping_find = ht_mapping_find
     59        .mapping_find = ht_mapping_find,
    6260};
    6361
    … …  
    6563 *
    6664 * Map virtual address 'page' to physical address 'frame'
    67  * using 'flags'. In order not to disturb hardware searching,
    68  * new mappings are appended to the end of the collision
    69  * chain.
     65 * using 'flags'.
    7066 *
    71  * @param as Address space to which page belongs. Must be locked prior the call.
     67 * The address space must be locked and interruptsmust be disabled.
     68 *
     69 * @param as Address space to which page belongs.
    7270 * @param page Virtual address of the page to be mapped.
    7371 * @param frame Physical address of memory frame to which the mapping is done.
    7472 * @param flags Flags to be used for mapping.
    75  * @param root Ignored.
    7673 */
    77 void ht_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root)
     74void ht_mapping_insert(as_t *as, __address page, __address frame, int flags)
    7875{
    7976        pte_t *t, *u;
    … …  
    122119 * Find mapping for virtual page.
    123120 *
    124  * Interrupts must be disabled.
     121 * The address space must be locked and interrupts must be disabled.
    125122 *
    126  * @param as Address space to wich page belongs. Must be locked prior the call.
     123 * @param as Address space to wich page belongs.
    127124 * @param page Virtual page.
    128  * @param root Ignored.
    129125 *
    130126 * @return NULL if there is no such mapping; requested mapping otherwise.
    131127 */
    132 pte_t *ht_mapping_find(as_t *as, __address page, __address root)
     128pte_t *ht_mapping_find(as_t *as, __address page)
    133129{
    134130        pte_t *t;

  • genarch/src/mm/page_pt.c

    rfc1e4f6 ref67bab  
    3030#include <mm/page.h>
    3131#include <mm/frame.h>
     32#include <mm/as.h>
    3233#include <arch/mm/page.h>
    3334#include <arch/mm/as.h>
    … …  
    3738#include <memstr.h>
    3839
    39 static void pt_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root);
    40 static pte_t *pt_mapping_find(as_t *as, __address page, __address root);
     40static void pt_mapping_insert(as_t *as, __address page, __address frame, int flags);
     41static pte_t *pt_mapping_find(as_t *as, __address page);
    4142
    4243page_operations_t page_pt_operations = {
    … …  
    5051 * using 'flags'.
    5152 *
    52  * @param as Ignored.
     53 * The address space must be locked and interrupts must be disabled.
     54 *
     55 * @param as Address space to wich page belongs.
    5356 * @param page Virtual address of the page to be mapped.
    5457 * @param frame Physical address of memory frame to which the mapping is done.
    5558 * @param flags Flags to be used for mapping.
    56  * @param root Explicit PTL0 address.
    5759 */
    58 void pt_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root)
     60void pt_mapping_insert(as_t *as, __address page, __address frame, int flags)
    5961{
    6062        pte_t *ptl0, *ptl1, *ptl2, *ptl3;
    6163        __address newpt;
    6264
    63         ptl0 = (pte_t *) PA2KA(root ? root : (__address) GET_PTL0_ADDRESS());
     65        ptl0 = (pte_t *) PA2KA((__address) as->page_table);
    6466
    6567        if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
    … …  
    98100 * Find mapping for virtual page.
    99101 *
    100  * @param as Ignored.
     102 * The address space must be locked and interrupts must be disabled.
     103 *
     104 * @param as Address space to which page belongs.
    101105 * @param page Virtual page.
    102  * @param root PTL0 address if non-zero.
    103106 *
    104107 * @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
    105108 */
    106 pte_t *pt_mapping_find(as_t *as, __address page, __address root)
     109pte_t *pt_mapping_find(as_t *as, __address page)
    107110{
    108111        pte_t *ptl0, *ptl1, *ptl2, *ptl3;
    109112
    110         ptl0 = (pte_t *) PA2KA(root ? root : (__address) GET_PTL0_ADDRESS());
     113        ptl0 = (pte_t *) PA2KA((__address) as->page_table);
    111114
    112115        if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)
Note: See TracChangeset for help on using the changeset viewer.