Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 698 → Rev 699

/kernel/trunk/genarch/include/mm/page_ht.h
28,6 → 28,8
 
/*
* This is the generic page hash table interface.
* Architectures that use single page hash table for
* storing page translations must implement it.
*/
 
#ifndef __PAGE_HT_H__
35,6 → 37,58
 
#include <mm/page.h>
 
/** Hash function.
*
* @param page Virtual address. Only vpn bits will be used.
* @param asid Address space identifier.
*
* @return Pointer to hash table typed pte_t *.
*/
#define HT_HASH(page, asid) HT_HASH_ARCH(page, asid)
 
/** Compare PTE with page and asid.
*
* @param page Virtual address. Only vpn bits will be used.
* @param asid Address space identifier.
* @param t PTE.
*
* @return 1 on match, 0 otherwise.
*/
#define HT_COMPARE(page, asid, t) HT_COMPARE_ARCH(page, asid, t)
 
/** Identify empty hash table slots.
*
* @param t Pointer ro hash table typed pte_t *.
*
* @return 1 if the slot is empty, 0 otherwise.
*/
#define HT_SLOT_EMPTY(t) HT_SLOT_EMPTY_ARCH(t)
 
/** Return next record in collision chain.
*
* @param t PTE.
*
* @return Successor of PTE or NULL.
*/
#define HT_GET_NEXT(t) HT_GET_NEXT_ARCH(t)
 
/** Set successor in collision chain.
*
* @param t PTE.
* @param s Successor or NULL.
*/
#define HT_SET_NEXT(t, s) HT_SET_NEXT_ARCH(t, s)
 
/** Set page hash table record.
*
* @param t PTE.
* @param page Virtual address. Only vpn bits will be used.
* @param asid Address space identifier.
* @param frame Physical address. Only pfn bits will be used.
* @param flags Flags. See mm/page.h.
*/
#define HT_SET_RECORD(t, page, asid, frame, flags) HT_SET_RECORD_ARCH(t, page, asid, frame, flags)
 
extern page_operations_t page_ht_operations;
 
#endif
/kernel/trunk/genarch/src/mm/page_ht.c
29,10 → 29,12
#include <genarch/mm/page_ht.h>
#include <mm/page.h>
#include <mm/frame.h>
#include <mm/heap.h>
#include <arch/mm/asid.h>
#include <arch/types.h>
#include <typedefs.h>
#include <arch/asm.h>
#include <debug.h>
 
static void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root);
static pte_t *ht_mapping_find(__address page, asid_t asid, __address root);
51,10 → 53,21
* @param asid Address space to which page belongs.
* @param frame Physical address of memory frame to which the mapping is done.
* @param flags Flags to be used for mapping.
* @param root Explicit PTL0 address.
* @param root Ignored.
*/
void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root)
void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root)
{
pte_t *t, *u = NULL;
t = HT_HASH(page, asid);
if (!HT_SLOT_EMPTY(t)) {
u = (pte_t *) malloc(sizeof(pte_t)); /* FIXME: use slab allocator for this */
if (!u)
panic("could not allocate memory for hash table\n");
*u = *t;
}
HT_SET_NEXT(t, u);
HT_SET_RECORD(t, page, asid, frame, flags);
}
 
/** Find mapping for virtual page in page hash table.
63,11 → 76,17
*
* @param page Virtual page.
* @param asid Address space to wich page belongs.
* @param root PTL0 address if non-zero.
* @param root Ignored.
*
* @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
* @return NULL if there is no such mapping; requested mapping otherwise.
*/
pte_t *ht_mapping_find(__address page, asid_t asid, __address root)
{
return NULL;
pte_t *t;
t = HT_HASH(page, asid);
while (!HT_COMPARE(page, asid, t) && HT_GET_NEXT(t))
t = HT_GET_NEXT(t);
return HT_COMPARE(page, asid, t) ? t : NULL;
}
/kernel/trunk/generic/include/mm/page.h
42,6 → 42,7
#define PAGE_READ_SHIFT 3
#define PAGE_WRITE_SHIFT 4
#define PAGE_EXEC_SHIFT 5
#define PAGE_GLOBAL_SHIFT 6
 
#define PAGE_NOT_CACHEABLE (0<<PAGE_CACHEABLE_SHIFT)
#define PAGE_CACHEABLE (1<<PAGE_CACHEABLE_SHIFT)
56,6 → 57,9
#define PAGE_WRITE (1<<PAGE_WRITE_SHIFT)
#define PAGE_EXEC (1<<PAGE_EXEC_SHIFT)
 
#define PAGE_GLOBAL (1<<PAGE_GLOBAL_SHIFT)
 
/** Operations to manipulate page mappings. */
struct page_operations {
void (* mapping_insert)(__address page, asid_t asid, __address frame, int flags, __address root);
pte_t *(* mapping_find)(__address page, asid_t asid, __address root);
/kernel/trunk/generic/src/mm/page.c
95,7 → 95,7
* @param asid Address space to wich page belongs.
* @param root PTL0 address if non-zero.
*
* @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
* @return NULL if there is no such mapping; requested mapping otherwise.
*/
pte_t *page_mapping_find(__address page, asid_t asid, __address root)
{
/kernel/trunk/arch/sparc64/include/mm/page.h
41,6 → 41,14
#define GET_PTL0_ADDRESS_ARCH() 0
#define SET_PTL0_ADDRESS_ARCH(ptl0)
 
/** Implementation of page hash table interface. */
#define HT_HASH_ARCH(page, asid) 0
#define HT_COMPARE_ARCH(page, asid, t) 0
#define HT_SLOT_EMPTY_ARCH(t) 1
#define HT_GET_NEXT_ARCH(t) 0
#define HT_SET_NEXT_ARCH(t, s)
#define HT_SET_RECORD_ARCH(t, page, asid, frame, flags)
 
union page_address {
__address address;
struct {
/kernel/trunk/arch/ia64/include/mm/page.h
40,6 → 40,14
#define GET_PTL0_ADDRESS_ARCH() ((pte_t *) 0)
#define SET_PTL0_ADDRESS_ARCH(ptl0)
 
/** Implementation of page hash table interface. */
#define HT_HASH_ARCH(page, asid) 0
#define HT_COMPARE_ARCH(page, asid, t) 0
#define HT_SLOT_EMPTY_ARCH(t) 1
#define HT_GET_NEXT_ARCH(t) 0
#define HT_SET_NEXT_ARCH(t, s)
#define HT_SET_RECORD_ARCH(t, page, asid, frame, flags)
 
extern void page_arch_init(void);
 
#endif