git: 0a99422970d7 - main - Move mips and arm to 1000Hz by default.

Warner Losh imp at FreeBSD.org
Thu Jun 17 02:01:05 UTC 2021 

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=0a99422970d7fbdb1e17724339a8dc37082f3431

commit 0a99422970d7fbdb1e17724339a8dc37082f3431
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-06-17 02:00:14 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-06-17 02:00:14 +0000

    Move mips and arm to 1000Hz by default.
    
    armv6 and armv7 systems already were 1000Hz. The other armv5 were a
    mix of 100 and 1000. This changes them to 1000. Should there be
    issues, we can add options HZ=100 to the systems that have bad
    performance at the drop of a hat.
    
    mips is a lot more complicated. But most of the systems are already
    1000HZ. The hardware exceptions are all fast enough to run at
    1000Hz. MALTA is our primary emulator, and history has shown emulators
    tend to like 100Hz better, so run those systems at 100Hz. As with arm,
    any system that shows a huge performance regression can reverted to
    100Hz easily.
    
    This was going to be committed well in advance of the 13 branch, but
    it was delayed and forgotten til now.
    
    Discussed on:   #bsdmips ages ago
    Sponsored by:   Netflix
---
 sys/kern/subr_param.c      | 6 +-----
 sys/mips/conf/AR71XX_BASE  | 1 -
 sys/mips/conf/PB92         | 1 -
 sys/mips/conf/QCA953X_BASE | 1 -
 sys/mips/conf/std.AR5312   | 1 -
 sys/mips/conf/std.AR5315   | 1 -
 sys/mips/conf/std.AR724X   | 1 -
 sys/mips/conf/std.AR91XX   | 1 -
 sys/mips/conf/std.AR933X   | 1 -
 sys/mips/conf/std.AR934X   | 1 -
 sys/mips/conf/std.MALTA    | 1 +
 sys/mips/conf/std.QCA955X  | 1 -
 sys/mips/conf/std.XLP      | 1 -
 13 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index 39ec48a32cb3..bac028bd8e25 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -63,11 +63,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #ifndef HZ
-#  if defined(__mips__) || defined(__arm__)
-#    define	HZ 100
-#  else
-#    define	HZ 1000
-#  endif
+#  define	HZ 1000
 #  ifndef HZ_VM
 #    define	HZ_VM 100
 #  endif
diff --git a/sys/mips/conf/AR71XX_BASE b/sys/mips/conf/AR71XX_BASE
index 6ce21dc58857..2d6e834c8ef9 100644
--- a/sys/mips/conf/AR71XX_BASE
+++ b/sys/mips/conf/AR71XX_BASE
@@ -11,7 +11,6 @@ machine		mips mips
 ident		AR71XX_BASE
 cpu		CPU_MIPS24K
 makeoptions	KERNLOADADDR=0x80050000
-options 	HZ=1000
 options 	HWPMC_HOOKS
 
 files		"../atheros/files.ar71xx"
diff --git a/sys/mips/conf/PB92 b/sys/mips/conf/PB92
index 64a0e6db120b..30c134ef1e74 100644
--- a/sys/mips/conf/PB92
+++ b/sys/mips/conf/PB92
@@ -8,7 +8,6 @@
 ident		PB92
 # XXX The default load address in the Uboot environment is 0x80010000
 makeoptions	KERNLOADADDR=0x80050000
-options 	HZ=1000
 
 # The PB92 has 32mb of RAM; hard-code that
 options 	AR71XX_REALMEM=32*1024*1024
diff --git a/sys/mips/conf/QCA953X_BASE b/sys/mips/conf/QCA953X_BASE
index ef5d3d71e255..b8dac404f30e 100644
--- a/sys/mips/conf/QCA953X_BASE
+++ b/sys/mips/conf/QCA953X_BASE
@@ -14,7 +14,6 @@ machine 	mips mips
 ident		QCA953X_BASE
 cpu		CPU_MIPS24K
 makeoptions	KERNLOADADDR=0x80050000
-options 	HZ=1000
 
 files		"../atheros/files.ar71xx"
 hints		"QCA953X_BASE.hints"
diff --git a/sys/mips/conf/std.AR5312 b/sys/mips/conf/std.AR5312
index 56a45cb4c869..d57eea069e3f 100644
--- a/sys/mips/conf/std.AR5312
+++ b/sys/mips/conf/std.AR5312
@@ -10,7 +10,6 @@ machine		mips mips
 #ident		AR5312_BASE
 cpu		CPU_MIPS4KC
 makeoptions	KERNLOADADDR=0x80050000
