Date: Mon, 17 Jun 2019 15:11:04 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r349139 - in stable/12/sys: amd64/amd64 arm/arm arm/nvidia/drm2 compat/linuxkpi/common/src dev/drm2/ttm dev/ti dev/xen/gntdev i386/i386 mips/mips riscv/riscv vm Message-ID: <201906171511.x5HFB4E6046129@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Mon Jun 17 15:11:04 2019 New Revision: 349139 URL: https://svnweb.freebsd.org/changeset/base/349139 Log: MFC r348785: Replace uses of vm_page_unwire(m, PQ_NONE) with vm_page_unwire_noq(m). Modified: stable/12/sys/amd64/amd64/pmap.c stable/12/sys/arm/arm/pmap-v6.c stable/12/sys/arm/nvidia/drm2/tegra_bo.c stable/12/sys/compat/linuxkpi/common/src/linux_page.c stable/12/sys/dev/drm2/ttm/ttm_page_alloc.c stable/12/sys/dev/ti/if_ti.c stable/12/sys/dev/xen/gntdev/gntdev.c stable/12/sys/i386/i386/pmap.c stable/12/sys/mips/mips/pmap.c stable/12/sys/riscv/riscv/pmap.c stable/12/sys/vm/uma_core.c stable/12/sys/vm/vm_glue.c stable/12/sys/vm/vm_kern.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/amd64/amd64/pmap.c ============================================================================== --- stable/12/sys/amd64/amd64/pmap.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/amd64/amd64/pmap.c Mon Jun 17 15:11:04 2019 (r349139) @@ -3705,7 +3705,7 @@ free_pv_chunk(struct pv_chunk *pc) /* entire chunk is free, return it */ m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); dump_drop_page(m->phys_addr); - vm_page_unwire(m, PQ_NONE); + vm_page_unwire_noq(m); vm_page_free(m); } Modified: stable/12/sys/arm/arm/pmap-v6.c ============================================================================== --- stable/12/sys/arm/arm/pmap-v6.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/arm/arm/pmap-v6.c Mon Jun 17 15:11:04 2019 (r349139) @@ -2973,7 +2973,7 @@ free_pv_chunk(struct pv_chunk *pc) /* entire chunk is free, return it */ m = PHYS_TO_VM_PAGE(pmap_kextract((vm_offset_t)pc)); pmap_qremove((vm_offset_t)pc, 1); - vm_page_unwire(m, PQ_NONE); + vm_page_unwire_noq(m); vm_page_free(m); pmap_pte2list_free(&pv_vafree, (vm_offset_t)pc); } Modified: stable/12/sys/arm/nvidia/drm2/tegra_bo.c ============================================================================== --- stable/12/sys/arm/nvidia/drm2/tegra_bo.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/arm/nvidia/drm2/tegra_bo.c Mon Jun 17 15:11:04 2019 (r349139) @@ -67,7 +67,7 @@ tegra_bo_destruct(struct tegra_bo *bo) cdev_pager_free_page(bo->cdev_pager, m); vm_page_lock(m); m->flags &= ~PG_FICTITIOUS; - vm_page_unwire(m, PQ_NONE); + vm_page_unwire_noq(m); vm_page_free(m); vm_page_unlock(m); } Modified: stable/12/sys/compat/linuxkpi/common/src/linux_page.c ============================================================================== --- stable/12/sys/compat/linuxkpi/common/src/linux_page.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/compat/linuxkpi/common/src/linux_page.c Mon Jun 17 15:11:04 2019 (r349139) @@ -317,7 +317,7 @@ linux_shmem_read_mapping_page_gfp(vm_object_t obj, int rv = vm_pager_get_pages(obj, &page, 1, NULL, NULL); if (rv != VM_PAGER_OK) { vm_page_lock(page); - vm_page_unwire(page, PQ_NONE); + vm_page_unwire_noq(page); vm_page_free(page); vm_page_unlock(page); VM_OBJECT_WUNLOCK(obj); Modified: stable/12/sys/dev/drm2/ttm/ttm_page_alloc.c ============================================================================== --- stable/12/sys/dev/drm2/ttm/ttm_page_alloc.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/dev/drm2/ttm/ttm_page_alloc.c Mon Jun 17 15:11:04 2019 (r349139) @@ -136,7 +136,7 @@ ttm_vm_page_free(vm_page_t m) KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("ttm got unmanaged %p", m)); m->flags &= ~PG_FICTITIOUS; m->oflags |= VPO_UNMANAGED; - vm_page_unwire(m, PQ_NONE); + vm_page_unwire_noq(m); vm_page_free(m); } Modified: stable/12/sys/dev/ti/if_ti.c ============================================================================== --- stable/12/sys/dev/ti/if_ti.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/dev/ti/if_ti.c Mon Jun 17 15:11:04 2019 (r349139) @@ -1623,7 +1623,7 @@ ti_newbuf_jumbo(struct ti_softc *sc, int idx, struct m } sf[i] = sf_buf_alloc(frame, SFB_NOWAIT); if (sf[i] == NULL) { - vm_page_unwire(frame, PQ_NONE); + vm_page_unwire_noq(frame); vm_page_free(frame); device_printf(sc->ti_dev, "buffer allocation " "failed -- packet dropped!\n"); Modified: stable/12/sys/dev/xen/gntdev/gntdev.c ============================================================================== --- stable/12/sys/dev/xen/gntdev/gntdev.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/dev/xen/gntdev/gntdev.c Mon Jun 17 15:11:04 2019 (r349139) @@ -278,7 +278,7 @@ gref_list_dtor(struct cleanup_data_struct *cleanup_dat continue; gnttab_free_grant_reference(gref->gref_id); } - vm_page_unwire(gref->page, PQ_NONE); + vm_page_unwire_noq(gref->page); vm_page_free(gref->page); gref->page = NULL; } Modified: stable/12/sys/i386/i386/pmap.c ============================================================================== --- stable/12/sys/i386/i386/pmap.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/i386/i386/pmap.c Mon Jun 17 15:11:04 2019 (r349139) @@ -2542,7 +2542,7 @@ free_pv_chunk(struct pv_chunk *pc) /* entire chunk is free, return it */ m = PHYS_TO_VM_PAGE(pmap_kextract((vm_offset_t)pc)); pmap_qremove((vm_offset_t)pc, 1); - vm_page_unwire(m, PQ_NONE); + vm_page_unwire_noq(m); vm_page_free(m); pmap_ptelist_free(&pv_vafree, (vm_offset_t)pc); } Modified: stable/12/sys/mips/mips/pmap.c ============================================================================== --- stable/12/sys/mips/mips/pmap.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/mips/mips/pmap.c Mon Jun 17 15:11:04 2019 (r349139) @@ -1553,7 +1553,7 @@ free_pv_chunk(struct pv_chunk *pc) /* entire chunk is free, return it */ m = PHYS_TO_VM_PAGE(MIPS_DIRECT_TO_PHYS((vm_offset_t)pc)); dump_drop_page(m->phys_addr); - vm_page_unwire(m, PQ_NONE); + vm_page_unwire_noq(m); vm_page_free(m); } Modified: stable/12/sys/riscv/riscv/pmap.c ============================================================================== --- stable/12/sys/riscv/riscv/pmap.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/riscv/riscv/pmap.c Mon Jun 17 15:11:04 2019 (r349139) @@ -1647,7 +1647,7 @@ free_pv_chunk(struct pv_chunk *pc) #if 0 /* TODO: For minidump */ dump_drop_page(m->phys_addr); #endif - vm_page_unwire(m, PQ_NONE); + vm_page_unwire_noq(m); vm_page_free(m); } Modified: stable/12/sys/vm/uma_core.c ============================================================================== --- stable/12/sys/vm/uma_core.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/vm/uma_core.c Mon Jun 17 15:11:04 2019 (r349139) @@ -1282,9 +1282,9 @@ pcpu_page_alloc(uma_zone_t zone, vm_size_t bytes, int zkva += PAGE_SIZE; } return ((void*)addr); - fail: +fail: TAILQ_FOREACH_SAFE(p, &alloctail, listq, p_next) { - vm_page_unwire(p, PQ_NONE); + vm_page_unwire_noq(p); vm_page_free(p); } return (NULL); @@ -1334,7 +1334,7 @@ noobj_alloc(uma_zone_t zone, vm_size_t bytes, int doma * exit. */ TAILQ_FOREACH_SAFE(p, &alloctail, listq, p_next) { - vm_page_unwire(p, PQ_NONE); + vm_page_unwire_noq(p); vm_page_free(p); } return (NULL); @@ -1395,7 +1395,7 @@ pcpu_page_free(void *mem, vm_size_t size, uint8_t flag for (curva = sva; curva < sva + size; curva += PAGE_SIZE) { paddr = pmap_kextract(curva); m = PHYS_TO_VM_PAGE(paddr); - vm_page_unwire(m, PQ_NONE); + vm_page_unwire_noq(m); vm_page_free(m); } pmap_qremove(sva, size >> PAGE_SHIFT); Modified: stable/12/sys/vm/vm_glue.c ============================================================================== --- stable/12/sys/vm/vm_glue.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/vm/vm_glue.c Mon Jun 17 15:11:04 2019 (r349139) @@ -421,7 +421,7 @@ vm_thread_stack_dispose(vm_object_t ksobj, vm_offset_t if (m == NULL) panic("vm_thread_dispose: kstack already missing?"); vm_page_lock(m); - vm_page_unwire(m, PQ_NONE); + vm_page_unwire_noq(m); vm_page_free(m); vm_page_unlock(m); } Modified: stable/12/sys/vm/vm_kern.c ============================================================================== --- stable/12/sys/vm/vm_kern.c Mon Jun 17 15:09:12 2019 (r349138) +++ stable/12/sys/vm/vm_kern.c Mon Jun 17 15:11:04 2019 (r349139) @@ -586,7 +586,7 @@ _kmem_unback(vm_object_t object, vm_offset_t addr, vm_ #endif for (; offset < end; offset += PAGE_SIZE, m = next) { next = vm_page_next(m); - vm_page_unwire(m, PQ_NONE); + vm_page_unwire_noq(m); vm_page_free(m); } VM_OBJECT_WUNLOCK(object);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906171511.x5HFB4E6046129>