[src/trunk]: src Add yet another Shared L2 TLB (2M/4M pages).

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

details:   https://anonhg.NetBSD.org/src/rev/e794528ea82d
branches:  trunk
changeset: 321284:e794528ea82d
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Mar 09 08:49:32 2018 +0000

description:
Add yet another Shared L2 TLB (2M/4M pages).

XXX need redesign.

diffstat:

 sys/arch/x86/include/cacheinfo.h |   7 ++-
 usr.sbin/cpuctl/arch/i386.c      |  79 +++++++++++++++++++++++++++++++++------
 2 files changed, 71 insertions(+), 15 deletions(-)

diffs (159 lines):

diff -r 1960b5b3fe4e -r e794528ea82d sys/arch/x86/include/cacheinfo.h
--- a/sys/arch/x86/include/cacheinfo.h  Fri Mar 09 06:27:53 2018 +0000
+++ b/sys/arch/x86/include/cacheinfo.h  Fri Mar 09 08:49:32 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cacheinfo.h,v 1.23 2018/03/05 05:44:07 msaitoh Exp $   */
+/*     $NetBSD: cacheinfo.h,v 1.24 2018/03/09 08:49:32 msaitoh Exp $   */
 
 #ifndef _X86_CACHEINFO_H_
 #define _X86_CACHEINFO_H_
@@ -35,9 +35,10 @@
 #define CAI_L2_DTLB2   15              /* L2 Data TLB (2/4M pages) */
 #define CAI_L2_STLB    16              /* Shared L2 TLB (4K pages) */
 #define CAI_L2_STLB2   17              /* Shared L2 TLB (4K/2M pages) */
-#define CAI_PREFETCH   18              /* Prefetch */
+#define CAI_L2_STLB3   18              /* Shared L2 TLB (2M/4M pages) */
+#define CAI_PREFETCH   19              /* Prefetch */
 
-#define        CAI_COUNT       19
+#define        CAI_COUNT       20
 
 /*
  * AMD Cache Info:
diff -r 1960b5b3fe4e -r e794528ea82d usr.sbin/cpuctl/arch/i386.c
--- a/usr.sbin/cpuctl/arch/i386.c       Fri Mar 09 06:27:53 2018 +0000
+++ b/usr.sbin/cpuctl/arch/i386.c       Fri Mar 09 08:49:32 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i386.c,v 1.82 2018/03/05 10:54:05 msaitoh Exp $        */
+/*     $NetBSD: i386.c,v 1.83 2018/03/09 08:49:32 msaitoh Exp $        */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.82 2018/03/05 10:54:05 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.83 2018/03/09 08:49:32 msaitoh Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -1094,6 +1094,7 @@
        x86_cpuid(0x18, descs);
        iterations = descs[0];
        for (i = 0; i <= iterations; i++) {
+               uint32_t pgsize;
                bool full;
 
                x86_cpuid2(0x18, i, descs);
@@ -1101,13 +1102,48 @@
                if (type == CPUID_DATP_TCTYPE_N)
                        continue;
                level = __SHIFTOUT(descs[3], CPUID_DATP_TCLEVEL);
+               pgsize = __SHIFTOUT(descs[1], CPUID_DATP_PGSIZE);
                switch (level) {
                case 1:
-                       if (type == CPUID_DATP_TCTYPE_I)
-                               caitype = CAI_ITLB; /* XXX or ITLB2? */
-                       else if (type == CPUID_DATP_TCTYPE_D)
-                               caitype = CAI_DTLB;
-                       else
+                       if (type == CPUID_DATP_TCTYPE_I) {
+                               switch (pgsize) {
+                               case CPUID_DATP_PGSIZE_4KB:
+                                       caitype = CAI_ITLB;
+                                       break;
+                               case CPUID_DATP_PGSIZE_2MB
+                                   | CPUID_DATP_PGSIZE_4MB:
+                                       caitype = CAI_ITLB2;
+                                       break;
+                               case CPUID_DATP_PGSIZE_1GB:
+                                       caitype = CAI_L1_1GBITLB;
+                                       break;
+                               default:
+                                       aprint_error_dev(ci->ci_dev,
+                                           "error: unknown ITLB size (%d)\n",
+                                           pgsize);
+                                       caitype = CAI_ITLB;
+                                       break;
+                               }
+                       } else if (type == CPUID_DATP_TCTYPE_D) {
+                               switch (pgsize) {
+                               case CPUID_DATP_PGSIZE_4KB:
+                                       caitype = CAI_DTLB;
+                                       break;
+                               case CPUID_DATP_PGSIZE_2MB
+                                   | CPUID_DATP_PGSIZE_4MB:
+                                       caitype = CAI_DTLB2;
+                                       break;
+                               case CPUID_DATP_PGSIZE_1GB:
+                                       caitype = CAI_L1_1GBDTLB;
+                                       break;
+                               default:
+                                       aprint_error_dev(ci->ci_dev,
+                                           "error: unknown DTLB size (%d)\n",
+                                           pgsize);
+                                       caitype = CAI_DTLB;
+                                       break;
+                               }
+                       } else
                                caitype = -1;
                        break;
                case 2:
@@ -1115,9 +1151,27 @@
                                caitype = CAI_L2_ITLB;
                        else if (type == CPUID_DATP_TCTYPE_D)
                                caitype = CAI_L2_DTLB;
-                       else if (type == CPUID_DATP_TCTYPE_U)
-                               caitype = CAI_L2_STLB;
-                       else
+                       else if (type == CPUID_DATP_TCTYPE_U) {
+                               switch (pgsize) {
+                               case CPUID_DATP_PGSIZE_4KB:
+                                       caitype = CAI_L2_STLB;
+                                       break;
+                               case CPUID_DATP_PGSIZE_4KB
+                                   | CPUID_DATP_PGSIZE_2MB:
+                                       caitype = CAI_L2_STLB2;
+                                       break;
+                               case CPUID_DATP_PGSIZE_2MB
+                                   | CPUID_DATP_PGSIZE_4MB:
+                                       caitype = CAI_L2_STLB3;
+                                       break;
+                               default:
+                                       aprint_error_dev(ci->ci_dev,
+                                           "error: unknown L2 STLB size (%d)\n",
+                                           pgsize);
+                                       caitype = CAI_DTLB;
+                                       break;
+                               }
+                       } else
                                caitype = -1;
                        break;
                case 3:
@@ -1134,7 +1188,7 @@
                            level, type);
                        continue;
                }
-               switch (__SHIFTOUT(descs[1], CPUID_DATP_PGSIZE)) {
+               switch (pgsize) {
                case CPUID_DATP_PGSIZE_4KB:
                        linesize = 4 * 1024;
                        break;
@@ -1165,7 +1219,7 @@
                    = ways * sets; /* entries */
                ci->ci_cinfo[caitype].cai_associativity
                    = full ? 0xff : ways;
-               ci->ci_cinfo[caitype].cai_linesize = linesize; /* page size */
+               ci->ci_cinfo[caitype].cai_linesize = linesize; /* pg size */
        }
 }
 
@@ -2276,6 +2330,7 @@
        if (ci->ci_cinfo[CAI_L2_STLB].cai_totalsize != 0) {
                sep = print_tlb_config(ci, CAI_L2_STLB, "L2 STLB", NULL);
                sep = print_tlb_config(ci, CAI_L2_STLB2, NULL, sep);
+               sep = print_tlb_config(ci, CAI_L2_STLB3, NULL, sep);
                if (sep != NULL)
                        aprint_verbose("\n");
        }