Page MenuHomeFreeBSD
Files F136600493

D22341.id64263.diff
No OneTemporary
Actions

D22341.id64263.diff
View Options

Index: sys/powerpc/aim/mmu_oea64.h
===================================================================
--- sys/powerpc/aim/mmu_oea64.h
+++ sys/powerpc/aim/mmu_oea64.h
@@ -76,6 +76,13 @@
void moea64_late_bootstrap(mmu_t mmup, vm_offset_t kernelstart,
vm_offset_t kernelend);
+static inline uint64_t
+moea64_pte_vpn_from_pvo_vpn(const struct pvo_entry *pvo)
+{
+ return ((pvo->pvo_vpn >> (ADDR_API_SHFT64 - ADDR_PIDX_SHFT)) &
+ LPTE_AVPN_MASK);
+}
+
/*
* Statistics
*/
Index: sys/powerpc/aim/mmu_oea64.c
===================================================================
--- sys/powerpc/aim/mmu_oea64.c
+++ sys/powerpc/aim/mmu_oea64.c
@@ -435,8 +435,7 @@
moea64_pte_from_pvo(const struct pvo_entry *pvo, struct lpte *lpte)
{
- lpte->pte_hi = (pvo->pvo_vpn >> (ADDR_API_SHFT64 - ADDR_PIDX_SHFT)) &
- LPTE_AVPN_MASK;
+ lpte->pte_hi = moea64_pte_vpn_from_pvo_vpn(pvo);
lpte->pte_hi |= LPTE_VALID;
if (pvo->pvo_vaddr & PVO_LARGE)
Index: sys/powerpc/aim/moea64_native.c
===================================================================
--- sys/powerpc/aim/moea64_native.c
+++ sys/powerpc/aim/moea64_native.c
@@ -257,16 +257,14 @@
moea64_pte_synch_native(mmu_t mmu, struct pvo_entry *pvo)
{
volatile struct lpte *pt = moea64_pteg_table + pvo->pvo_pte.slot;
- struct lpte properpt;
- uint64_t ptelo;
+ uint64_t ptelo, pvo_ptevpn;
PMAP_LOCK_ASSERT(pvo->pvo_pmap, MA_OWNED);
- moea64_pte_from_pvo(pvo, &properpt);
+ pvo_ptevpn = moea64_pte_vpn_from_pvo_vpn(pvo);
rw_rlock(&moea64_eviction_lock);
- if ((be64toh(pt->pte_hi) & LPTE_AVPN_MASK) !=
- (properpt.pte_hi & LPTE_AVPN_MASK)) {
+ if ((be64toh(pt->pte_hi) & LPTE_AVPN_MASK) != pvo_ptevpn) {
/* Evicted */
rw_runlock(&moea64_eviction_lock);
return (-1);
@@ -330,14 +328,12 @@
moea64_pte_unset_native(mmu_t mmu, struct pvo_entry *pvo)
{
volatile struct lpte *pt = moea64_pteg_table + pvo->pvo_pte.slot;
- struct lpte properpt;
- uint64_t ptelo;
+ uint64_t ptelo, pvo_ptevpn;
- moea64_pte_from_pvo(pvo, &properpt);
+ pvo_ptevpn = moea64_pte_vpn_from_pvo_vpn(pvo);
rw_rlock(&moea64_eviction_lock);
- if ((be64toh(pt->pte_hi & LPTE_AVPN_MASK)) !=
- (properpt.pte_hi & LPTE_AVPN_MASK)) {
+ if ((be64toh(pt->pte_hi & LPTE_AVPN_MASK)) != pvo_ptevpn) {
/* Evicted */
STAT_MOEA64(moea64_pte_overflow--);
rw_runlock(&moea64_eviction_lock);

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 19, 1:04 PM (13 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25634544
Default Alt Text
D22341.id64263.diff (2 KB)

Event Timeline