On Fri, May 24, 2019 at 11:28:11PM +0000, Konstantin Belousov wrote:
> Author: kib
> Date: Fri May 24 23:28:11 2019
> New Revision: 348258
> URL: https://svnweb.freebsd.org/changeset/base/348258
> 
> Log:
>   Fix too loose assert in pmap_large_unmap().
>   
>   The upper bound for the valid address from the large map used
>   LARGEMAP_MAX_ADDRESS instead of LARGEMAP_MIN_ADDRESS.  Provide a
>   function-like macro for proper upper value.

This commit was inadvertently merged with the next one, where the commit
message was supposed to be
'Make pmap_kextract() operational over the large map.'
Other metadata in the log is correct.  

I do not want to revert it for re-commit.
>   
>   Noted by:   markj
>   Reviewed by:        alc, markj
>   Sponsored by:       The FreeBSD Foundation
>   MFC after:  1 week
>   Differential revision:      https://reviews.freebsd.org/D20386
> 
> Modified:
>   head/sys/amd64/amd64/pmap.c
> 
> Modified: head/sys/amd64/amd64/pmap.c
> ==============================================================================
> --- head/sys/amd64/amd64/pmap.c       Fri May 24 23:26:17 2019        
> (r348257)
> +++ head/sys/amd64/amd64/pmap.c       Fri May 24 23:28:11 2019        
> (r348258)
> @@ -421,6 +421,8 @@ static int pmap_flags = PMAP_PDE_SUPERPAGE;       /* 
> flags f
>  
>  static vmem_t *large_vmem;
>  static u_int lm_ents;
> +#define      PMAP_LARGEMAP_MAX_ADDRESS()                     \
> +    (LARGEMAP_MIN_ADDRESS + NBPML4 * (u_long)lm_ents)
>  
>  int pmap_pcid_enabled = 1;
>  SYSCTL_INT(_vm_pmap, OID_AUTO, pcid_enabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
> @@ -1060,6 +1062,7 @@ static void pmap_invalidate_pde_page(pmap_t pmap, vm_o
>                   pd_entry_t pde);
>  static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode);
>  static vm_page_t pmap_large_map_getptp_unlocked(void);
> +static vm_paddr_t pmap_large_map_kextract(vm_offset_t va);
>  static void pmap_pde_attr(pd_entry_t *pde, int cache_bits, int mask);
>  #if VM_NRESERVLEVEL > 0
>  static void pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va,
> @@ -2961,6 +2964,9 @@ pmap_kextract(vm_offset_t va)
>  
>       if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) {
>               pa = DMAP_TO_PHYS(va);
> +     } else if (LARGEMAP_MIN_ADDRESS <= va &&
> +         va < PMAP_LARGEMAP_MAX_ADDRESS()) {
> +             pa = pmap_large_map_kextract(va);
>       } else {
>               pde = *vtopde(va);
>               if (pde & PG_PS) {
> @@ -8775,6 +8781,39 @@ retry:
>       return ((pt_entry_t *)PHYS_TO_DMAP(mphys) + pmap_pte_index(va));
>  }
>  
> +static vm_paddr_t
> +pmap_large_map_kextract(vm_offset_t va)
> +{
> +     pdp_entry_t *pdpe, pdp;
> +     pd_entry_t *pde, pd;
> +     pt_entry_t *pte, pt;
> +
> +     KASSERT(LARGEMAP_MIN_ADDRESS <= va && va < PMAP_LARGEMAP_MAX_ADDRESS(),
> +         ("not largemap range %#lx", (u_long)va));
> +     pdpe = pmap_large_map_pdpe(va);
> +     pdp = *pdpe;
> +     KASSERT((pdp & X86_PG_V) != 0,
> +         ("invalid pdp va %#lx pdpe %#lx pdp %#lx", va,
> +         (u_long)pdpe, pdp));
> +     if ((pdp & X86_PG_PS) != 0) {
> +             KASSERT((amd_feature & AMDID_PAGE1GB) != 0,
> +                 ("no 1G pages, va %#lx pdpe %#lx pdp %#lx", va,
> +                 (u_long)pdpe, pdp));
> +             return ((pdp & PG_PS_PDP_FRAME) | (va & PDPMASK));
> +     }
> +     pde = pmap_pdpe_to_pde(pdpe, va);
> +     pd = *pde;
> +     KASSERT((pd & X86_PG_V) != 0,
> +         ("invalid pd va %#lx pde %#lx pd %#lx", va, (u_long)pde, pd));
> +     if ((pd & X86_PG_PS) != 0)
> +             return ((pd & PG_PS_FRAME) | (va & PDRMASK));
> +     pte = pmap_pde_to_pte(pde, va);
> +     pt = *pte;
> +     KASSERT((pt & X86_PG_V) != 0,
> +         ("invalid pte va %#lx pte %#lx pt %#lx", va, (u_long)pte, pt));
> +     return ((pt & PG_FRAME) | (va & PAGE_MASK));
> +}
> +
>  static int
>  pmap_large_map_getva(vm_size_t len, vm_offset_t align, vm_offset_t phase,
>      vmem_addr_t *vmem_res)
> @@ -8891,8 +8930,8 @@ pmap_large_unmap(void *svaa, vm_size_t len)
>               return;
>  
>       SLIST_INIT(&spgf);
> -     KASSERT(LARGEMAP_MIN_ADDRESS <= sva && sva + len <=
> -         LARGEMAP_MAX_ADDRESS + NBPML4 * (u_long)lm_ents,
> +     KASSERT(LARGEMAP_MIN_ADDRESS <= sva &&
> +         sva + len <= PMAP_LARGEMAP_MAX_ADDRESS(),
>           ("not largemap range %#lx %#lx", (u_long)svaa, (u_long)svaa + len));
>       PMAP_LOCK(kernel_pmap);
>       for (va = sva; va < sva + len; va += inc) {
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to