From ea62ad4c3d385a6bba2068da947eb5846dec3cd2 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Wed, 16 Feb 2022 13:26:59 +0000 Subject: [PATCH] powerpc: Implement pv-tracking for unmanaged pages. Needed for drm. --- sys/arch/powerpc/conf/files.powerpc | 1 + sys/arch/powerpc/include/oea/pmap.h | 16 +++++-- sys/arch/powerpc/include/pmap.h | 2 + sys/arch/powerpc/oea/pmap.c | 65 +++++++++++++++++++++++------ sys/arch/powerpc/oea/pmap_kernel.c | 6 +++ 5 files changed, 75 insertions(+), 15 deletions(-) diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc index 98101c5a076c..b9dce1c84fd6 100644 --- a/sys/arch/powerpc/conf/files.powerpc +++ b/sys/arch/powerpc/conf/files.powerpc @@ -51,6 +51,7 @@ file arch/powerpc/oea/pmap64.c ppc_oea64 file arch/powerpc/oea/pmap64_bridge.c ppc_oea64_bridge file arch/powerpc/oea/pmap_kernel.c ppc_oea | ppc_oea64 | ppc_oea64_bridge | ppc_oea601 file arch/powerpc/powerpc/trap.c ppc_oea | ppc_oea64 | ppc_oea64_bridge | ppc_oea601 +file uvm/pmap/pmap_pvt.c ppc_oea | ppc_oea601 | ppc_oea64 # PPC BookE (MPC85xx) Family files file arch/powerpc/booke/booke_machdep.c ppc_booke diff --git a/sys/arch/powerpc/include/oea/pmap.h b/sys/arch/powerpc/include/oea/pmap.h index f482352dc058..be99efeb9f07 100644 --- a/sys/arch/powerpc/include/oea/pmap.h +++ b/sys/arch/powerpc/include/oea/pmap.h @@ -90,6 +90,7 @@ struct pmap_ops { void (*pmapop_protect)(pmap_t, vaddr_t, vaddr_t, vm_prot_t); void (*pmapop_unwire)(pmap_t, vaddr_t); void (*pmapop_page_protect)(struct vm_page *, vm_prot_t); + void (*pmapop_pv_protect)(paddr_t, vm_prot_t); bool (*pmapop_query_bit)(struct vm_page *, int); bool (*pmapop_clear_bit)(struct vm_page *, int); @@ -247,11 +248,20 @@ LIST_HEAD(pvo_head, pvo_entry); #define __HAVE_VM_PAGE_MD +struct pmap_page { + unsigned int pp_attrs; + struct pvo_head pp_pvoh; +#ifdef MODULAR + uintptr_t pp_dummy[3]; +#endif +}; + struct vm_page_md { - unsigned int mdpg_attrs; - struct pvo_head mdpg_pvoh; + struct pmap_page mdpg_pp; +#define mdpg_attrs mdpg_pp.pp_attrs +#define mdpg_pvoh mdpg_pp.pp_pvoh #ifdef MODULAR - uintptr_t mdpg_dummy[3]; +#define mdpg_dummy mdpg_pp.pp_dummy #endif }; diff --git a/sys/arch/powerpc/include/pmap.h b/sys/arch/powerpc/include/pmap.h index 3018c86a2b1b..2d580392b700 100644 --- a/sys/arch/powerpc/include/pmap.h +++ b/sys/arch/powerpc/include/pmap.h @@ -22,6 +22,8 @@ #endif /* !_MODULE */ +#include + #if !defined(_LOCORE) && (defined(MODULAR) || defined(_MODULE)) /* * Both BOOKE and OEA use __HAVE_VM_PAGE_MD but IBM4XX doesn't so define diff --git a/sys/arch/powerpc/oea/pmap.c b/sys/arch/powerpc/oea/pmap.c index 631557d170bd..48eaac48ec5a 100644 --- a/sys/arch/powerpc/oea/pmap.c +++ b/sys/arch/powerpc/oea/pmap.c @@ -214,6 +214,7 @@ STATIC bool pmap_extract(pmap_t, vaddr_t, paddr_t *); STATIC void pmap_protect(pmap_t, vaddr_t, vaddr_t, vm_prot_t); STATIC void pmap_unwire(pmap_t, vaddr_t); STATIC void pmap_page_protect(struct vm_page *, vm_prot_t); +STATIC void pmap_pv_protect(paddr_t, vm_prot_t); STATIC bool pmap_query_bit(struct vm_page *, int); STATIC bool pmap_clear_bit(struct vm_page *, int); @@ -645,12 +646,16 @@ pa_to_pvoh(paddr_t pa, struct vm_page **pg_p) { struct vm_page *pg; struct vm_page_md *md; + struct pmap_page *pp; pg = PHYS_TO_VM_PAGE(pa); if (pg_p != NULL) *pg_p = pg; - if (pg == NULL) + if (pg == NULL) { + if ((pp = pmap_pv_tracked(pa)) != NULL) + return &pp->pp_pvoh; return NULL; + } md = VM_PAGE_TO_MD(pg); return &md->mdpg_pvoh; } @@ -663,13 +668,26 @@ vm_page_to_pvoh(struct vm_page *pg) return &md->mdpg_pvoh; } +static inline void +pmap_pp_attr_clear(struct pmap_page *pp, int ptebit) +{ + + pp->pp_attrs &= ptebit; +} static inline void pmap_attr_clear(struct vm_page *pg, int ptebit) { struct vm_page_md * const md = VM_PAGE_TO_MD(pg); - md->mdpg_attrs &= ~ptebit; + pmap_pp_attr_clear(&md->mdpg_pp, ptebit); +} + +static inline int +pmap_pp_attr_fetch(struct pmap_page *pp) +{ + + return pp->pp_attrs; } static inline int @@ -677,7 +695,7 @@ pmap_attr_fetch(struct vm_page *pg) { struct vm_page_md * const md = VM_PAGE_TO_MD(pg); - return md->mdpg_attrs; + return pmap_pp_attr_fetch(&md->mdpg_pp); } static inline void @@ -2274,11 +2292,8 @@ pmap_unwire(pmap_t pm, vaddr_t va) PMAP_UNLOCK(); } -/* - * Lower the protection on the specified physical page. - */ -void -pmap_page_protect(struct vm_page *pg, vm_prot_t prot) +static void +pmap_pp_protect(struct pmap_page *pp, paddr_t pa, vm_prot_t prot) { struct pvo_head *pvo_head, pvol; struct pvo_entry *pvo, *next_pvo; @@ -2298,14 +2313,14 @@ pmap_page_protect(struct vm_page *pg, vm_prot_t prot) */ if ((prot & VM_PROT_READ) == 0) { DPRINTFN(EXEC, "[pmap_page_protect: %#" _PRIxpa ": clear-exec]\n", - VM_PAGE_TO_PHYS(pg)); - if (pmap_attr_fetch(pg) & PTE_EXEC) { + pa); + if (pmap_pp_attr_fetch(pp) & PTE_EXEC) { PMAPCOUNT(exec_uncached_page_protect); - pmap_attr_clear(pg, PTE_EXEC); + pmap_pp_attr_clear(pp, PTE_EXEC); } } - pvo_head = vm_page_to_pvoh(pg); + pvo_head = &pp->pp_pvoh; for (pvo = LIST_FIRST(pvo_head); pvo != NULL; pvo = next_pvo) { next_pvo = LIST_NEXT(pvo, pvo_vlink); PMAP_PVO_CHECK(pvo); /* sanity check */ @@ -2355,6 +2370,32 @@ pmap_page_protect(struct vm_page *pg, vm_prot_t prot) PMAP_UNLOCK(); } +/* + * Lower the protection on the specified physical page. + */ +void +pmap_page_protect(struct vm_page *pg, vm_prot_t prot) +{ + struct vm_page_md *md = VM_PAGE_TO_MD(pg); + + pmap_pp_protect(&md->mdpg_pp, VM_PAGE_TO_PHYS(pg), prot); +} + +/* + * Lower the protection on the physical page at the specified physical + * address, which may not be managed and so may not have a struct + * vm_page. + */ +void +pmap_pv_protect(paddr_t pa, vm_prot_t prot) +{ + struct pmap_page *pp; + + if ((pp = pmap_pv_tracked(pa)) == NULL) + return; + pmap_pp_protect(pp, pa, prot); +} + /* * Activate the address space for the specified process. If the process * is the current process, load the new MMU context. diff --git a/sys/arch/powerpc/oea/pmap_kernel.c b/sys/arch/powerpc/oea/pmap_kernel.c index bc119958a93f..e23811bdb63e 100644 --- a/sys/arch/powerpc/oea/pmap_kernel.c +++ b/sys/arch/powerpc/oea/pmap_kernel.c @@ -215,6 +215,12 @@ pmap_page_protect(struct vm_page *pg, vm_prot_t prot) (*pmapops->pmapop_page_protect)(pg, prot); } +void +pmap_pv_protect(paddr_t pa, vm_prot_t prot) +{ + (*pmapops->pmapop_pv_protect)(pa, prot); +} + bool pmap_query_bit(struct vm_page *pg, int ptebit) {