Date: Fri, 31 Dec 2021 03:58:07 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: fe532f1a5017 - main - libkvm: Remove mips support Message-ID: <202112310358.1BV3w7CH099247@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe532f1a50172b67781c1838948eceb45caf91d2 commit fe532f1a50172b67781c1838948eceb45caf91d2 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2021-12-30 23:45:17 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-12-31 03:57:24 +0000 libkvm: Remove mips support libkvm references files in sys/mips, so remove it ahead of removing sys/mips. Sponsored by: Netflix --- lib/libkvm/Makefile | 1 - lib/libkvm/kvm_minidump_mips.c | 372 ----------------------------------------- lib/libkvm/kvm_mips.h | 117 ------------- 3 files changed, 490 deletions(-) diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile index 7747518d05eb..7ebca5556ef6 100644 --- a/lib/libkvm/Makefile +++ b/lib/libkvm/Makefile @@ -14,7 +14,6 @@ SRCS= kvm.c kvm_cptime.c kvm_getloadavg.c \ kvm_amd64.c kvm_minidump_amd64.c \ kvm_arm.c kvm_minidump_arm.c \ kvm_i386.c kvm_minidump_i386.c \ - kvm_minidump_mips.c \ kvm_powerpc.c kvm_powerpc64.c \ kvm_minidump_riscv.c \ kvm_minidump_powerpc64.c kvm_minidump_powerpc64_hpt.c diff --git a/lib/libkvm/kvm_minidump_mips.c b/lib/libkvm/kvm_minidump_mips.c deleted file mode 100644 index dda6f3551872..000000000000 --- a/lib/libkvm/kvm_minidump_mips.c +++ /dev/null @@ -1,372 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2010 Oleksandr Tymoshenko - * Copyright (c) 2008 Semihalf, Grzegorz Bernacki - * Copyright (c) 2006 Peter Wemm - * - * 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, 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. - * - * From: FreeBSD: src/lib/libkvm/kvm_minidump_arm.c r214223 - */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -/* - * MIPS machine dependent routines for kvm and minidumps. - */ - -#include <sys/param.h> -#include <vm/vm.h> -#include <kvm.h> -#include <limits.h> -#include <stdint.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#include "../../sys/mips/include/cca.h" -#define _KVM_MINIDUMP -#include "../../sys/mips/include/cpuregs.h" -#include "../../sys/mips/include/minidump.h" - -#include "kvm_private.h" -#include "kvm_mips.h" - -#define mips_round_page(x) roundup2((kvaddr_t)(x), MIPS_PAGE_SIZE) - -struct vmstate { - struct minidumphdr hdr; - int pte_size; -}; - -static int -_mips_minidump_probe(kvm_t *kd) -{ - - if (kd->nlehdr.e_ident[EI_CLASS] != ELFCLASS32 && - kd->nlehdr.e_ident[EI_CLASS] != ELFCLASS64) - return (0); - if (kd->nlehdr.e_machine != EM_MIPS) - return (0); - return (_kvm_is_minidump(kd)); -} - -static void -_mips_minidump_freevtop(kvm_t *kd) -{ - struct vmstate *vm = kd->vmst; - - free(vm); - kd->vmst = NULL; -} - -static int -_mips_minidump_initvtop(kvm_t *kd) -{ - struct vmstate *vmst; - off_t off, dump_avail_off, sparse_off; - - vmst = _kvm_malloc(kd, sizeof(*vmst)); - if (vmst == NULL) { - _kvm_err(kd, kd->program, "cannot allocate vm"); - return (-1); - } - - kd->vmst = vmst; - - if (kd->nlehdr.e_ident[EI_CLASS] == ELFCLASS64 || - kd->nlehdr.e_flags & EF_MIPS_ABI2) - vmst->pte_size = 64; - else - vmst->pte_size = 32; - - if (pread(kd->pmfd, &vmst->hdr, - sizeof(vmst->hdr), 0) != sizeof(vmst->hdr)) { - _kvm_err(kd, kd->program, "cannot read dump header"); - return (-1); - } - - if (strncmp(MINIDUMP_MAGIC, vmst->hdr.magic, - sizeof(vmst->hdr.magic)) != 0) { - _kvm_err(kd, kd->program, "not a minidump for this platform"); - return (-1); - } - vmst->hdr.version = _kvm32toh(kd, vmst->hdr.version); - if (vmst->hdr.version != MINIDUMP_VERSION && vmst->hdr.version != 1) { - _kvm_err(kd, kd->program, "wrong minidump version. " - "Expected %d got %d", MINIDUMP_VERSION, vmst->hdr.version); - return (-1); - } - vmst->hdr.msgbufsize = _kvm32toh(kd, vmst->hdr.msgbufsize); - vmst->hdr.bitmapsize = _kvm32toh(kd, vmst->hdr.bitmapsize); - vmst->hdr.ptesize = _kvm32toh(kd, vmst->hdr.ptesize); - vmst->hdr.kernbase = _kvm64toh(kd, vmst->hdr.kernbase); - vmst->hdr.dmapbase = _kvm64toh(kd, vmst->hdr.dmapbase); - vmst->hdr.dmapend = _kvm64toh(kd, vmst->hdr.dmapend); - vmst->hdr.dumpavailsize = vmst->hdr.version == MINIDUMP_VERSION ? - _kvm32toh(kd, vmst->hdr.dumpavailsize) : 0; - - /* Skip header and msgbuf */ - dump_avail_off = MIPS_PAGE_SIZE + mips_round_page(vmst->hdr.msgbufsize); - - /* Skip dump_avail */ - off = dump_avail_off + mips_round_page(vmst->hdr.dumpavailsize); - - sparse_off = off + mips_round_page(vmst->hdr.bitmapsize) + - mips_round_page(vmst->hdr.ptesize); - if (_kvm_pt_init(kd, vmst->hdr.dumpavailsize, dump_avail_off, - vmst->hdr.bitmapsize, off, sparse_off, MIPS_PAGE_SIZE) == -1) { - return (-1); - } - off += mips_round_page(vmst->hdr.bitmapsize); - - if (_kvm_pmap_init(kd, vmst->hdr.ptesize, off) == -1) { - return (-1); - } - off += mips_round_page(vmst->hdr.ptesize); - - return (0); -} - -static int -_mips_minidump_kvatop(kvm_t *kd, kvaddr_t va, off_t *pa) -{ - struct vmstate *vm; - mips_physaddr_t offset, a; - kvaddr_t pteindex; - u_long valid; - off_t ofs; - mips32_pte_t pte32; - mips64_pte_t pte64; - - if (ISALIVE(kd)) { - _kvm_err(kd, 0, "_mips_minidump_kvatop called in live kernel!"); - return (0); - } - - offset = va & MIPS_PAGE_MASK; - /* Operate with page-aligned address */ - va &= ~MIPS_PAGE_MASK; - - vm = kd->vmst; - if (kd->nlehdr.e_ident[EI_CLASS] == ELFCLASS64) { - if (va >= MIPS_XKPHYS_START && va < MIPS_XKPHYS_END) { - a = va & MIPS_XKPHYS_PHYS_MASK; - goto found; - } - if (va >= MIPS64_KSEG0_START && va < MIPS64_KSEG0_END) { - a = va & MIPS_KSEG0_PHYS_MASK; - goto found; - } - if (va >= MIPS64_KSEG1_START && va < MIPS64_KSEG1_END) { - a = va & MIPS_KSEG0_PHYS_MASK; - goto found; - } - } else { - if (va >= MIPS32_KSEG0_START && va < MIPS32_KSEG0_END) { - a = va & MIPS_KSEG0_PHYS_MASK; - goto found; - } - if (va >= MIPS32_KSEG1_START && va < MIPS32_KSEG1_END) { - a = va & MIPS_KSEG0_PHYS_MASK; - goto found; - } - } - if (va >= vm->hdr.kernbase) { - pteindex = (va - vm->hdr.kernbase) >> MIPS_PAGE_SHIFT; - if (vm->pte_size == 64) { - valid = pteindex < vm->hdr.ptesize / sizeof(pte64); - if (pteindex >= vm->hdr.ptesize / sizeof(pte64)) - goto invalid; - pte64 = _mips64_pte_get(kd, pteindex); - valid = pte64 & MIPS_PTE_V; - if (valid) - a = MIPS64_PTE_TO_PA(pte64); - } else { - if (pteindex >= vm->hdr.ptesize / sizeof(pte32)) - goto invalid; - pte32 = _mips32_pte_get(kd, pteindex); - valid = pte32 & MIPS_PTE_V; - if (valid) - a = MIPS32_PTE_TO_PA(pte32); - } - if (!valid) { - _kvm_err(kd, kd->program, "_mips_minidump_kvatop: pte " - "not valid"); - goto invalid; - } - } else { - _kvm_err(kd, kd->program, "_mips_minidump_kvatop: virtual " - "address 0x%jx not minidumped", (uintmax_t)va); - return (0); - } - -found: - ofs = _kvm_pt_find(kd, a, MIPS_PAGE_SIZE); - if (ofs == -1) { - _kvm_err(kd, kd->program, "_mips_minidump_kvatop: physical " - "address 0x%jx not in minidump", (uintmax_t)a); - goto invalid; - } - - *pa = ofs + offset; - return (MIPS_PAGE_SIZE - offset); - - -invalid: - _kvm_err(kd, 0, "invalid address (0x%jx)", (uintmax_t)va); - return (0); -} - -static int -#ifdef __mips__ -_mips_native(kvm_t *kd) -#else -_mips_native(kvm_t *kd __unused) -#endif -{ - -#ifdef __mips__ -#ifdef __mips_n64 - if (kd->nlehdr.e_ident[EI_CLASS] != ELFCLASS64) - return (0); -#else - if (kd->nlehdr.e_ident[EI_CLASS] != ELFCLASS32) - return (0); -#ifdef __mips_n32 - if (!(kd->nlehdr.e_flags & EF_MIPS_ABI2)) - return (0); -#else - if (kd->nlehdr.e_flags & EF_MIPS_ABI2) - return (0); -#endif -#endif -#if _BYTE_ORDER == _LITTLE_ENDIAN - return (kd->nlehdr.e_ident[EI_DATA] == ELFDATA2LSB); -#else - return (kd->nlehdr.e_ident[EI_DATA] == ELFDATA2MSB); -#endif -#else - return (0); -#endif -} - -struct mips_iter { - kvm_t *kd; - u_long nptes; - u_long pteindex; -}; - -static void -_mips_iterator_init(struct mips_iter *it, kvm_t *kd) -{ - struct vmstate *vm = kd->vmst; - - it->kd = kd; - it->pteindex = 0; - if (vm->pte_size == 64) - it->nptes = vm->hdr.ptesize / sizeof(mips64_pte_t); - else - it->nptes = vm->hdr.ptesize / sizeof(mips32_pte_t); - return; -} - -static int -_mips_iterator_next(struct mips_iter *it, u_long *pa, u_long *va, u_long *dva, - vm_prot_t *prot) -{ - struct vmstate *vm = it->kd->vmst; - int found = 0; - mips64_pte_t pte64; - mips32_pte_t pte32; - - /* - * mips/mips/pmap.c: init_pte_prot / pmap_protect indicate that all - * pages are R|X at least. - */ - *prot = VM_PROT_READ | VM_PROT_EXECUTE; - *pa = 0; - *va = 0; - *dva = 0; - for (;it->pteindex < it->nptes && found == 0; it->pteindex++) { - if (vm->pte_size == 64) { - pte64 = _mips64_pte_get(it->kd, it->pteindex); - if ((pte64 & MIPS_PTE_V) == 0) - continue; - if ((pte64 & MIPS64_PTE_RO) == 0) - *prot |= VM_PROT_WRITE; - *pa = MIPS64_PTE_TO_PA(pte64); - } else { - pte32 = _mips32_pte_get(it->kd, it->pteindex); - if ((pte32 & MIPS_PTE_V) == 0) - continue; - if ((pte32 & MIPS32_PTE_RO) == 0) - *prot |= VM_PROT_WRITE; - *pa = MIPS32_PTE_TO_PA(pte32); - } - *va = vm->hdr.kernbase + (it->pteindex << MIPS_PAGE_SHIFT); - found = 1; - /* advance pteindex regardless */ - } - - return found; -} - -static int -_mips_minidump_walk_pages(kvm_t *kd, kvm_walk_pages_cb_t *cb, void *arg) -{ - struct mips_iter it; - u_long dva, pa, va; - vm_prot_t prot; - - /* Generate direct mapped entries; need page entries for prot etc? */ - if (kd->nlehdr.e_ident[EI_CLASS] == ELFCLASS64) { - /* MIPS_XKPHYS_START..MIPS_XKPHYS_END */ - /* MIPS64_KSEG0_START..MIPS64_KSEG0_END */ - /* MIPS64_KSEG1_START..MIPS64_KSEG1_START */ - } else { - /* MIPS32_KSEG0_START..MIPS32_KSEG0_END */ - /* MIPS32_KSEG1_START..MIPS32_KSEG1_END */ - } - - _mips_iterator_init(&it, kd); - while (_mips_iterator_next(&it, &pa, &va, &dva, &prot)) { - if (!_kvm_visit_cb(kd, cb, arg, pa, va, dva, - prot, MIPS_PAGE_SIZE, 0)) { - return (0); - } - } - return (1); -} - -static struct kvm_arch kvm_mips_minidump = { - .ka_probe = _mips_minidump_probe, - .ka_initvtop = _mips_minidump_initvtop, - .ka_freevtop = _mips_minidump_freevtop, - .ka_kvatop = _mips_minidump_kvatop, - .ka_native = _mips_native, - .ka_walk_pages = _mips_minidump_walk_pages, -}; - -KVM_ARCH(kvm_mips_minidump); diff --git a/lib/libkvm/kvm_mips.h b/lib/libkvm/kvm_mips.h deleted file mode 100644 index 9efe5b8e9093..000000000000 --- a/lib/libkvm/kvm_mips.h +++ /dev/null @@ -1,117 +0,0 @@ -/*- - * Copyright (c) 2015 John H. Baldwin <jhb@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, 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 __KVM_MIPS_H__ -#define __KVM_MIPS_H__ - -#ifdef __mips__ -#include <machine/pte.h> -#endif - -typedef uint64_t mips_physaddr_t; - -typedef uint32_t mips32_pte_t; -typedef uint64_t mips64_pte_t; - -#define MIPS_PAGE_SHIFT 12 -#define MIPS_PAGE_SIZE (1 << MIPS_PAGE_SHIFT) -#define MIPS_PAGE_MASK (MIPS_PAGE_SIZE - 1) - -#define MIPS32_KSEG0_START 0x80000000 -#define MIPS32_KSEG0_END 0x9fffffff -#define MIPS32_KSEG1_START 0xa0000000 -#define MIPS32_KSEG1_END 0xbfffffff -#define MIPS64_KSEG0_START 0xffffffff80000000 -#define MIPS64_KSEG0_END 0xffffffff9fffffff -#define MIPS64_KSEG1_START 0xffffffffa0000000 -#define MIPS64_KSEG1_END 0xffffffffbfffffff - -#define MIPS32_PFN_MASK (0x1FFFFFC0) -#define MIPS64_PFN_MASK 0x3FFFFFFC0 -#define MIPS_PFN_SHIFT (6) - -#define MIPS_PFN_TO_PA(pfn) (((pfn) >> MIPS_PFN_SHIFT) << MIPS_PAGE_SHIFT) -#define MIPS32_PTE_TO_PFN(pte) ((pte) & MIPS32_PFN_MASK) -#define MIPS32_PTE_TO_PA(pte) (MIPS_PFN_TO_PA(MIPS32_PTE_TO_PFN((pte)))) -#define MIPS64_PTE_TO_PFN(pte) ((pte) & MIPS64_PFN_MASK) -#define MIPS64_PTE_TO_PA(pte) (MIPS_PFN_TO_PA(MIPS64_PTE_TO_PFN((pte)))) - -#define MIPS32_SWBITS_SHIFT 29 -#define MIPS64_SWBITS_SHIFT 55 -#define MIPS_PTE_V 0x02 -#define MIPS32_PTE_RO ((mips32_pte_t)0x01 << MIPS32_SWBITS_SHIFT) -#define MIPS64_PTE_RO ((mips64_pte_t)0x01 << MIPS64_SWBITS_SHIFT) - -static inline mips32_pte_t -_mips32_pte_get(kvm_t *kd, u_long pteindex) -{ - mips32_pte_t *pte = _kvm_pmap_get(kd, pteindex, sizeof(*pte)); - - return _kvm32toh(kd, *pte); -} - -static inline mips64_pte_t -_mips64_pte_get(kvm_t *kd, u_long pteindex) -{ - mips64_pte_t *pte = _kvm_pmap_get(kd, pteindex, sizeof(*pte)); - - return _kvm64toh(kd, *pte); -} - -#ifdef __mips__ -_Static_assert(PAGE_SHIFT == MIPS_PAGE_SHIFT, "PAGE_SHIFT mismatch"); -_Static_assert(PAGE_SIZE == MIPS_PAGE_SIZE, "PAGE_SIZE mismatch"); -_Static_assert(PAGE_MASK == MIPS_PAGE_MASK, "PAGE_MASK mismatch"); -#ifdef __mips_n64 -_Static_assert((uint64_t)MIPS_KSEG0_START == MIPS64_KSEG0_START, - "MIPS_KSEG0_START mismatch"); -_Static_assert((uint64_t)MIPS_KSEG0_END == MIPS64_KSEG0_END, - "MIPS_KSEG0_END mismatch"); -_Static_assert((uint64_t)MIPS_KSEG1_START == MIPS64_KSEG1_START, - "MIPS_KSEG1_START mismatch"); -_Static_assert((uint64_t)MIPS_KSEG1_END == MIPS64_KSEG1_END, - "MIPS_KSEG1_END mismatch"); -#else -_Static_assert((uint32_t)MIPS_KSEG0_START == MIPS32_KSEG0_START, - "MIPS_KSEG0_START mismatch"); -_Static_assert((uint32_t)MIPS_KSEG0_END == MIPS32_KSEG0_END, - "MIPS_KSEG0_END mismatch"); -_Static_assert((uint32_t)MIPS_KSEG1_START == MIPS32_KSEG1_START, - "MIPS_KSEG1_START mismatch"); -_Static_assert((uint32_t)MIPS_KSEG1_END == MIPS32_KSEG1_END, - "MIPS_KSEG1_END mismatch"); -#endif -#if defined(__mips_n64) || defined(__mips_n32) -_Static_assert(TLBLO_PFN_MASK == MIPS64_PFN_MASK, "TLBLO_PFN_MASK mismatch"); -#else -_Static_assert(TLBLO_PFN_MASK == MIPS32_PFN_MASK, "TLBLO_PFN_MASK mismatch"); -#endif -_Static_assert(TLBLO_PFN_SHIFT == MIPS_PFN_SHIFT, "TLBLO_PFN_SHIFT mismatch"); -_Static_assert(TLB_PAGE_SHIFT == MIPS_PAGE_SHIFT, "TLB_PAGE_SHIFT mismatch"); -#endif - -#endif /* !__KVM_MIPS_H__ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112310358.1BV3w7CH099247>