Author: kib Date: Wed Oct 14 22:51:40 2020 New Revision: 366711 URL: https://svnweb.freebsd.org/changeset/base/366711
Log: Avoid dump_avail[] redefinition. Move dump_avail[] extern declaration and inlines into a new header vm/vm_dumpset.h. This fixes default gcc build for mips. Reviewed by: alc, scottph Tested by: kevans (previous version) Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D26741 Added: head/sys/vm/vm_dumpset.h (contents, props changed) Modified: head/sys/amd64/amd64/machdep.c head/sys/amd64/amd64/minidump_machdep.c head/sys/amd64/amd64/pmap.c head/sys/amd64/amd64/uma_machdep.c head/sys/arm/arm/mem.c head/sys/arm/arm/minidump_machdep.c head/sys/arm64/arm64/minidump_machdep.c head/sys/arm64/arm64/pmap.c head/sys/arm64/arm64/uma_machdep.c head/sys/i386/i386/machdep.c head/sys/i386/i386/minidump_machdep_base.c head/sys/kern/kern_dump.c head/sys/kern/subr_physmem.c head/sys/mips/atheros/ar531x/ar5315_machdep.c head/sys/mips/atheros/ar71xx_machdep.c head/sys/mips/beri/beri_machdep.c head/sys/mips/broadcom/bcm_machdep.c head/sys/mips/cavium/octeon_machdep.c head/sys/mips/ingenic/jz4780_machdep.c head/sys/mips/malta/malta_machdep.c head/sys/mips/mediatek/mtk_machdep.c head/sys/mips/mips/minidump_machdep.c head/sys/mips/mips/pmap.c head/sys/mips/mips/uma_machdep.c head/sys/mips/nlm/xlp_machdep.c head/sys/powerpc/aim/mmu_oea64.c head/sys/powerpc/aim/mmu_radix.c head/sys/powerpc/booke/pmap.c head/sys/powerpc/powerpc/minidump_machdep.c head/sys/powerpc/powerpc/uma_machdep.c head/sys/riscv/riscv/minidump_machdep.c head/sys/riscv/riscv/pmap.c head/sys/riscv/riscv/uma_machdep.c head/sys/vm/uma_core.c head/sys/vm/vm_page.c head/sys/vm/vm_page.h head/sys/vm/vm_phys.h head/sys/x86/x86/nexus.c Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/amd64/amd64/machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -95,14 +95,15 @@ __FBSDID("$FreeBSD$"); #include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/vm_extern.h> #include <vm/vm_kern.h> #include <vm/vm_page.h> #include <vm/vm_map.h> #include <vm/vm_object.h> #include <vm/vm_pager.h> -#include <vm/vm_param.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #ifdef DDB #ifndef KDB Modified: head/sys/amd64/amd64/minidump_machdep.c ============================================================================== --- head/sys/amd64/amd64/minidump_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/amd64/amd64/minidump_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <vm/pmap.h> #include <machine/atomic.h> #include <machine/elf.h> Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/amd64/amd64/pmap.c Wed Oct 14 22:51:40 2020 (r366711) @@ -149,6 +149,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_phys.h> #include <vm/vm_radix.h> #include <vm/vm_reserv.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <machine/intr_machdep.h> Modified: head/sys/amd64/amd64/uma_machdep.c ============================================================================== --- head/sys/amd64/amd64/uma_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/amd64/amd64/uma_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -36,12 +36,13 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_pageout.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <vm/uma_int.h> #include <machine/md_var.h> -#include <machine/vmparam.h> void * uma_small_alloc(uma_zone_t zone, vm_size_t bytes, int domain, u_int8_t *flags, Modified: head/sys/arm/arm/mem.c ============================================================================== --- head/sys/arm/arm/mem.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/arm/arm/mem.c Wed Oct 14 22:51:40 2020 (r366711) @@ -65,11 +65,11 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <vm/pmap.h> #include <vm/vm_extern.h> #include <machine/memdev.h> -#include <machine/vmparam.h> /* * Used in /dev/mem drivers and elsewhere Modified: head/sys/arm/arm/minidump_machdep.c ============================================================================== --- head/sys/arm/arm/minidump_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/arm/arm/minidump_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <vm/pmap.h> #include <machine/atomic.h> #include <machine/cpu.h> Modified: head/sys/arm64/arm64/minidump_machdep.c ============================================================================== --- head/sys/arm64/arm64/minidump_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/arm64/arm64/minidump_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <vm/pmap.h> #include <machine/md_var.h> Modified: head/sys/arm64/arm64/pmap.c ============================================================================== --- head/sys/arm64/arm64/pmap.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/arm64/arm64/pmap.c Wed Oct 14 22:51:40 2020 (r366711) @@ -143,6 +143,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_phys.h> #include <vm/vm_radix.h> #include <vm/vm_reserv.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <machine/machdep.h> Modified: head/sys/arm64/arm64/uma_machdep.c ============================================================================== --- head/sys/arm64/arm64/uma_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/arm64/arm64/uma_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -34,12 +34,13 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_pageout.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <vm/uma_int.h> #include <machine/md_var.h> -#include <machine/vmparam.h> void * uma_small_alloc(uma_zone_t zone, vm_size_t bytes, int domain, u_int8_t *flags, Modified: head/sys/i386/i386/machdep.c ============================================================================== --- head/sys/i386/i386/machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/i386/i386/machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -94,14 +94,15 @@ __FBSDID("$FreeBSD$"); #include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/vm_extern.h> #include <vm/vm_kern.h> #include <vm/vm_page.h> #include <vm/vm_map.h> #include <vm/vm_object.h> #include <vm/vm_pager.h> -#include <vm/vm_param.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #ifdef DDB #ifndef KDB Modified: head/sys/i386/i386/minidump_machdep_base.c ============================================================================== --- head/sys/i386/i386/minidump_machdep_base.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/i386/i386/minidump_machdep_base.c Wed Oct 14 22:51:40 2020 (r366711) @@ -43,11 +43,11 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <vm/pmap.h> #include <machine/atomic.h> #include <machine/elf.h> #include <machine/md_var.h> -#include <machine/vmparam.h> #include <machine/minidump.h> CTASSERT(sizeof(struct kerneldumpheader) == 512); Modified: head/sys/kern/kern_dump.c ============================================================================== --- head/sys/kern/kern_dump.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/kern/kern_dump.c Wed Oct 14 22:51:40 2020 (r366711) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <vm/pmap.h> #include <machine/dump.h> #include <machine/elf.h> Modified: head/sys/kern/subr_physmem.c ============================================================================== --- head/sys/kern/subr_physmem.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/kern/subr_physmem.c Wed Oct 14 22:51:40 2020 (r366711) @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <machine/md_var.h> /* Modified: head/sys/mips/atheros/ar531x/ar5315_machdep.c ============================================================================== --- head/sys/mips/atheros/ar531x/ar5315_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/mips/atheros/ar531x/ar5315_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <net/ethernet.h> Modified: head/sys/mips/atheros/ar71xx_machdep.c ============================================================================== --- head/sys/mips/atheros/ar71xx_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/mips/atheros/ar71xx_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <net/ethernet.h> Modified: head/sys/mips/beri/beri_machdep.c ============================================================================== --- head/sys/mips/beri/beri_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/mips/beri/beri_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <machine/bootinfo.h> #include <machine/clock.h> Modified: head/sys/mips/broadcom/bcm_machdep.c ============================================================================== --- head/sys/mips/broadcom/bcm_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/mips/broadcom/bcm_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <machine/cache.h> #include <machine/clock.h> Modified: head/sys/mips/cavium/octeon_machdep.c ============================================================================== --- head/sys/mips/cavium/octeon_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/mips/cavium/octeon_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <machine/atomic.h> #include <machine/cache.h> Modified: head/sys/mips/ingenic/jz4780_machdep.c ============================================================================== --- head/sys/mips/ingenic/jz4780_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/mips/ingenic/jz4780_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <net/ethernet.h> Modified: head/sys/mips/malta/malta_machdep.c ============================================================================== --- head/sys/mips/malta/malta_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/mips/malta/malta_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <machine/clock.h> #include <machine/cpu.h> Modified: head/sys/mips/mediatek/mtk_machdep.c ============================================================================== --- head/sys/mips/mediatek/mtk_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/mips/mediatek/mtk_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <machine/cache.h> #include <machine/clock.h> Modified: head/sys/mips/mips/minidump_machdep.c ============================================================================== --- head/sys/mips/mips/minidump_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/mips/mips/minidump_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -42,13 +42,14 @@ __FBSDID("$FreeBSD$"); #include <sys/watchdog.h> #include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/pmap.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <machine/atomic.h> #include <machine/elf.h> #include <machine/md_var.h> -#include <machine/vmparam.h> #include <machine/minidump.h> #include <machine/cache.h> Modified: head/sys/mips/mips/pmap.c ============================================================================== --- head/sys/mips/mips/pmap.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/mips/mips/pmap.c Wed Oct 14 22:51:40 2020 (r366711) @@ -95,6 +95,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <vm/vm_pageout.h> #include <vm/vm_pager.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <machine/cache.h> Modified: head/sys/mips/mips/uma_machdep.c ============================================================================== --- head/sys/mips/mips/uma_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/mips/mips/uma_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -36,12 +36,13 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_pageout.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <vm/uma_int.h> #include <machine/md_var.h> -#include <machine/vmparam.h> void * uma_small_alloc(uma_zone_t zone, vm_size_t bytes, int domain, u_int8_t *flags, Modified: head/sys/mips/nlm/xlp_machdep.c ============================================================================== --- head/sys/mips/nlm/xlp_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/mips/nlm/xlp_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <machine/cpu.h> #include <machine/cpufunc.h> Modified: head/sys/powerpc/aim/mmu_oea64.c ============================================================================== --- head/sys/powerpc/aim/mmu_oea64.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/powerpc/aim/mmu_oea64.c Wed Oct 14 22:51:40 2020 (r366711) @@ -82,6 +82,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_object.h> #include <vm/vm_extern.h> #include <vm/vm_pageout.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <machine/_inttypes.h> Modified: head/sys/powerpc/aim/mmu_radix.c ============================================================================== --- head/sys/powerpc/aim/mmu_radix.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/powerpc/aim/mmu_radix.c Wed Oct 14 22:51:40 2020 (r366711) @@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_pageout.h> #include <vm/vm_phys.h> #include <vm/vm_reserv.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <machine/_inttypes.h> Modified: head/sys/powerpc/booke/pmap.c ============================================================================== --- head/sys/powerpc/booke/pmap.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/powerpc/booke/pmap.c Wed Oct 14 22:51:40 2020 (r366711) @@ -99,16 +99,17 @@ __FBSDID("$FreeBSD$"); #include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_kern.h> #include <vm/vm_pageout.h> #include <vm/vm_extern.h> #include <vm/vm_object.h> -#include <vm/vm_param.h> #include <vm/vm_map.h> #include <vm/vm_pager.h> #include <vm/vm_phys.h> #include <vm/vm_pagequeue.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <machine/_inttypes.h> Modified: head/sys/powerpc/powerpc/minidump_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/minidump_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/powerpc/powerpc/minidump_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -38,6 +38,7 @@ #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <vm/pmap.h> #include <machine/atomic.h> Modified: head/sys/powerpc/powerpc/uma_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/uma_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/powerpc/powerpc/uma_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -36,15 +36,16 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_kern.h> #include <vm/vm_pageout.h> #include <vm/vm_extern.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <vm/uma.h> #include <vm/uma_int.h> #include <machine/md_var.h> -#include <machine/vmparam.h> static int hw_uma_mdpages; SYSCTL_INT(_hw, OID_AUTO, uma_mdpages, CTLFLAG_RD, &hw_uma_mdpages, 0, Modified: head/sys/riscv/riscv/minidump_machdep.c ============================================================================== --- head/sys/riscv/riscv/minidump_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/riscv/riscv/minidump_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <vm/pmap.h> #include <machine/atomic.h> Modified: head/sys/riscv/riscv/pmap.c ============================================================================== --- head/sys/riscv/riscv/pmap.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/riscv/riscv/pmap.c Wed Oct 14 22:51:40 2020 (r366711) @@ -152,6 +152,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_phys.h> #include <vm/vm_radix.h> #include <vm/vm_reserv.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <machine/machdep.h> Modified: head/sys/riscv/riscv/uma_machdep.c ============================================================================== --- head/sys/riscv/riscv/uma_machdep.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/riscv/riscv/uma_machdep.c Wed Oct 14 22:51:40 2020 (r366711) @@ -34,12 +34,13 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_pageout.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <vm/uma_int.h> #include <machine/md_var.h> -#include <machine/vmparam.h> void * uma_small_alloc(uma_zone_t zone, vm_size_t bytes, int domain, u_int8_t *flags, Modified: head/sys/vm/uma_core.c ============================================================================== --- head/sys/vm/uma_core.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/vm/uma_core.c Wed Oct 14 22:51:40 2020 (r366711) @@ -82,16 +82,17 @@ __FBSDID("$FreeBSD$"); #include <sys/vmmeter.h> #include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/vm_domainset.h> #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pageout.h> -#include <vm/vm_param.h> #include <vm/vm_phys.h> #include <vm/vm_pagequeue.h> #include <vm/vm_map.h> #include <vm/vm_kern.h> #include <vm/vm_extern.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <vm/uma_int.h> #include <vm/uma_dbg.h> Added: head/sys/vm/vm_dumpset.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/vm/vm_dumpset.h Wed Oct 14 22:51:40 2020 (r366711) @@ -0,0 +1,99 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2020, Scott Phillips <scot...@freebsd.org> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _SYS_DUMPSET_H_ +#define _SYS_DUMPSET_H_ + +#include <sys/_bitset.h> +#include <sys/bitset.h> + +extern struct bitset *vm_page_dump; +extern long vm_page_dump_pages; +extern vm_paddr_t dump_avail[PHYS_AVAIL_COUNT]; + +static inline void +dump_add_page(vm_paddr_t pa) +{ + vm_pindex_t adj; + int i; + + adj = 0; + for (i = 0; dump_avail[i + 1] != 0; i += 2) { + if (pa >= dump_avail[i] && pa < dump_avail[i + 1]) { + BIT_SET_ATOMIC(vm_page_dump_pages, + (pa >> PAGE_SHIFT) - (dump_avail[i] >> PAGE_SHIFT) + + adj, vm_page_dump); + return; + } + adj += howmany(dump_avail[i + 1], PAGE_SIZE) - + dump_avail[i] / PAGE_SIZE; + } +} + +static inline void +dump_drop_page(vm_paddr_t pa) +{ + vm_pindex_t adj; + int i; + + adj = 0; + for (i = 0; dump_avail[i + 1] != 0; i += 2) { + if (pa >= dump_avail[i] && pa < dump_avail[i + 1]) { + BIT_CLR_ATOMIC(vm_page_dump_pages, + (pa >> PAGE_SHIFT) - (dump_avail[i] >> PAGE_SHIFT) + + adj, vm_page_dump); + return; + } + adj += howmany(dump_avail[i + 1], PAGE_SIZE) - + dump_avail[i] / PAGE_SIZE; + } +} + +static inline vm_paddr_t +vm_page_dump_index_to_pa(int bit) +{ + int i, tot; + + for (i = 0; dump_avail[i + 1] != 0; i += 2) { + tot = howmany(dump_avail[i + 1], PAGE_SIZE) - + dump_avail[i] / PAGE_SIZE; + if (bit < tot) + return ((vm_paddr_t)bit * PAGE_SIZE + + (dump_avail[i] & ~PAGE_MASK)); + bit -= tot; + } + return ((vm_paddr_t)NULL); +} + +#define VM_PAGE_DUMP_FOREACH(pa) \ + for (vm_pindex_t __b = BIT_FFS(vm_page_dump_pages, vm_page_dump); \ + (pa) = vm_page_dump_index_to_pa(__b - 1), __b != 0; \ + __b = BIT_FFS_AT(vm_page_dump_pages, vm_page_dump, __b)) + +#endif /* _SYS_DUMPSET_H_ */ Modified: head/sys/vm/vm_page.c ============================================================================== --- head/sys/vm/vm_page.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/vm/vm_page.c Wed Oct 14 22:51:40 2020 (r366711) @@ -108,6 +108,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_radix.h> #include <vm/vm_reserv.h> #include <vm/vm_extern.h> +#include <vm/vm_dumpset.h> #include <vm/uma.h> #include <vm/uma_int.h> Modified: head/sys/vm/vm_page.h ============================================================================== --- head/sys/vm/vm_page.h Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/vm/vm_page.h Wed Oct 14 22:51:40 2020 (r366711) @@ -69,8 +69,6 @@ #ifndef _VM_PAGE_ #define _VM_PAGE_ -#include <sys/_bitset.h> -#include <sys/bitset.h> #include <vm/pmap.h> /* @@ -586,69 +584,6 @@ malloc2vm_flags(int malloc_flags) #define PS_ALL_DIRTY 0x1 #define PS_ALL_VALID 0x2 #define PS_NONE_BUSY 0x4 - -extern struct bitset *vm_page_dump; -extern long vm_page_dump_pages; -extern vm_paddr_t dump_avail[]; - -static inline void -dump_add_page(vm_paddr_t pa) -{ - vm_pindex_t adj; - int i; - - adj = 0; - for (i = 0; dump_avail[i + 1] != 0; i += 2) { - if (pa >= dump_avail[i] && pa < dump_avail[i + 1]) { - BIT_SET_ATOMIC(vm_page_dump_pages, - (pa >> PAGE_SHIFT) - (dump_avail[i] >> PAGE_SHIFT) + - adj, vm_page_dump); - return; - } - adj += howmany(dump_avail[i + 1], PAGE_SIZE) - - dump_avail[i] / PAGE_SIZE; - } -} - -static inline void -dump_drop_page(vm_paddr_t pa) -{ - vm_pindex_t adj; - int i; - - adj = 0; - for (i = 0; dump_avail[i + 1] != 0; i += 2) { - if (pa >= dump_avail[i] && pa < dump_avail[i + 1]) { - BIT_CLR_ATOMIC(vm_page_dump_pages, - (pa >> PAGE_SHIFT) - (dump_avail[i] >> PAGE_SHIFT) + - adj, vm_page_dump); - return; - } - adj += howmany(dump_avail[i + 1], PAGE_SIZE) - - dump_avail[i] / PAGE_SIZE; - } -} - -static inline vm_paddr_t -vm_page_dump_index_to_pa(int bit) -{ - int i, tot; - - for (i = 0; dump_avail[i + 1] != 0; i += 2) { - tot = howmany(dump_avail[i + 1], PAGE_SIZE) - - dump_avail[i] / PAGE_SIZE; - if (bit < tot) - return ((vm_paddr_t)bit * PAGE_SIZE + - (dump_avail[i] & ~PAGE_MASK)); - bit -= tot; - } - return ((vm_paddr_t)NULL); -} - -#define VM_PAGE_DUMP_FOREACH(pa) \ - for (vm_pindex_t __b = BIT_FFS(vm_page_dump_pages, vm_page_dump); \ - (pa) = vm_page_dump_index_to_pa(__b - 1), __b != 0; \ - __b = BIT_FFS_AT(vm_page_dump_pages, vm_page_dump, __b)) bool vm_page_busy_acquire(vm_page_t m, int allocflags); void vm_page_busy_downgrade(vm_page_t m); Modified: head/sys/vm/vm_phys.h ============================================================================== --- head/sys/vm/vm_phys.h Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/vm/vm_phys.h Wed Oct 14 22:51:40 2020 (r366711) @@ -47,7 +47,6 @@ #endif extern vm_paddr_t phys_avail[PHYS_AVAIL_COUNT]; -extern vm_paddr_t dump_avail[PHYS_AVAIL_COUNT]; /* Domains must be dense (non-sparse) and zero-based. */ struct mem_affinity { Modified: head/sys/x86/x86/nexus.c ============================================================================== --- head/sys/x86/x86/nexus.c Wed Oct 14 21:22:23 2020 (r366710) +++ head/sys/x86/x86/nexus.c Wed Oct 14 22:51:40 2020 (r366711) @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/vm_page.h> #include <vm/vm_phys.h> +#include <vm/vm_dumpset.h> #include <vm/pmap.h> #include <machine/metadata.h> _______________________________________________ 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"
