Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej-cfargs]: src/sys/uvm/pmap Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/be3922426e0b
branches: thorpej-cfargs
changeset: 961380:be3922426e0b
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sat Apr 17 17:26:12 2021 +0000
description:
Sync with HEAD.
diffstat:
sys/arch/aarch64/aarch64/bus_space.c | 8 +-
sys/arch/aarch64/aarch64/pmap.c | 8 +-
sys/arch/aarch64/aarch64/trap.c | 25 +-
sys/arch/alpha/alpha/interrupt.c | 12 +-
sys/arch/alpha/common/sgmap_typedep.c | 6 +-
sys/arch/alpha/include/cpu.h | 5 +-
sys/arch/alpha/stand/common/OSFpal.c | 5 +-
sys/arch/alpha/stand/netboot/dev_net.c | 19 +-
sys/arch/bebox/stand/Makefile.inc | 4 +-
sys/arch/evbmips/stand/sbmips/netboot/dev_net.c | 19 +-
sys/arch/hp300/dev/diofb.c | 11 +-
sys/arch/hp300/dev/topcat.c | 15 +-
sys/arch/hp300/stand/Makefile.inc | 4 +-
sys/arch/hp300/stand/common/netio.c | 6 +-
sys/arch/hppa/stand/Makefile.inc | 3 +-
sys/arch/m68k/m68k/db_disasm.c | 7 +-
sys/arch/m68k/m68k/db_disasm.h | 4 +-
sys/arch/m68k/m68k/pmap_motorola.c | 10 +-
sys/arch/macppc/stand/Makefile.inc | 4 +-
sys/arch/macppc/stand/ofwboot/net.c | 4 +-
sys/arch/mips/include/mips_opcode.h | 19 +-
sys/arch/mips/mips/db_disasm.c | 86 +-
sys/arch/mips/mips/db_interface.c | 6 +-
sys/arch/mips/mips/mips_stacktrace.c | 14 +-
sys/arch/mips/mips/trap.c | 57 +-
sys/arch/mvme68k/stand/Makefile.booters | 5 +-
sys/arch/newsmips/stand/boot/net.c | 4 +-
sys/arch/ofppc/stand/Makefile.inc | 3 +-
sys/arch/ofppc/stand/ofwboot/net.c | 4 +-
sys/arch/powerpc/ibm4xx/pmap.c | 64 +-
sys/arch/powerpc/include/booke/vmparam.h | 8 +-
sys/arch/powerpc/include/oea/vmparam.h | 26 +-
sys/arch/powerpc/powerpc/powerpc_machdep.c | 8 +-
sys/arch/riscv/include/db_machdep.h | 13 +-
sys/arch/riscv/include/insn.h | 734 ++++++-
sys/arch/riscv/riscv/db_disasm.c | 1253 +++++++++++++-
sys/arch/riscv/riscv/db_machdep.c | 37 +-
sys/arch/sandpoint/include/types.h | 3 +-
sys/arch/sgimips/stand/Makefile.inc | 4 +-
sys/arch/shark/stand/ofwboot/net.c | 4 +-
sys/arch/sparc/sparc/db_disasm.c | 6 +-
sys/arch/sparc/stand/common/net.c | 4 +-
sys/arch/sparc/stand/ofwboot/net.c | 4 +-
sys/arch/sparc64/dev/ldc.c | 23 +-
sys/arch/sparc64/include/cpu.h | 7 +-
sys/arch/sparc64/sparc64/cpu.c | 14 +-
sys/arch/sparc64/sparc64/db_disasm.c | 7 +-
sys/arch/sun68k/stand/libsa/netif_sun.c | 6 +-
sys/arch/x68k/stand/Makefile.inc | 4 +-
sys/arch/x86/x86/identcpu.c | 6 +-
sys/arch/zaurus/dev/w100lcd.c | 9 +-
sys/arch/zaurus/stand/Makefile.inc | 4 +-
sys/compat/netbsd32/files.netbsd32 | 4 +-
sys/compat/netbsd32/netbsd32_execve.c | 6 +-
sys/compat/netbsd32/netbsd32_ioctl.c | 6 +-
sys/compat/netbsd32/netbsd32_ioctl.h | 3 +-
sys/compat/netbsd32/netbsd32_systrace_args.c | 8 +-
sys/conf/Makefile.kern.inc | 2 +-
sys/conf/copts.mk | 16 +-
sys/crypto/adiantum/adiantum.c | 14 +-
sys/ddb/db_sym.c | 7 +-
sys/dev/cardbus/cardslot.c | 61 +-
sys/dev/cardbus/cardslotvar.h | 6 +-
sys/dev/dksubr.c | 9 +-
sys/dev/i2c/i2cvar.h | 4 +-
sys/dev/ic/ath.c | 6 +-
sys/dev/ic/bwfm.c | 3 +-
sys/dev/ieee1394/firewire.h | 4 +-
sys/dev/mca/if_we_mca.c | 10 +-
sys/dev/mvme/mvmebus.c | 6 +-
sys/dev/nvmm/nvmm.c | 9 +-
sys/dev/pci/if_aq.c | 66 +-
sys/dev/raidframe/rf_netbsdkintf.c | 6 +-
sys/dev/sbus/magma.c | 9 +-
sys/dev/scsipi/cd.c | 18 +-
sys/dev/usb/usbhist.h | 4 +-
sys/dev/vnd.c | 13 +-
sys/external/bsd/drm2/i915drm/files.i915drmkms | 8 +-
sys/external/bsd/gnu-efi/dist/lib/misc.c | 3 +-
sys/external/isc/atheros_hal/dist/ah_eeprom_v1.c | 4 +-
sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c | 8 +-
sys/external/isc/atheros_hal/dist/ah_eeprom_v3.c | 22 +-
sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c | 4 +-
sys/external/isc/atheros_hal/dist/ar5212/ar5212_attach.c | 4 +-
sys/external/isc/atheros_hal/dist/ar5212/ar5212_xmit.c | 4 +-
sys/fs/udf/udf_subr.c | 11 +-
sys/kern/kern_ctf.c | 8 +-
sys/kern/kern_tc.c | 15 +-
sys/kern/makesyscalls.sh | 15 +-
sys/kern/subr_evcnt.c | 62 +-
sys/kern/subr_hash.c | 7 +-
sys/kern/systrace_args.c | 6 +-
sys/modules/dtrace/Makefile | 9 +-
sys/modules/dtrace/netbsd32_syscall/Makefile | 1 +
sys/modules/dtrace/syscall/Makefile | 1 +
sys/modules/hpacel/Makefile | 4 +-
sys/modules/i915drmkms/Makefile | 13 +-
sys/modules/lua/Makefile | 4 +-
sys/modules/solaris/Makefile.solmod | 4 +-
sys/modules/zfs/Makefile.zfsmod | 4 +-
sys/net/if_pppoe.c | 151 +-
sys/net/if_spppsubr.c | 14 +-
sys/net/if_spppvar.h | 4 +-
sys/net/toeplitz.c | 4 +-
sys/net/toeplitz.h | 4 +
sys/opencrypto/cryptosoft.c | 120 +-
sys/rump/Makefile.rump | 13 +-
sys/rump/fs/lib/libzfs/Makefile | 6 +-
sys/rump/kern/lib/libsolaris/Makefile | 6 +-
sys/rump/net/lib/libnet/Makefile | 5 +-
sys/sys/biohist.h | 4 +-
sys/sys/kern_ctf.h | 4 +-
sys/sys/kernhist.h | 15 +-
sys/sys/sysctl.h | 4 +-
sys/uvm/pmap/pmap.c | 16 +-
sys/uvm/uvm_map.c | 10 +-
sys/uvm/uvm_pdaemon.c | 7 +-
sys/uvm/uvm_stat.h | 4 +-
118 files changed, 2750 insertions(+), 787 deletions(-)
diffs (truncated from 6654 to 300 lines):
diff -r a025aac0e0a8 -r be3922426e0b sys/arch/aarch64/aarch64/bus_space.c
--- a/sys/arch/aarch64/aarch64/bus_space.c Tue Apr 06 00:16:48 2021 +0000
+++ b/sys/arch/aarch64/aarch64/bus_space.c Sat Apr 17 17:26:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.15 2020/12/14 19:32:29 skrll Exp $ */
+/* $NetBSD: bus_space.c,v 1.15.2.1 2021/04/17 17:26:12 thorpej Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bus_space.c,v 1.15 2020/12/14 19:32:29 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bus_space.c,v 1.15.2.1 2021/04/17 17:26:12 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -702,6 +702,7 @@
if ((error = cpu_set_onfault(&fb)) == 0) {
*datap = generic_dsb_bs_r_1(t, bsh, offset);
+ dsb(ld);
cpu_unset_onfault();
}
return error;
@@ -716,6 +717,7 @@
if ((error = cpu_set_onfault(&fb)) == 0) {
*datap = NSWAP(generic_dsb_bs_r_2)(t, bsh, offset);
+ dsb(ld);
cpu_unset_onfault();
}
return error;
@@ -730,6 +732,7 @@
if ((error = cpu_set_onfault(&fb)) == 0) {
*datap = NSWAP(generic_dsb_bs_r_4)(t, bsh, offset);
+ dsb(ld);
cpu_unset_onfault();
}
return error;
@@ -744,6 +747,7 @@
if ((error = cpu_set_onfault(&fb)) == 0) {
*datap = NSWAP(generic_dsb_bs_r_8)(t, bsh, offset);
+ dsb(ld);
cpu_unset_onfault();
}
return error;
diff -r a025aac0e0a8 -r be3922426e0b sys/arch/aarch64/aarch64/pmap.c
--- a/sys/arch/aarch64/aarch64/pmap.c Tue Apr 06 00:16:48 2021 +0000
+++ b/sys/arch/aarch64/aarch64/pmap.c Sat Apr 17 17:26:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.103 2021/03/09 16:40:59 ryo Exp $ */
+/* $NetBSD: pmap.c,v 1.103.2.1 2021/04/17 17:26:12 thorpej Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.103 2021/03/09 16:40:59 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.103.2.1 2021/04/17 17:26:12 thorpej Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -68,7 +68,6 @@
#define VPRINTF(...) __nothing
#endif
-UVMHIST_DEFINE(pmaphist);
#ifdef UVMHIST
#ifndef UVMHIST_PMAPHIST_SIZE
@@ -76,13 +75,14 @@
#endif
struct kern_history_ent pmaphistbuf[UVMHIST_PMAPHIST_SIZE];
+UVMHIST_DEFINE(pmaphist) = UVMHIST_INITIALIZER(pmaphist, pmaphistbuf);;
static void
pmap_hist_init(void)
{
static bool inited = false;
if (inited == false) {
- UVMHIST_INIT_STATIC(pmaphist, pmaphistbuf);
+ UVMHIST_LINK_STATIC(pmaphist);
inited = true;
}
}
diff -r a025aac0e0a8 -r be3922426e0b sys/arch/aarch64/aarch64/trap.c
--- a/sys/arch/aarch64/aarch64/trap.c Tue Apr 06 00:16:48 2021 +0000
+++ b/sys/arch/aarch64/aarch64/trap.c Sat Apr 17 17:26:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.45 2021/03/09 16:44:27 ryo Exp $ */
+/* $NetBSD: trap.c,v 1.45.2.1 2021/04/17 17:26:12 thorpej Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.45 2021/03/09 16:44:27 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.45.2.1 2021/04/17 17:26:12 thorpej Exp $");
#include "opt_arm_intr_impl.h"
#include "opt_compat_netbsd32.h"
@@ -861,6 +861,26 @@
}
}
+void
+trap_el1h_error(struct trapframe *tf)
+{
+ /*
+ * Normally, we should panic unconditionally,
+ * but SError interrupt may occur when accessing to unmapped(?) I/O
+ * spaces. bus_space_{peek,poke}_{1,2,4,8}() should trap these case.
+ */
+ struct faultbuf *fb;
+
+ if (curcpu()->ci_intr_depth == 0) {
+ fb = cpu_disable_onfault();
+ if (fb != NULL) {
+ cpu_jump_onfault(tf, fb, EFAULT);
+ return;
+ }
+ }
+ panic("%s", __func__);
+}
+
#define bad_trap_panic(trapfunc) \
void \
trapfunc(struct trapframe *tf) \
@@ -872,7 +892,6 @@
bad_trap_panic(trap_el1t_fiq)
bad_trap_panic(trap_el1t_error)
bad_trap_panic(trap_el1h_fiq)
-bad_trap_panic(trap_el1h_error)
bad_trap_panic(trap_el0_fiq)
bad_trap_panic(trap_el0_error)
bad_trap_panic(trap_el0_32fiq)
diff -r a025aac0e0a8 -r be3922426e0b sys/arch/alpha/alpha/interrupt.c
--- a/sys/arch/alpha/alpha/interrupt.c Tue Apr 06 00:16:48 2021 +0000
+++ b/sys/arch/alpha/alpha/interrupt.c Sat Apr 17 17:26:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.92 2020/10/10 03:05:04 thorpej Exp $ */
+/* $NetBSD: interrupt.c,v 1.92.4.1 2021/04/17 17:26:12 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.92 2020/10/10 03:05:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.92.4.1 2021/04/17 17:26:12 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -212,12 +212,7 @@
break;
case ALPHA_INTR_CLOCK: /* clock interrupt */
- /*
- * We don't increment the interrupt depth for the
- * clock interrupt, since it is *sampled* from
- * the clock interrupt, so if we did, all system
- * time would be counted as interrupt time.
- */
+ atomic_inc_ulong(&ci->ci_intrdepth);
sc->sc_evcnt_clock.ev_count++;
ci->ci_data.cpu_nintr++;
if (platform.clockintr) {
@@ -242,6 +237,7 @@
schedhz != 0)
schedclock(ci->ci_curlwp);
}
+ atomic_dec_ulong(&ci->ci_intrdepth);
break;
case ALPHA_INTR_ERROR: /* Machine Check or Correctable Error */
diff -r a025aac0e0a8 -r be3922426e0b sys/arch/alpha/common/sgmap_typedep.c
--- a/sys/arch/alpha/common/sgmap_typedep.c Tue Apr 06 00:16:48 2021 +0000
+++ b/sys/arch/alpha/common/sgmap_typedep.c Sat Apr 17 17:26:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sgmap_typedep.c,v 1.40 2020/10/11 00:33:30 thorpej Exp $ */
+/* $NetBSD: sgmap_typedep.c,v 1.40.4.1 2021/04/17 17:26:12 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sgmap_typedep.c,v 1.40 2020/10/11 00:33:30 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sgmap_typedep.c,v 1.40.4.1 2021/04/17 17:26:12 thorpej Exp $");
#include "opt_ddb.h"
@@ -138,7 +138,7 @@
#endif
const vm_flag_t vmflags = VM_INSTANTFIT |
- ((flags & BUS_DMA_NOWAIT) ? VM_SLEEP : VM_NOSLEEP);
+ ((flags & BUS_DMA_NOWAIT) ? VM_NOSLEEP : VM_SLEEP);
error = vmem_xalloc(sgmap->aps_arena, sgvalen,
alignment, /* alignment */
diff -r a025aac0e0a8 -r be3922426e0b sys/arch/alpha/include/cpu.h
--- a/sys/arch/alpha/include/cpu.h Tue Apr 06 00:16:48 2021 +0000
+++ b/sys/arch/alpha/include/cpu.h Sat Apr 17 17:26:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.99 2020/10/15 01:00:01 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.99.4.1 2021/04/17 17:26:12 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -205,7 +205,8 @@
* r/m/w cycle is complete, we won't be counted... but it's not
* like this stastic has to be extremely accurate.
*/
-#define CLKF_INTR(framep) (curcpu()->ci_intrdepth)
+#define CLKF_INTR(framep) \
+ (curcpu()->ci_intrdepth > 1) /* one for clock interrupt itself */
/*
* This is used during profiling to integrate system time. It can safely
diff -r a025aac0e0a8 -r be3922426e0b sys/arch/alpha/stand/common/OSFpal.c
--- a/sys/arch/alpha/stand/common/OSFpal.c Tue Apr 06 00:16:48 2021 +0000
+++ b/sys/arch/alpha/stand/common/OSFpal.c Sat Apr 17 17:26:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: OSFpal.c,v 1.9 2009/03/18 10:22:22 cegger Exp $ */
+/* $NetBSD: OSFpal.c,v 1.9.78.1 2021/04/17 17:26:13 thorpej Exp $ */
/*
* Copyright (c) 1994, 1996 Carnegie-Mellon University.
@@ -34,7 +34,8 @@
#include <machine/rpb.h>
#include <machine/alpha_cpu.h>
-paddr_t ptbr_save;
+/* XXX */
+extern paddr_t ptbr_save;
#include "common.h"
diff -r a025aac0e0a8 -r be3922426e0b sys/arch/alpha/stand/netboot/dev_net.c
--- a/sys/arch/alpha/stand/netboot/dev_net.c Tue Apr 06 00:16:48 2021 +0000
+++ b/sys/arch/alpha/stand/netboot/dev_net.c Sat Apr 17 17:26:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.16 2011/07/17 20:54:36 joerg Exp $ */
+/* $NetBSD: dev_net.c,v 1.16.68.1 2021/04/17 17:26:13 thorpej Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -67,23 +67,6 @@
extern int nfs_root_node[]; /* XXX - get from nfs_mount() */
/*
- * Various globals needed by the network code:
- */
-
-#if 0
-/* for arp.c, rarp.c */
-u_char bcea[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-#endif
-
-struct in_addr myip; /* my ip address */
-struct in_addr rootip; /* root ip address */
-struct in_addr gateip; /* swap ip address */
-n_long netmask; /* subnet or net mask */
-
-char rootpath[FNAME_SIZE];
-char hostname[FNAME_SIZE];
-
-/*
* Local things...
*/
static int netdev_sock = -1;
diff -r a025aac0e0a8 -r be3922426e0b sys/arch/bebox/stand/Makefile.inc
--- a/sys/arch/bebox/stand/Makefile.inc Tue Apr 06 00:16:48 2021 +0000
+++ b/sys/arch/bebox/stand/Makefile.inc Sat Apr 17 17:26:12 2021 +0000
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.2 2005/12/11 12:17:04 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2.180.1 2021/04/17 17:26:13 thorpej Exp $
.include <bsd.own.mk>
BINDIR?= /usr/mdec
+
+COPTS+= -fcommon
diff -r a025aac0e0a8 -r be3922426e0b sys/arch/evbmips/stand/sbmips/netboot/dev_net.c
--- a/sys/arch/evbmips/stand/sbmips/netboot/dev_net.c Tue Apr 06 00:16:48 2021 +0000
+++ b/sys/arch/evbmips/stand/sbmips/netboot/dev_net.c Sat Apr 17 17:26:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $ */
Home |
Main Index |
Thread Index |
Old Index