-options 	HZ=1000
 
 makeoptions	MODULES_OVERRIDE=""
 
diff --git a/sys/mips/conf/std.AR5315 b/sys/mips/conf/std.AR5315
index 74a888c32f85..77b81bffb1fb 100644
--- a/sys/mips/conf/std.AR5315
+++ b/sys/mips/conf/std.AR5315
@@ -10,7 +10,6 @@ machine		mips mips
 #ident		AR5315_BASE
 cpu		CPU_MIPS4KC
 makeoptions	KERNLOADADDR=0x80050000
-options 	HZ=1000
 
 makeoptions	MODULES_OVERRIDE=""
 
diff --git a/sys/mips/conf/std.AR724X b/sys/mips/conf/std.AR724X
index 3201d2f2e4bc..a03070899855 100644
--- a/sys/mips/conf/std.AR724X
+++ b/sys/mips/conf/std.AR724X
@@ -12,7 +12,6 @@ machine		mips mips
 #ident		AR724X_BASE
 cpu		CPU_MIPS24K
 makeoptions	KERNLOADADDR=0x80050000
-options 	HZ=1000
 options 	HWPMC_HOOKS
 
 files		"../atheros/files.ar71xx"
diff --git a/sys/mips/conf/std.AR91XX b/sys/mips/conf/std.AR91XX
index c1dee4e7a5d0..88f05ca3b860 100644
--- a/sys/mips/conf/std.AR91XX
+++ b/sys/mips/conf/std.AR91XX
@@ -14,7 +14,6 @@ machine         mips mips
 #ident		std.AR91XX
 cpu		CPU_MIPS24K
 makeoptions	KERNLOADADDR=0x80050000
-options 	HZ=1000
 
 files		"../atheros/files.ar71xx"
 hints		"AR91XX_BASE.hints"
diff --git a/sys/mips/conf/std.AR933X b/sys/mips/conf/std.AR933X
index 832e1db3c958..ddcd4a1824dd 100644
--- a/sys/mips/conf/std.AR933X
+++ b/sys/mips/conf/std.AR933X
@@ -14,7 +14,6 @@ machine         mips mips
 #ident		std.AR933X
 cpu		CPU_MIPS24K
 makeoptions	KERNLOADADDR=0x80050000
-options 	HZ=1000
 
 files		"../atheros/files.ar71xx"
 hints		"AR933X_BASE.hints"
diff --git a/sys/mips/conf/std.AR934X b/sys/mips/conf/std.AR934X
index a4e072c1ea1e..72b0ca137c98 100644
--- a/sys/mips/conf/std.AR934X
+++ b/sys/mips/conf/std.AR934X
@@ -14,7 +14,6 @@ machine         mips mips
 #ident		std.AR934X
 cpu		CPU_MIPS74K
 makeoptions	KERNLOADADDR=0x80050000
-options 	HZ=1000
 
 files		"../atheros/files.ar71xx"
 hints		"AR934X_BASE.hints"
diff --git a/sys/mips/conf/std.MALTA b/sys/mips/conf/std.MALTA
index 7b951b926824..4f7812fa7c72 100644
--- a/sys/mips/conf/std.MALTA
+++ b/sys/mips/conf/std.MALTA
@@ -15,6 +15,7 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
 options 	DDB
 options 	KDB
+options 	HZ=100
 
 options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
diff --git a/sys/mips/conf/std.QCA955X b/sys/mips/conf/std.QCA955X
index 8200c79250e1..843da55a31f2 100644
--- a/sys/mips/conf/std.QCA955X
+++ b/sys/mips/conf/std.QCA955X
@@ -15,7 +15,6 @@ machine         mips mips
 #ident		std.QCA955X
 cpu		CPU_MIPS74K
 makeoptions	KERNLOADADDR=0x80050000
-options 	HZ=1000
 
 files		"../atheros/files.ar71xx"
 hints		"QCA955X_BASE.hints"
diff --git a/sys/mips/conf/std.XLP b/sys/mips/conf/std.XLP
index ea6216dfcc6c..979791c74a58 100644
--- a/sys/mips/conf/std.XLP
+++ b/sys/mips/conf/std.XLP
@@ -35,7 +35,6 @@ options 	MD_ROOT			# MD is a potential root device
 options 	MD_ROOT_SIZE=132000
 options 	ROOTDEVNAME=\"ufs:md0\"
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
-options 	HZ=1000	
 options 	NO_SWAPPING
 
 # Debugging options

More information about the dev-commits-src-all mailing list