[src/trunk]: src/sys/arch/alpha/alpha Decorate some symbols with the appropri...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ce9abdf99fa0
branches:  trunk
changeset: 943448:ce9abdf99fa0
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Sep 04 01:56:29 2020 +0000

description:
Decorate some symbols with the appropriate things for better cache
behavior.  Assert that cpu_infos are cache line aligned.

diffstat:

 sys/arch/alpha/alpha/cpu.c |  20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 20c1e811c759 -r ce9abdf99fa0 sys/arch/alpha/alpha/cpu.c
--- a/sys/arch/alpha/alpha/cpu.c        Fri Sep 04 00:36:07 2020 +0000
+++ b/sys/arch/alpha/alpha/cpu.c        Fri Sep 04 01:56:29 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.99 2020/08/29 20:06:59 thorpej Exp $ */
+/* $NetBSD: cpu.c,v 1.100 2020/09/04 01:56:29 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.99 2020/08/29 20:06:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.100 2020/09/04 01:56:29 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -80,7 +80,7 @@
 #include <machine/prom.h>
 #include <machine/alpha.h>
 
-struct cpu_info cpu_info_primary = {
+struct cpu_info cpu_info_primary __cacheline_aligned = {
        .ci_curlwp = &lwp0
 };
 struct cpu_info *cpu_info_list = &cpu_info_primary;
@@ -93,9 +93,9 @@
 struct cpu_info *cpu_info[ALPHA_MAXPROCS];
 
 /* Bitmask of CPUs booted, currently running, and paused. */
-volatile u_long cpus_booted;
-volatile u_long cpus_running;
-volatile u_long cpus_paused;
+volatile u_long cpus_booted __read_mostly;
+volatile u_long cpus_running __read_mostly;
+volatile u_long cpus_paused __read_mostly;
 
 void   cpu_boot_secondary(struct cpu_info *);
 #endif /* MULTIPROCESSOR */
@@ -108,7 +108,8 @@
  * Note, we invert the AMASK so that if a bit is set, it means "has
  * extension".
  */
-u_long cpu_implver, cpu_amask;
+u_long cpu_implver __read_mostly;
+u_long cpu_amask __read_mostly;
 
 /* Definition of the driver for autoconfig. */
 static int     cpumatch(device_t, cfdata_t, void *);
@@ -276,7 +277,12 @@
        if (ma->ma_slot == hwrpb->rpb_primary_cpu_id)
                ci = &cpu_info_primary;
        else {
+               /*
+                * kmem_zalloc() will guarante cache line alignment for
+                * all allocations >= CACHE_LINE_SIZE.
+                */
                ci = kmem_zalloc(sizeof(*ci), KM_SLEEP);
+               KASSERT(((uintptr_t)ci & (CACHE_LINE_SIZE - 1)) == 0);
        }
 #if defined(MULTIPROCESSOR)
        cpu_info[ma->ma_slot] = ci;