Merge r236494 from x86:

Isolate the global TTE list lock from data and other locks to prevent false
sharing within the cache.

MFC after:	3 days
This commit is contained in:
Marius Strobl 2012-08-05 22:03:13 +00:00
parent a6c38148a0
commit 55afc4edf1
2 changed files with 12 additions and 4 deletions

View File

@ -68,6 +68,11 @@ struct pmap {
struct pmap_statistics pm_stats;
};
struct tte_list_lock {
struct rwlock lock;
char padding[CACHE_LINE_SIZE - sizeof(struct rwlock)];
};
#define PMAP_LOCK(pmap) mtx_lock(&(pmap)->pm_mtx)
#define PMAP_LOCK_ASSERT(pmap, type) \
mtx_assert(&(pmap)->pm_mtx, (type))
@ -103,7 +108,8 @@ void pmap_set_kctx(void);
extern struct pmap kernel_pmap_store;
#define kernel_pmap (&kernel_pmap_store)
extern struct rwlock tte_list_global_lock;
extern struct tte_list_lock tte_list_global;
#define tte_list_global_lock tte_list_global.lock
extern vm_paddr_t phys_avail[];
extern vm_offset_t virtual_avail;
extern vm_offset_t virtual_end;

View File

@ -135,9 +135,11 @@ vm_offset_t vm_max_kernel_address;
struct pmap kernel_pmap_store;
/*
* Global tte list lock
* Isolate the global TTE list lock from data and other locks to prevent
* false sharing within the cache (see also the declaration of struct
* tte_list_lock).
*/
struct rwlock tte_list_global_lock;
struct tte_list_lock tte_list_global __aligned(CACHE_LINE_SIZE);
/*
* Allocate physical memory for use in pmap_bootstrap.
@ -672,7 +674,7 @@ pmap_bootstrap(u_int cpu_impl)
pm->pm_context[i] = TLB_CTX_KERNEL;
CPU_FILL(&pm->pm_active);
/*
/*
* Initialize the global tte list lock, which is more commonly
* known as the pmap pv global lock.
*/