forked from Minki/linux
1567c3e346
Implement arch_scale_freq_capacity() for 'modern' x86. This function is used by the scheduler to correctly account usage in the face of DVFS. The present patch addresses Intel processors specifically and has positive performance and performance-per-watt implications for the schedutil cpufreq governor, bringing it closer to, if not on-par with, the powersave governor from the intel_pstate driver/framework. Large performance gains are obtained when the machine is lightly loaded and no regression are observed at saturation. The benchmarks with the largest gains are kernel compilation, tbench (the networking version of dbench) and shell-intensive workloads. 1. FREQUENCY INVARIANCE: MOTIVATION * Without it, a task looks larger if the CPU runs slower 2. PECULIARITIES OF X86 * freq invariance accounting requires knowing the ratio freq_curr/freq_max 2.1 CURRENT FREQUENCY * Use delta_APERF / delta_MPERF * freq_base (a.k.a "BusyMHz") 2.2 MAX FREQUENCY * It varies with time (turbo). As an approximation, we set it to a constant, i.e. 4-cores turbo frequency. 3. EFFECTS ON THE SCHEDUTIL FREQUENCY GOVERNOR * The invariant schedutil's formula has no feedback loop and reacts faster to utilization changes 4. KNOWN LIMITATIONS * In some cases tasks can't reach max util despite how hard they try 5. PERFORMANCE TESTING 5.1 MACHINES * Skylake, Broadwell, Haswell 5.2 SETUP * baseline Linux v5.2 w/ non-invariant schedutil. Tested freq_max = 1-2-3-4-8-12 active cores turbo w/ invariant schedutil, and intel_pstate/powersave 5.3 BENCHMARK RESULTS 5.3.1 NEUTRAL BENCHMARKS * NAS Parallel Benchmark (HPC), hackbench 5.3.2 NON-NEUTRAL BENCHMARKS * tbench (10-30% better), kernbench (10-15% better), shell-intensive-scripts (30-50% better) * no regressions 5.3.3 SELECTION OF DETAILED RESULTS 5.3.4 POWER CONSUMPTION, PERFORMANCE-PER-WATT * dbench (5% worse on one machine), kernbench (3% worse), tbench (5-10% better), shell-intensive-scripts (10-40% better) 6. MICROARCH'ES ADDRESSED HERE * Xeon Core before Scalable Performance processors line (Xeon Gold/Platinum etc have different MSRs semantic for querying turbo levels) 7. REFERENCES * MMTests performance testing framework, github.com/gormanm/mmtests +-------------------------------------------------------------------------+ | 1. FREQUENCY INVARIANCE: MOTIVATION +-------------------------------------------------------------------------+ For example; suppose a CPU has two frequencies: 500 and 1000 Mhz. When running a task that would consume 1/3rd of a CPU at 1000 MHz, it would appear to consume 2/3rd (or 66.6%) when running at 500 MHz, giving the false impression this CPU is almost at capacity, even though it can go faster [*]. In a nutshell, without frequency scale-invariance tasks look larger just because the CPU is running slower. [*] (footnote: this assumes a linear frequency/performance relation; which everybody knows to be false, but given realities its the best approximation we can make.) +-------------------------------------------------------------------------+ | 2. PECULIARITIES OF X86 +-------------------------------------------------------------------------+ Accounting for frequency changes in PELT signals requires the computation of the ratio freq_curr / freq_max. On x86 neither of those terms is readily available. 2.1 CURRENT FREQUENCY ==================== Since modern x86 has hardware control over the actual frequency we run at (because amongst other things, Turbo-Mode), we cannot simply use the frequency as requested through cpufreq. Instead we use the APERF/MPERF MSRs to compute the effective frequency over the recent past. Also, because reading MSRs is expensive, don't do so every time we need the value, but amortize the cost by doing it every tick. 2.2 MAX FREQUENCY ================= Obtaining freq_max is also non-trivial because at any time the hardware can provide a frequency boost to a selected subset of cores if the package has enough power to spare (eg: Turbo Boost). This means that the maximum frequency available to a given core changes with time. The approach taken in this change is to arbitrarily set freq_max to a constant value at boot. The value chosen is the "4-cores (4C) turbo frequency" on most microarchitectures, after evaluating the following candidates: * 1-core (1C) turbo frequency (the fastest turbo state available) * around base frequency (a.k.a. max P-state) * something in between, such as 4C turbo To interpret these options, consider that this is the denominator in freq_curr/freq_max, and that ratio will be used to scale PELT signals such as util_avg and load_avg. A large denominator will undershoot (util_avg looks a bit smaller than it really is), viceversa with a smaller denominator PELT signals will tend to overshoot. Given that PELT drives frequency selection in the schedutil governor, we will have: freq_max set to | effect on DVFS --------------------+------------------ 1C turbo | power efficiency (lower freq choices) base freq | performance (higher util_avg, higher freq requests) 4C turbo | a bit of both 4C turbo proves to be a good compromise in a number of benchmarks (see below). +-------------------------------------------------------------------------+ | 3. EFFECTS ON THE SCHEDUTIL FREQUENCY GOVERNOR +-------------------------------------------------------------------------+ Once an architecture implements a frequency scale-invariant utilization (the PELT signal util_avg), schedutil switches its frequency selection formula from freq_next = 1.25 * freq_curr * util [non-invariant util signal] to freq_next = 1.25 * freq_max * util [invariant util signal] where, in the second formula, freq_max is set to the 1C turbo frequency (max turbo). The advantage of the second formula, whose usage we unlock with this patch, is that freq_next doesn't depend on the current frequency in an iterative fashion, but can jump to any frequency in a single update. This absence of feedback in the formula makes it quicker to react to utilization changes and more robust against pathological instabilities. Compare it to the update formula of intel_pstate/powersave: freq_next = 1.25 * freq_max * Busy% where again freq_max is 1C turbo and Busy% is the percentage of time not spent idling (calculated with delta_MPERF / delta_TSC); essentially the same as invariant schedutil, and largely responsible for intel_pstate/powersave good reputation. The non-invariant schedutil formula is derived from the invariant one by approximating util_inv with util_raw * freq_curr / freq_max, but this has limitations. Testing shows improved performances due to better frequency selections when the machine is lightly loaded, and essentially no change in behaviour at saturation / overutilization. +-------------------------------------------------------------------------+ | 4. KNOWN LIMITATIONS +-------------------------------------------------------------------------+ It's been shown that it is possible to create pathological scenarios where a CPU-bound task cannot reach max utilization, if the normalizing factor freq_max is fixed to a constant value (see [Lelli-2018]). If freq_max is set to 4C turbo as we do here, one needs to peg at least 5 cores in a package doing some busywork, and observe that none of those task will ever reach max util (1024) because they're all running at less than the 4C turbo frequency. While this concern still applies, we believe the performance benefit of frequency scale-invariant PELT signals outweights the cost of this limitation. [Lelli-2018] https://lore.kernel.org/lkml/20180517150418.GF22493@localhost.localdomain/ +-------------------------------------------------------------------------+ | 5. PERFORMANCE TESTING +-------------------------------------------------------------------------+ 5.1 MACHINES ============ We tested the patch on three machines, with Skylake, Broadwell and Haswell CPUs. The details are below, together with the available turbo ratios as reported by the appropriate MSRs. * 8x-SKYLAKE-UMA: Single socket E3-1240 v5, Skylake 4 cores/8 threads Max EFFiciency, BASE frequency and available turbo levels (MHz): EFFIC 800 |******** BASE 3500 |*********************************** 4C 3700 |************************************* 3C 3800 |************************************** 2C 3900 |*************************************** 1C 3900 |*************************************** * 80x-BROADWELL-NUMA: Two sockets E5-2698 v4, 2x Broadwell 20 cores/40 threads Max EFFiciency, BASE frequency and available turbo levels (MHz): EFFIC 1200 |************ BASE 2200 |********************** 8C 2900 |***************************** 7C 3000 |****************************** 6C 3100 |******************************* 5C 3200 |******************************** 4C 3300 |********************************* 3C 3400 |********************************** 2C 3600 |************************************ 1C 3600 |************************************ * 48x-HASWELL-NUMA Two sockets E5-2670 v3, 2x Haswell 12 cores/24 threads Max EFFiciency, BASE frequency and available turbo levels (MHz): EFFIC 1200 |************ BASE 2300 |*********************** 12C 2600 |************************** 11C 2600 |************************** 10C 2600 |************************** 9C 2600 |************************** 8C 2600 |************************** 7C 2600 |************************** 6C 2600 |************************** 5C 2700 |*************************** 4C 2800 |**************************** 3C 2900 |***************************** 2C 3100 |******************************* 1C 3100 |******************************* 5.2 SETUP ========= * The baseline is Linux v5.2 with schedutil (non-invariant) and the intel_pstate driver in passive mode. * The rationale for choosing the various freq_max values to test have been to try all the 1-2-3-4C turbo levels (note that 1C and 2C turbo are identical on all machines), plus one more value closer to base_freq but still in the turbo range (8C turbo for both 80x-BROADWELL-NUMA and 48x-HASWELL-NUMA). * In addition we've run all tests with intel_pstate/powersave for comparison. * The filesystem is always XFS, the userspace is openSUSE Leap 15.1. * 8x-SKYLAKE-UMA is capable of HWP (Hardware-Managed P-States), so the runs with active intel_pstate on this machine use that. This gives, in terms of combinations tested on each machine: * 8x-SKYLAKE-UMA * Baseline: Linux v5.2, non-invariant schedutil, intel_pstate passive * intel_pstate active + powersave + HWP * invariant schedutil, freq_max = 1C turbo * invariant schedutil, freq_max = 3C turbo * invariant schedutil, freq_max = 4C turbo * both 80x-BROADWELL-NUMA and 48x-HASWELL-NUMA * [same as 8x-SKYLAKE-UMA, but no HWP capable] * invariant schedutil, freq_max = 8C turbo (which on 48x-HASWELL-NUMA is the same as 12C turbo, or "all cores turbo") 5.3 BENCHMARK RESULTS ===================== 5.3.1 NEUTRAL BENCHMARKS ------------------------ Tests that didn't show any measurable difference in performance on any of the test machines between non-invariant schedutil and our patch are: * NAS Parallel Benchmarks (NPB) using either MPI or openMP for IPC, any computational kernel * flexible I/O (FIO) * hackbench (using threads or processes, and using pipes or sockets) 5.3.2 NON-NEUTRAL BENCHMARKS ---------------------------- What follow are summary tables where each benchmark result is given a score. * A tilde (~) means a neutral result, i.e. no difference from baseline. * Scores are computed with the ratio result_new / result_baseline, so a tilde means a score of 1.00. * The results in the score ratio are the geometric means of results running the benchmark with different parameters (eg: for kernbench: using 1, 2, 4, ... number of processes; for pgbench: varying the number of clients, and so on). * The first three tables show higher-is-better kind of tests (i.e. measured in operations/second), the subsequent three show lower-is-better kind of tests (i.e. the workload is fixed and we measure elapsed time, think kernbench). * "gitsource" is a name we made up for the test consisting in running the entire unit tests suite of the Git SCM and measuring how long it takes. We take it as a typical example of shell-intensive serialized workload. * In the "I_PSTATE" column we have the results for intel_pstate/powersave. Other columns show invariant schedutil for different values of freq_max. 4C turbo is circled as it's the value we've chosen for the final implementation. 80x-BROADWELL-NUMA (comparison ratio; higher is better) +------+ I_PSTATE 1C 3C | 4C | 8C pgbench-ro 1.14 ~ ~ | 1.11 | 1.14 pgbench-rw ~ ~ ~ | ~ | ~ netperf-udp 1.06 ~ 1.06 | 1.05 | 1.07 netperf-tcp ~ 1.03 ~ | 1.01 | 1.02 tbench4 1.57 1.18 1.22 | 1.30 | 1.56 +------+ 8x-SKYLAKE-UMA (comparison ratio; higher is better) +------+ I_PSTATE/HWP 1C 3C | 4C | pgbench-ro ~ ~ ~ | ~ | pgbench-rw ~ ~ ~ | ~ | netperf-udp ~ ~ ~ | ~ | netperf-tcp ~ ~ ~ | ~ | tbench4 1.30 1.14 1.14 | 1.16 | +------+ 48x-HASWELL-NUMA (comparison ratio; higher is better) +------+ I_PSTATE 1C 3C | 4C | 12C pgbench-ro 1.15 ~ ~ | 1.06 | 1.16 pgbench-rw ~ ~ ~ | ~ | ~ netperf-udp 1.05 0.97 1.04 | 1.04 | 1.02 netperf-tcp 0.96 1.01 1.01 | 1.01 | 1.01 tbench4 1.50 1.05 1.13 | 1.13 | 1.25 +------+ In the table above we see that active intel_pstate is slightly better than our 4C-turbo patch (both in reference to the baseline non-invariant schedutil) on read-only pgbench and much better on tbench. Both cases are notable in which it shows that lowering our freq_max (to 8C-turbo and 12C-turbo on 80x-BROADWELL-NUMA and 48x-HASWELL-NUMA respectively) helps invariant schedutil to get closer. If we ignore active intel_pstate and focus on the comparison with baseline alone, there are several instances of double-digit performance improvement. 80x-BROADWELL-NUMA (comparison ratio; lower is better) +------+ I_PSTATE 1C 3C | 4C | 8C dbench4 1.23 0.95 0.95 | 0.95 | 0.95 kernbench 0.93 0.83 0.83 | 0.83 | 0.82 gitsource 0.98 0.49 0.49 | 0.49 | 0.48 +------+ 8x-SKYLAKE-UMA (comparison ratio; lower is better) +------+ I_PSTATE/HWP 1C 3C | 4C | dbench4 ~ ~ ~ | ~ | kernbench ~ ~ ~ | ~ | gitsource 0.92 0.55 0.55 | 0.55 | +------+ 48x-HASWELL-NUMA (comparison ratio; lower is better) +------+ I_PSTATE 1C 3C | 4C | 8C dbench4 ~ ~ ~ | ~ | ~ kernbench 0.94 0.90 0.89 | 0.90 | 0.90 gitsource 0.97 0.69 0.69 | 0.69 | 0.69 +------+ dbench is not very remarkable here, unless we notice how poorly active intel_pstate is performing on 80x-BROADWELL-NUMA: 23% regression versus non-invariant schedutil. We repeated that run getting consistent results. Out of scope for the patch at hand, but deserving future investigation. Other than that, we previously ran this campaign with Linux v5.0 and saw the patch doing better on dbench a the time. We haven't checked closely and can only speculate at this point. On the NUMA boxes kernbench gets 10-15% improvements on average; we'll see in the detailed tables that the gains concentrate on low process counts (lightly loaded machines). The test we call "gitsource" (running the git unit test suite, a long-running single-threaded shell script) appears rather spectacular in this table (gains of 30-50% depending on the machine). It is to be noted, however, that gitsource has no adjustable parameters (such as the number of jobs in kernbench, which we average over in order to get a single-number summary score) and is exactly the kind of low-parallelism workload that benefits the most from this patch. When looking at the detailed tables of kernbench or tbench4, at low process or client counts one can see similar numbers. 5.3.3 SELECTION OF DETAILED RESULTS ----------------------------------- Machine : 48x-HASWELL-NUMA Benchmark : tbench4 (i.e. dbench4 over the network, actually loopback) Varying parameter : number of clients Unit : MB/sec (higher is better) 5.2.0 vanilla (BASELINE) 5.2.0 intel_pstate 5.2.0 1C-turbo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Hmean 1 126.73 +- 0.31% ( ) 315.91 +- 0.66% ( 149.28%) 125.03 +- 0.76% ( -1.34%) Hmean 2 258.04 +- 0.62% ( ) 614.16 +- 0.51% ( 138.01%) 269.58 +- 1.45% ( 4.47%) Hmean 4 514.30 +- 0.67% ( ) 1146.58 +- 0.54% ( 122.94%) 533.84 +- 1.99% ( 3.80%) Hmean 8 1111.38 +- 2.52% ( ) 2159.78 +- 0.38% ( 94.33%) 1359.92 +- 1.56% ( 22.36%) Hmean 16 2286.47 +- 1.36% ( ) 3338.29 +- 0.21% ( 46.00%) 2720.20 +- 0.52% ( 18.97%) Hmean 32 4704.84 +- 0.35% ( ) 4759.03 +- 0.43% ( 1.15%) 4774.48 +- 0.30% ( 1.48%) Hmean 64 7578.04 +- 0.27% ( ) 7533.70 +- 0.43% ( -0.59%) 7462.17 +- 0.65% ( -1.53%) Hmean 128 6998.52 +- 0.16% ( ) 6987.59 +- 0.12% ( -0.16%) 6909.17 +- 0.14% ( -1.28%) Hmean 192 6901.35 +- 0.25% ( ) 6913.16 +- 0.10% ( 0.17%) 6855.47 +- 0.21% ( -0.66%) 5.2.0 3C-turbo 5.2.0 4C-turbo 5.2.0 12C-turbo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Hmean 1 128.43 +- 0.28% ( 1.34%) 130.64 +- 3.81% ( 3.09%) 153.71 +- 5.89% ( 21.30%) Hmean 2 311.70 +- 6.15% ( 20.79%) 281.66 +- 3.40% ( 9.15%) 305.08 +- 5.70% ( 18.23%) Hmean 4 641.98 +- 2.32% ( 24.83%) 623.88 +- 5.28% ( 21.31%) 906.84 +- 4.65% ( 76.32%) Hmean 8 1633.31 +- 1.56% ( 46.96%) 1714.16 +- 0.93% ( 54.24%) 2095.74 +- 0.47% ( 88.57%) Hmean 16 3047.24 +- 0.42% ( 33.27%) 3155.02 +- 0.30% ( 37.99%) 3634.58 +- 0.15% ( 58.96%) Hmean 32 4734.31 +- 0.60% ( 0.63%) 4804.38 +- 0.23% ( 2.12%) 4674.62 +- 0.27% ( -0.64%) Hmean 64 7699.74 +- 0.35% ( 1.61%) 7499.72 +- 0.34% ( -1.03%) 7659.03 +- 0.25% ( 1.07%) Hmean 128 6935.18 +- 0.15% ( -0.91%) 6942.54 +- 0.10% ( -0.80%) 7004.85 +- 0.12% ( 0.09%) Hmean 192 6901.62 +- 0.12% ( 0.00%) 6856.93 +- 0.10% ( -0.64%) 6978.74 +- 0.10% ( 1.12%) This is one of the cases where the patch still can't surpass active intel_pstate, not even when freq_max is as low as 12C-turbo. Otherwise, gains are visible up to 16 clients and the saturated scenario is the same as baseline. The scores in the summary table from the previous sections are ratios of geometric means of the results over different clients, as seen in this table. Machine : 80x-BROADWELL-NUMA Benchmark : kernbench (kernel compilation) Varying parameter : number of jobs Unit : seconds (lower is better) 5.2.0 vanilla (BASELINE) 5.2.0 intel_pstate 5.2.0 1C-turbo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Amean 2 379.68 +- 0.06% ( ) 330.20 +- 0.43% ( 13.03%) 285.93 +- 0.07% ( 24.69%) Amean 4 200.15 +- 0.24% ( ) 175.89 +- 0.22% ( 12.12%) 153.78 +- 0.25% ( 23.17%) Amean 8 106.20 +- 0.31% ( ) 95.54 +- 0.23% ( 10.03%) 86.74 +- 0.10% ( 18.32%) Amean 16 56.96 +- 1.31% ( ) 53.25 +- 1.22% ( 6.50%) 48.34 +- 1.73% ( 15.13%) Amean 32 34.80 +- 2.46% ( ) 33.81 +- 0.77% ( 2.83%) 30.28 +- 1.59% ( 12.99%) Amean 64 26.11 +- 1.63% ( ) 25.04 +- 1.07% ( 4.10%) 22.41 +- 2.37% ( 14.16%) Amean 128 24.80 +- 1.36% ( ) 23.57 +- 1.23% ( 4.93%) 21.44 +- 1.37% ( 13.55%) Amean 160 24.85 +- 0.56% ( ) 23.85 +- 1.17% ( 4.06%) 21.25 +- 1.12% ( 14.49%) 5.2.0 3C-turbo 5.2.0 4C-turbo 5.2.0 8C-turbo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Amean 2 284.08 +- 0.13% ( 25.18%) 283.96 +- 0.51% ( 25.21%) 285.05 +- 0.21% ( 24.92%) Amean 4 153.18 +- 0.22% ( 23.47%) 154.70 +- 1.64% ( 22.71%) 153.64 +- 0.30% ( 23.24%) Amean 8 87.06 +- 0.28% ( 18.02%) 86.77 +- 0.46% ( 18.29%) 86.78 +- 0.22% ( 18.28%) Amean 16 48.03 +- 0.93% ( 15.68%) 47.75 +- 1.99% ( 16.17%) 47.52 +- 1.61% ( 16.57%) Amean 32 30.23 +- 1.20% ( 13.14%) 30.08 +- 1.67% ( 13.57%) 30.07 +- 1.67% ( 13.60%) Amean 64 22.59 +- 2.02% ( 13.50%) 22.63 +- 0.81% ( 13.32%) 22.42 +- 0.76% ( 14.12%) Amean 128 21.37 +- 0.67% ( 13.82%) 21.31 +- 1.15% ( 14.07%) 21.17 +- 1.93% ( 14.63%) Amean 160 21.68 +- 0.57% ( 12.76%) 21.18 +- 1.74% ( 14.77%) 21.22 +- 1.00% ( 14.61%) The patch outperform active intel_pstate (and baseline) by a considerable margin; the summary table from the previous section says 4C turbo and active intel_pstate are 0.83 and 0.93 against baseline respectively, so 4C turbo is 0.83/0.93=0.89 against intel_pstate (~10% better on average). There is no noticeable difference with regard to the value of freq_max. Machine : 8x-SKYLAKE-UMA Benchmark : gitsource (time to run the git unit test suite) Varying parameter : none Unit : seconds (lower is better) 5.2.0 vanilla 5.2.0 intel_pstate/hwp 5.2.0 1C-turbo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Amean 858.85 +- 1.16% ( ) 791.94 +- 0.21% ( 7.79%) 474.95 ( 44.70%) 5.2.0 3C-turbo 5.2.0 4C-turbo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Amean 475.26 +- 0.20% ( 44.66%) 474.34 +- 0.13% ( 44.77%) In this test, which is of interest as representing shell-intensive (i.e. fork-intensive) serialized workloads, invariant schedutil outperforms intel_pstate/powersave by a whopping 40% margin. 5.3.4 POWER CONSUMPTION, PERFORMANCE-PER-WATT --------------------------------------------- The following table shows average power consumption in watt for each benchmark. Data comes from turbostat (package average), which in turn is read from the RAPL interface on CPUs. We know the patch affects CPU frequencies so it's reasonable to ignore other power consumers (such as memory or I/O). Also, we don't have a power meter available in the lab so RAPL is the best we have. turbostat sampled average power every 10 seconds for the entire duration of each benchmark. We took all those values and averaged them (i.e. with don't have detail on a per-parameter granularity, only on whole benchmarks). 80x-BROADWELL-NUMA (power consumption, watts) +--------+ BASELINE I_PSTATE 1C 3C | 4C | 8C pgbench-ro 130.01 142.77 131.11 132.45 | 134.65 | 136.84 pgbench-rw 68.30 60.83 71.45 71.70 | 71.65 | 72.54 dbench4 90.25 59.06 101.43 99.89 | 101.10 | 102.94 netperf-udp 65.70 69.81 66.02 68.03 | 68.27 | 68.95 netperf-tcp 88.08 87.96 88.97 88.89 | 88.85 | 88.20 tbench4 142.32 176.73 153.02 163.91 | 165.58 | 176.07 kernbench 92.94 101.95 114.91 115.47 | 115.52 | 115.10 gitsource 40.92 41.87 75.14 75.20 | 75.40 | 75.70 +--------+ 8x-SKYLAKE-UMA (power consumption, watts) +--------+ BASELINE I_PSTATE/HWP 1C 3C | 4C | pgbench-ro 46.49 46.68 46.56 46.59 | 46.52 | pgbench-rw 29.34 31.38 30.98 31.00 | 31.00 | dbench4 27.28 27.37 27.49 27.41 | 27.38 | netperf-udp 22.33 22.41 22.36 22.35 | 22.36 | netperf-tcp 27.29 27.29 27.30 27.31 | 27.33 | tbench4 41.13 45.61 43.10 43.33 | 43.56 | kernbench 42.56 42.63 43.01 43.01 | 43.01 | gitsource 13.32 13.69 17.33 17.30 | 17.35 | +--------+ 48x-HASWELL-NUMA (power consumption, watts) +--------+ BASELINE I_PSTATE 1C 3C | 4C | 12C pgbench-ro 128.84 136.04 129.87 132.43 | 132.30 | 134.86 pgbench-rw 37.68 37.92 37.17 37.74 | 37.73 | 37.31 dbench4 28.56 28.73 28.60 28.73 | 28.70 | 28.79 netperf-udp 56.70 60.44 56.79 57.42 | 57.54 | 57.52 netperf-tcp 75.49 75.27 75.87 76.02 | 76.01 | 75.95 tbench4 115.44 139.51 119.53 123.07 | 123.97 | 130.22 kernbench 83.23 91.55 95.58 95.69 | 95.72 | 96.04 gitsource 36.79 36.99 39.99 40.34 | 40.35 | 40.23 +--------+ A lower power consumption isn't necessarily better, it depends on what is done with that energy. Here are tables with the ratio of performance-per-watt on each machine and benchmark. Higher is always better; a tilde (~) means a neutral ratio (i.e. 1.00). 80x-BROADWELL-NUMA (performance-per-watt ratios; higher is better) +------+ I_PSTATE 1C 3C | 4C | 8C pgbench-ro 1.04 1.06 0.94 | 1.07 | 1.08 pgbench-rw 1.10 0.97 0.96 | 0.96 | 0.97 dbench4 1.24 0.94 0.95 | 0.94 | 0.92 netperf-udp ~ 1.02 1.02 | ~ | 1.02 netperf-tcp ~ 1.02 ~ | ~ | 1.02 tbench4 1.26 1.10 1.06 | 1.12 | 1.26 kernbench 0.98 0.97 0.97 | 0.97 | 0.98 gitsource ~ 1.11 1.11 | 1.11 | 1.13 +------+ 8x-SKYLAKE-UMA (performance-per-watt ratios; higher is better) +------+ I_PSTATE/HWP 1C 3C | 4C | pgbench-ro ~ ~ ~ | ~ | pgbench-rw 0.95 0.97 0.96 | 0.96 | dbench4 ~ ~ ~ | ~ | netperf-udp ~ ~ ~ | ~ | netperf-tcp ~ ~ ~ | ~ | tbench4 1.17 1.09 1.08 | 1.10 | kernbench ~ ~ ~ | ~ | gitsource 1.06 1.40 1.40 | 1.40 | +------+ 48x-HASWELL-NUMA (performance-per-watt ratios; higher is better) +------+ I_PSTATE 1C 3C | 4C | 12C pgbench-ro 1.09 ~ 1.09 | 1.03 | 1.11 pgbench-rw ~ 0.86 ~ | ~ | 0.86 dbench4 ~ 1.02 1.02 | 1.02 | ~ netperf-udp ~ 0.97 1.03 | 1.02 | ~ netperf-tcp 0.96 ~ ~ | ~ | ~ tbench4 1.24 ~ 1.06 | 1.05 | 1.11 kernbench 0.97 0.97 0.98 | 0.97 | 0.96 gitsource 1.03 1.33 1.32 | 1.32 | 1.33 +------+ These results are overall pleasing: in plenty of cases we observe performance-per-watt improvements. The few regressions (read/write pgbench and dbench on the Broadwell machine) are of small magnitude. kernbench loses a few percentage points (it has a 10-15% performance improvement, but apparently the increase in power consumption is larger than that). tbench4 and gitsource, which benefit the most from the patch, keep a positive score in this table which is a welcome surprise; that suggests that in those particular workloads the non-invariant schedutil (and active intel_pstate, too) makes some rather suboptimal frequency selections. +-------------------------------------------------------------------------+ | 6. MICROARCH'ES ADDRESSED HERE +-------------------------------------------------------------------------+ The patch addresses Xeon Core processors that use MSR_PLATFORM_INFO and MSR_TURBO_RATIO_LIMIT to advertise their base frequency and turbo frequencies respectively. This excludes the recent Xeon Scalable Performance processors line (Xeon Gold, Platinum etc) whose MSRs have to be parsed differently. Subsequent patches will address: * Xeon Scalable Performance processors and Atom Goldmont/Goldmont Plus * Xeon Phi (Knights Landing, Knights Mill) * Atom Silvermont +-------------------------------------------------------------------------+ | 7. REFERENCES +-------------------------------------------------------------------------+ Tests have been run with the help of the MMTests performance testing framework, see github.com/gormanm/mmtests. The configuration file names for the benchmark used are: db-pgbench-timed-ro-small-xfs db-pgbench-timed-rw-small-xfs io-dbench4-async-xfs network-netperf-unbound network-tbench scheduler-unbound workload-kerndevel-xfs workload-shellscripts-xfs hpc-nas-c-class-mpi-full-xfs hpc-nas-c-class-omp-full All those benchmarks are generally available on the web: pgbench: https://www.postgresql.org/docs/10/pgbench.html netperf: https://hewlettpackard.github.io/netperf/ dbench/tbench: https://dbench.samba.org/ gitsource: git unit test suite, github.com/git/git NAS Parallel Benchmarks: https://www.nas.nasa.gov/publications/npb.html hackbench: https://people.redhat.com/mingo/cfs-scheduler/tools/hackbench.c Suggested-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Giovanni Gherdovich <ggherdovich@suse.cz> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Acked-by: Doug Smythies <dsmythies@telus.net> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Link: https://lkml.kernel.org/r/20200122151617.531-2-ggherdovich@suse.cz
1948 lines
47 KiB
C
1948 lines
47 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* x86 SMP booting functions
|
|
*
|
|
* (c) 1995 Alan Cox, Building #3 <alan@lxorguk.ukuu.org.uk>
|
|
* (c) 1998, 1999, 2000, 2009 Ingo Molnar <mingo@redhat.com>
|
|
* Copyright 2001 Andi Kleen, SuSE Labs.
|
|
*
|
|
* Much of the core SMP work is based on previous work by Thomas Radke, to
|
|
* whom a great many thanks are extended.
|
|
*
|
|
* Thanks to Intel for making available several different Pentium,
|
|
* Pentium Pro and Pentium-II/Xeon MP machines.
|
|
* Original development of Linux SMP code supported by Caldera.
|
|
*
|
|
* Fixes
|
|
* Felix Koop : NR_CPUS used properly
|
|
* Jose Renau : Handle single CPU case.
|
|
* Alan Cox : By repeated request 8) - Total BogoMIPS report.
|
|
* Greg Wright : Fix for kernel stacks panic.
|
|
* Erich Boleyn : MP v1.4 and additional changes.
|
|
* Matthias Sattler : Changes for 2.1 kernel map.
|
|
* Michel Lespinasse : Changes for 2.1 kernel map.
|
|
* Michael Chastain : Change trampoline.S to gnu as.
|
|
* Alan Cox : Dumb bug: 'B' step PPro's are fine
|
|
* Ingo Molnar : Added APIC timers, based on code
|
|
* from Jose Renau
|
|
* Ingo Molnar : various cleanups and rewrites
|
|
* Tigran Aivazian : fixed "0.00 in /proc/uptime on SMP" bug.
|
|
* Maciej W. Rozycki : Bits for genuine 82489DX APICs
|
|
* Andi Kleen : Changed for SMP boot into long mode.
|
|
* Martin J. Bligh : Added support for multi-quad systems
|
|
* Dave Jones : Report invalid combinations of Athlon CPUs.
|
|
* Rusty Russell : Hacked into shape for new "hotplug" boot process.
|
|
* Andi Kleen : Converted to new state machine.
|
|
* Ashok Raj : CPU hotplug support
|
|
* Glauber Costa : i386 and x86_64 integration
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/export.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/sched/topology.h>
|
|
#include <linux/sched/hotplug.h>
|
|
#include <linux/sched/task_stack.h>
|
|
#include <linux/percpu.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/err.h>
|
|
#include <linux/nmi.h>
|
|
#include <linux/tboot.h>
|
|
#include <linux/stackprotector.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/cpuidle.h>
|
|
#include <linux/numa.h>
|
|
|
|
#include <asm/acpi.h>
|
|
#include <asm/desc.h>
|
|
#include <asm/nmi.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/realmode.h>
|
|
#include <asm/cpu.h>
|
|
#include <asm/numa.h>
|
|
#include <asm/pgtable.h>
|
|
#include <asm/tlbflush.h>
|
|
#include <asm/mtrr.h>
|
|
#include <asm/mwait.h>
|
|
#include <asm/apic.h>
|
|
#include <asm/io_apic.h>
|
|
#include <asm/fpu/internal.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/uv/uv.h>
|
|
#include <linux/mc146818rtc.h>
|
|
#include <asm/i8259.h>
|
|
#include <asm/misc.h>
|
|
#include <asm/qspinlock.h>
|
|
#include <asm/intel-family.h>
|
|
#include <asm/cpu_device_id.h>
|
|
#include <asm/spec-ctrl.h>
|
|
#include <asm/hw_irq.h>
|
|
|
|
/* representing HT siblings of each logical CPU */
|
|
DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map);
|
|
EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
|
|
|
|
/* representing HT and core siblings of each logical CPU */
|
|
DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
|
|
EXPORT_PER_CPU_SYMBOL(cpu_core_map);
|
|
|
|
/* representing HT, core, and die siblings of each logical CPU */
|
|
DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_die_map);
|
|
EXPORT_PER_CPU_SYMBOL(cpu_die_map);
|
|
|
|
DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
|
|
|
|
/* Per CPU bogomips and other parameters */
|
|
DEFINE_PER_CPU_READ_MOSTLY(struct cpuinfo_x86, cpu_info);
|
|
EXPORT_PER_CPU_SYMBOL(cpu_info);
|
|
|
|
/* Logical package management. We might want to allocate that dynamically */
|
|
unsigned int __max_logical_packages __read_mostly;
|
|
EXPORT_SYMBOL(__max_logical_packages);
|
|
static unsigned int logical_packages __read_mostly;
|
|
static unsigned int logical_die __read_mostly;
|
|
|
|
/* Maximum number of SMT threads on any online core */
|
|
int __read_mostly __max_smt_threads = 1;
|
|
|
|
/* Flag to indicate if a complete sched domain rebuild is required */
|
|
bool x86_topology_update;
|
|
|
|
int arch_update_cpu_topology(void)
|
|
{
|
|
int retval = x86_topology_update;
|
|
|
|
x86_topology_update = false;
|
|
return retval;
|
|
}
|
|
|
|
static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
|
|
{
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&rtc_lock, flags);
|
|
CMOS_WRITE(0xa, 0xf);
|
|
spin_unlock_irqrestore(&rtc_lock, flags);
|
|
*((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)) =
|
|
start_eip >> 4;
|
|
*((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) =
|
|
start_eip & 0xf;
|
|
}
|
|
|
|
static inline void smpboot_restore_warm_reset_vector(void)
|
|
{
|
|
unsigned long flags;
|
|
|
|
/*
|
|
* Paranoid: Set warm reset code and vector here back
|
|
* to default values.
|
|
*/
|
|
spin_lock_irqsave(&rtc_lock, flags);
|
|
CMOS_WRITE(0, 0xf);
|
|
spin_unlock_irqrestore(&rtc_lock, flags);
|
|
|
|
*((volatile u32 *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = 0;
|
|
}
|
|
|
|
static void init_freq_invariance(void);
|
|
|
|
/*
|
|
* Report back to the Boot Processor during boot time or to the caller processor
|
|
* during CPU online.
|
|
*/
|
|
static void smp_callin(void)
|
|
{
|
|
int cpuid;
|
|
|
|
/*
|
|
* If waken up by an INIT in an 82489DX configuration
|
|
* cpu_callout_mask guarantees we don't get here before
|
|
* an INIT_deassert IPI reaches our local APIC, so it is
|
|
* now safe to touch our local APIC.
|
|
*/
|
|
cpuid = smp_processor_id();
|
|
|
|
/*
|
|
* the boot CPU has finished the init stage and is spinning
|
|
* on callin_map until we finish. We are free to set up this
|
|
* CPU, first the APIC. (this is probably redundant on most
|
|
* boards)
|
|
*/
|
|
apic_ap_setup();
|
|
|
|
/*
|
|
* Save our processor parameters. Note: this information
|
|
* is needed for clock calibration.
|
|
*/
|
|
smp_store_cpu_info(cpuid);
|
|
|
|
/*
|
|
* The topology information must be up to date before
|
|
* calibrate_delay() and notify_cpu_starting().
|
|
*/
|
|
set_cpu_sibling_map(raw_smp_processor_id());
|
|
|
|
init_freq_invariance();
|
|
|
|
/*
|
|
* Get our bogomips.
|
|
* Update loops_per_jiffy in cpu_data. Previous call to
|
|
* smp_store_cpu_info() stored a value that is close but not as
|
|
* accurate as the value just calculated.
|
|
*/
|
|
calibrate_delay();
|
|
cpu_data(cpuid).loops_per_jiffy = loops_per_jiffy;
|
|
pr_debug("Stack at about %p\n", &cpuid);
|
|
|
|
wmb();
|
|
|
|
notify_cpu_starting(cpuid);
|
|
|
|
/*
|
|
* Allow the master to continue.
|
|
*/
|
|
cpumask_set_cpu(cpuid, cpu_callin_mask);
|
|
}
|
|
|
|
static int cpu0_logical_apicid;
|
|
static int enable_start_cpu0;
|
|
/*
|
|
* Activate a secondary processor.
|
|
*/
|
|
static void notrace start_secondary(void *unused)
|
|
{
|
|
/*
|
|
* Don't put *anything* except direct CPU state initialization
|
|
* before cpu_init(), SMP booting is too fragile that we want to
|
|
* limit the things done here to the most necessary things.
|
|
*/
|
|
cr4_init();
|
|
|
|
#ifdef CONFIG_X86_32
|
|
/* switch away from the initial page table */
|
|
load_cr3(swapper_pg_dir);
|
|
__flush_tlb_all();
|
|
#endif
|
|
load_current_idt();
|
|
cpu_init();
|
|
x86_cpuinit.early_percpu_clock_init();
|
|
preempt_disable();
|
|
smp_callin();
|
|
|
|
enable_start_cpu0 = 0;
|
|
|
|
/* otherwise gcc will move up smp_processor_id before the cpu_init */
|
|
barrier();
|
|
/*
|
|
* Check TSC synchronization with the boot CPU:
|
|
*/
|
|
check_tsc_sync_target();
|
|
|
|
speculative_store_bypass_ht_init();
|
|
|
|
/*
|
|
* Lock vector_lock, set CPU online and bring the vector
|
|
* allocator online. Online must be set with vector_lock held
|
|
* to prevent a concurrent irq setup/teardown from seeing a
|
|
* half valid vector space.
|
|
*/
|
|
lock_vector_lock();
|
|
set_cpu_online(smp_processor_id(), true);
|
|
lapic_online();
|
|
unlock_vector_lock();
|
|
cpu_set_state_online(smp_processor_id());
|
|
x86_platform.nmi_init();
|
|
|
|
/* enable local interrupts */
|
|
local_irq_enable();
|
|
|
|
/* to prevent fake stack check failure in clock setup */
|
|
boot_init_stack_canary();
|
|
|
|
x86_cpuinit.setup_percpu_clockev();
|
|
|
|
wmb();
|
|
cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
|
|
}
|
|
|
|
/**
|
|
* topology_is_primary_thread - Check whether CPU is the primary SMT thread
|
|
* @cpu: CPU to check
|
|
*/
|
|
bool topology_is_primary_thread(unsigned int cpu)
|
|
{
|
|
return apic_id_is_primary_thread(per_cpu(x86_cpu_to_apicid, cpu));
|
|
}
|
|
|
|
/**
|
|
* topology_smt_supported - Check whether SMT is supported by the CPUs
|
|
*/
|
|
bool topology_smt_supported(void)
|
|
{
|
|
return smp_num_siblings > 1;
|
|
}
|
|
|
|
/**
|
|
* topology_phys_to_logical_pkg - Map a physical package id to a logical
|
|
*
|
|
* Returns logical package id or -1 if not found
|
|
*/
|
|
int topology_phys_to_logical_pkg(unsigned int phys_pkg)
|
|
{
|
|
int cpu;
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
|
|
|
if (c->initialized && c->phys_proc_id == phys_pkg)
|
|
return c->logical_proc_id;
|
|
}
|
|
return -1;
|
|
}
|
|
EXPORT_SYMBOL(topology_phys_to_logical_pkg);
|
|
/**
|
|
* topology_phys_to_logical_die - Map a physical die id to logical
|
|
*
|
|
* Returns logical die id or -1 if not found
|
|
*/
|
|
int topology_phys_to_logical_die(unsigned int die_id, unsigned int cur_cpu)
|
|
{
|
|
int cpu;
|
|
int proc_id = cpu_data(cur_cpu).phys_proc_id;
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
|
|
|
if (c->initialized && c->cpu_die_id == die_id &&
|
|
c->phys_proc_id == proc_id)
|
|
return c->logical_die_id;
|
|
}
|
|
return -1;
|
|
}
|
|
EXPORT_SYMBOL(topology_phys_to_logical_die);
|
|
|
|
/**
|
|
* topology_update_package_map - Update the physical to logical package map
|
|
* @pkg: The physical package id as retrieved via CPUID
|
|
* @cpu: The cpu for which this is updated
|
|
*/
|
|
int topology_update_package_map(unsigned int pkg, unsigned int cpu)
|
|
{
|
|
int new;
|
|
|
|
/* Already available somewhere? */
|
|
new = topology_phys_to_logical_pkg(pkg);
|
|
if (new >= 0)
|
|
goto found;
|
|
|
|
new = logical_packages++;
|
|
if (new != pkg) {
|
|
pr_info("CPU %u Converting physical %u to logical package %u\n",
|
|
cpu, pkg, new);
|
|
}
|
|
found:
|
|
cpu_data(cpu).logical_proc_id = new;
|
|
return 0;
|
|
}
|
|
/**
|
|
* topology_update_die_map - Update the physical to logical die map
|
|
* @die: The die id as retrieved via CPUID
|
|
* @cpu: The cpu for which this is updated
|
|
*/
|
|
int topology_update_die_map(unsigned int die, unsigned int cpu)
|
|
{
|
|
int new;
|
|
|
|
/* Already available somewhere? */
|
|
new = topology_phys_to_logical_die(die, cpu);
|
|
if (new >= 0)
|
|
goto found;
|
|
|
|
new = logical_die++;
|
|
if (new != die) {
|
|
pr_info("CPU %u Converting physical %u to logical die %u\n",
|
|
cpu, die, new);
|
|
}
|
|
found:
|
|
cpu_data(cpu).logical_die_id = new;
|
|
return 0;
|
|
}
|
|
|
|
void __init smp_store_boot_cpu_info(void)
|
|
{
|
|
int id = 0; /* CPU 0 */
|
|
struct cpuinfo_x86 *c = &cpu_data(id);
|
|
|
|
*c = boot_cpu_data;
|
|
c->cpu_index = id;
|
|
topology_update_package_map(c->phys_proc_id, id);
|
|
topology_update_die_map(c->cpu_die_id, id);
|
|
c->initialized = true;
|
|
}
|
|
|
|
/*
|
|
* The bootstrap kernel entry code has set these up. Save them for
|
|
* a given CPU
|
|
*/
|
|
void smp_store_cpu_info(int id)
|
|
{
|
|
struct cpuinfo_x86 *c = &cpu_data(id);
|
|
|
|
/* Copy boot_cpu_data only on the first bringup */
|
|
if (!c->initialized)
|
|
*c = boot_cpu_data;
|
|
c->cpu_index = id;
|
|
/*
|
|
* During boot time, CPU0 has this setup already. Save the info when
|
|
* bringing up AP or offlined CPU0.
|
|
*/
|
|
identify_secondary_cpu(c);
|
|
c->initialized = true;
|
|
}
|
|
|
|
static bool
|
|
topology_same_node(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
|
|
{
|
|
int cpu1 = c->cpu_index, cpu2 = o->cpu_index;
|
|
|
|
return (cpu_to_node(cpu1) == cpu_to_node(cpu2));
|
|
}
|
|
|
|
static bool
|
|
topology_sane(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o, const char *name)
|
|
{
|
|
int cpu1 = c->cpu_index, cpu2 = o->cpu_index;
|
|
|
|
return !WARN_ONCE(!topology_same_node(c, o),
|
|
"sched: CPU #%d's %s-sibling CPU #%d is not on the same node! "
|
|
"[node: %d != %d]. Ignoring dependency.\n",
|
|
cpu1, name, cpu2, cpu_to_node(cpu1), cpu_to_node(cpu2));
|
|
}
|
|
|
|
#define link_mask(mfunc, c1, c2) \
|
|
do { \
|
|
cpumask_set_cpu((c1), mfunc(c2)); \
|
|
cpumask_set_cpu((c2), mfunc(c1)); \
|
|
} while (0)
|
|
|
|
static bool match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
|
|
{
|
|
if (boot_cpu_has(X86_FEATURE_TOPOEXT)) {
|
|
int cpu1 = c->cpu_index, cpu2 = o->cpu_index;
|
|
|
|
if (c->phys_proc_id == o->phys_proc_id &&
|
|
c->cpu_die_id == o->cpu_die_id &&
|
|
per_cpu(cpu_llc_id, cpu1) == per_cpu(cpu_llc_id, cpu2)) {
|
|
if (c->cpu_core_id == o->cpu_core_id)
|
|
return topology_sane(c, o, "smt");
|
|
|
|
if ((c->cu_id != 0xff) &&
|
|
(o->cu_id != 0xff) &&
|
|
(c->cu_id == o->cu_id))
|
|
return topology_sane(c, o, "smt");
|
|
}
|
|
|
|
} else if (c->phys_proc_id == o->phys_proc_id &&
|
|
c->cpu_die_id == o->cpu_die_id &&
|
|
c->cpu_core_id == o->cpu_core_id) {
|
|
return topology_sane(c, o, "smt");
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* Define snc_cpu[] for SNC (Sub-NUMA Cluster) CPUs.
|
|
*
|
|
* These are Intel CPUs that enumerate an LLC that is shared by
|
|
* multiple NUMA nodes. The LLC on these systems is shared for
|
|
* off-package data access but private to the NUMA node (half
|
|
* of the package) for on-package access.
|
|
*
|
|
* CPUID (the source of the information about the LLC) can only
|
|
* enumerate the cache as being shared *or* unshared, but not
|
|
* this particular configuration. The CPU in this case enumerates
|
|
* the cache to be shared across the entire package (spanning both
|
|
* NUMA nodes).
|
|
*/
|
|
|
|
static const struct x86_cpu_id snc_cpu[] = {
|
|
{ X86_VENDOR_INTEL, 6, INTEL_FAM6_SKYLAKE_X },
|
|
{}
|
|
};
|
|
|
|
static bool match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
|
|
{
|
|
int cpu1 = c->cpu_index, cpu2 = o->cpu_index;
|
|
|
|
/* Do not match if we do not have a valid APICID for cpu: */
|
|
if (per_cpu(cpu_llc_id, cpu1) == BAD_APICID)
|
|
return false;
|
|
|
|
/* Do not match if LLC id does not match: */
|
|
if (per_cpu(cpu_llc_id, cpu1) != per_cpu(cpu_llc_id, cpu2))
|
|
return false;
|
|
|
|
/*
|
|
* Allow the SNC topology without warning. Return of false
|
|
* means 'c' does not share the LLC of 'o'. This will be
|
|
* reflected to userspace.
|
|
*/
|
|
if (!topology_same_node(c, o) && x86_match_cpu(snc_cpu))
|
|
return false;
|
|
|
|
return topology_sane(c, o, "llc");
|
|
}
|
|
|
|
/*
|
|
* Unlike the other levels, we do not enforce keeping a
|
|
* multicore group inside a NUMA node. If this happens, we will
|
|
* discard the MC level of the topology later.
|
|
*/
|
|
static bool match_pkg(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
|
|
{
|
|
if (c->phys_proc_id == o->phys_proc_id)
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
static bool match_die(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
|
|
{
|
|
if ((c->phys_proc_id == o->phys_proc_id) &&
|
|
(c->cpu_die_id == o->cpu_die_id))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
|
|
#if defined(CONFIG_SCHED_SMT) || defined(CONFIG_SCHED_MC)
|
|
static inline int x86_sched_itmt_flags(void)
|
|
{
|
|
return sysctl_sched_itmt_enabled ? SD_ASYM_PACKING : 0;
|
|
}
|
|
|
|
#ifdef CONFIG_SCHED_MC
|
|
static int x86_core_flags(void)
|
|
{
|
|
return cpu_core_flags() | x86_sched_itmt_flags();
|
|
}
|
|
#endif
|
|
#ifdef CONFIG_SCHED_SMT
|
|
static int x86_smt_flags(void)
|
|
{
|
|
return cpu_smt_flags() | x86_sched_itmt_flags();
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
static struct sched_domain_topology_level x86_numa_in_package_topology[] = {
|
|
#ifdef CONFIG_SCHED_SMT
|
|
{ cpu_smt_mask, x86_smt_flags, SD_INIT_NAME(SMT) },
|
|
#endif
|
|
#ifdef CONFIG_SCHED_MC
|
|
{ cpu_coregroup_mask, x86_core_flags, SD_INIT_NAME(MC) },
|
|
#endif
|
|
{ NULL, },
|
|
};
|
|
|
|
static struct sched_domain_topology_level x86_topology[] = {
|
|
#ifdef CONFIG_SCHED_SMT
|
|
{ cpu_smt_mask, x86_smt_flags, SD_INIT_NAME(SMT) },
|
|
#endif
|
|
#ifdef CONFIG_SCHED_MC
|
|
{ cpu_coregroup_mask, x86_core_flags, SD_INIT_NAME(MC) },
|
|
#endif
|
|
{ cpu_cpu_mask, SD_INIT_NAME(DIE) },
|
|
{ NULL, },
|
|
};
|
|
|
|
/*
|
|
* Set if a package/die has multiple NUMA nodes inside.
|
|
* AMD Magny-Cours, Intel Cluster-on-Die, and Intel
|
|
* Sub-NUMA Clustering have this.
|
|
*/
|
|
static bool x86_has_numa_in_package;
|
|
|
|
void set_cpu_sibling_map(int cpu)
|
|
{
|
|
bool has_smt = smp_num_siblings > 1;
|
|
bool has_mp = has_smt || boot_cpu_data.x86_max_cores > 1;
|
|
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
|
struct cpuinfo_x86 *o;
|
|
int i, threads;
|
|
|
|
cpumask_set_cpu(cpu, cpu_sibling_setup_mask);
|
|
|
|
if (!has_mp) {
|
|
cpumask_set_cpu(cpu, topology_sibling_cpumask(cpu));
|
|
cpumask_set_cpu(cpu, cpu_llc_shared_mask(cpu));
|
|
cpumask_set_cpu(cpu, topology_core_cpumask(cpu));
|
|
cpumask_set_cpu(cpu, topology_die_cpumask(cpu));
|
|
c->booted_cores = 1;
|
|
return;
|
|
}
|
|
|
|
for_each_cpu(i, cpu_sibling_setup_mask) {
|
|
o = &cpu_data(i);
|
|
|
|
if ((i == cpu) || (has_smt && match_smt(c, o)))
|
|
link_mask(topology_sibling_cpumask, cpu, i);
|
|
|
|
if ((i == cpu) || (has_mp && match_llc(c, o)))
|
|
link_mask(cpu_llc_shared_mask, cpu, i);
|
|
|
|
}
|
|
|
|
/*
|
|
* This needs a separate iteration over the cpus because we rely on all
|
|
* topology_sibling_cpumask links to be set-up.
|
|
*/
|
|
for_each_cpu(i, cpu_sibling_setup_mask) {
|
|
o = &cpu_data(i);
|
|
|
|
if ((i == cpu) || (has_mp && match_pkg(c, o))) {
|
|
link_mask(topology_core_cpumask, cpu, i);
|
|
|
|
/*
|
|
* Does this new cpu bringup a new core?
|
|
*/
|
|
if (cpumask_weight(
|
|
topology_sibling_cpumask(cpu)) == 1) {
|
|
/*
|
|
* for each core in package, increment
|
|
* the booted_cores for this new cpu
|
|
*/
|
|
if (cpumask_first(
|
|
topology_sibling_cpumask(i)) == i)
|
|
c->booted_cores++;
|
|
/*
|
|
* increment the core count for all
|
|
* the other cpus in this package
|
|
*/
|
|
if (i != cpu)
|
|
cpu_data(i).booted_cores++;
|
|
} else if (i != cpu && !c->booted_cores)
|
|
c->booted_cores = cpu_data(i).booted_cores;
|
|
}
|
|
if (match_pkg(c, o) && !topology_same_node(c, o))
|
|
x86_has_numa_in_package = true;
|
|
|
|
if ((i == cpu) || (has_mp && match_die(c, o)))
|
|
link_mask(topology_die_cpumask, cpu, i);
|
|
}
|
|
|
|
threads = cpumask_weight(topology_sibling_cpumask(cpu));
|
|
if (threads > __max_smt_threads)
|
|
__max_smt_threads = threads;
|
|
}
|
|
|
|
/* maps the cpu to the sched domain representing multi-core */
|
|
const struct cpumask *cpu_coregroup_mask(int cpu)
|
|
{
|
|
return cpu_llc_shared_mask(cpu);
|
|
}
|
|
|
|
static void impress_friends(void)
|
|
{
|
|
int cpu;
|
|
unsigned long bogosum = 0;
|
|
/*
|
|
* Allow the user to impress friends.
|
|
*/
|
|
pr_debug("Before bogomips\n");
|
|
for_each_possible_cpu(cpu)
|
|
if (cpumask_test_cpu(cpu, cpu_callout_mask))
|
|
bogosum += cpu_data(cpu).loops_per_jiffy;
|
|
pr_info("Total of %d processors activated (%lu.%02lu BogoMIPS)\n",
|
|
num_online_cpus(),
|
|
bogosum/(500000/HZ),
|
|
(bogosum/(5000/HZ))%100);
|
|
|
|
pr_debug("Before bogocount - setting activated=1\n");
|
|
}
|
|
|
|
void __inquire_remote_apic(int apicid)
|
|
{
|
|
unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 };
|
|
const char * const names[] = { "ID", "VERSION", "SPIV" };
|
|
int timeout;
|
|
u32 status;
|
|
|
|
pr_info("Inquiring remote APIC 0x%x...\n", apicid);
|
|
|
|
for (i = 0; i < ARRAY_SIZE(regs); i++) {
|
|
pr_info("... APIC 0x%x %s: ", apicid, names[i]);
|
|
|
|
/*
|
|
* Wait for idle.
|
|
*/
|
|
status = safe_apic_wait_icr_idle();
|
|
if (status)
|
|
pr_cont("a previous APIC delivery may have failed\n");
|
|
|
|
apic_icr_write(APIC_DM_REMRD | regs[i], apicid);
|
|
|
|
timeout = 0;
|
|
do {
|
|
udelay(100);
|
|
status = apic_read(APIC_ICR) & APIC_ICR_RR_MASK;
|
|
} while (status == APIC_ICR_RR_INPROG && timeout++ < 1000);
|
|
|
|
switch (status) {
|
|
case APIC_ICR_RR_VALID:
|
|
status = apic_read(APIC_RRR);
|
|
pr_cont("%08x\n", status);
|
|
break;
|
|
default:
|
|
pr_cont("failed\n");
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* The Multiprocessor Specification 1.4 (1997) example code suggests
|
|
* that there should be a 10ms delay between the BSP asserting INIT
|
|
* and de-asserting INIT, when starting a remote processor.
|
|
* But that slows boot and resume on modern processors, which include
|
|
* many cores and don't require that delay.
|
|
*
|
|
* Cmdline "init_cpu_udelay=" is available to over-ride this delay.
|
|
* Modern processor families are quirked to remove the delay entirely.
|
|
*/
|
|
#define UDELAY_10MS_DEFAULT 10000
|
|
|
|
static unsigned int init_udelay = UINT_MAX;
|
|
|
|
static int __init cpu_init_udelay(char *str)
|
|
{
|
|
get_option(&str, &init_udelay);
|
|
|
|
return 0;
|
|
}
|
|
early_param("cpu_init_udelay", cpu_init_udelay);
|
|
|
|
static void __init smp_quirk_init_udelay(void)
|
|
{
|
|
/* if cmdline changed it from default, leave it alone */
|
|
if (init_udelay != UINT_MAX)
|
|
return;
|
|
|
|
/* if modern processor, use no delay */
|
|
if (((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && (boot_cpu_data.x86 == 6)) ||
|
|
((boot_cpu_data.x86_vendor == X86_VENDOR_HYGON) && (boot_cpu_data.x86 >= 0x18)) ||
|
|
((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) && (boot_cpu_data.x86 >= 0xF))) {
|
|
init_udelay = 0;
|
|
return;
|
|
}
|
|
/* else, use legacy delay */
|
|
init_udelay = UDELAY_10MS_DEFAULT;
|
|
}
|
|
|
|
/*
|
|
* Poke the other CPU in the eye via NMI to wake it up. Remember that the normal
|
|
* INIT, INIT, STARTUP sequence will reset the chip hard for us, and this
|
|
* won't ... remember to clear down the APIC, etc later.
|
|
*/
|
|
int
|
|
wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip)
|
|
{
|
|
unsigned long send_status, accept_status = 0;
|
|
int maxlvt;
|
|
|
|
/* Target chip */
|
|
/* Boot on the stack */
|
|
/* Kick the second */
|
|
apic_icr_write(APIC_DM_NMI | apic->dest_logical, apicid);
|
|
|
|
pr_debug("Waiting for send to finish...\n");
|
|
send_status = safe_apic_wait_icr_idle();
|
|
|
|
/*
|
|
* Give the other CPU some time to accept the IPI.
|
|
*/
|
|
udelay(200);
|
|
if (APIC_INTEGRATED(boot_cpu_apic_version)) {
|
|
maxlvt = lapic_get_maxlvt();
|
|
if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */
|
|
apic_write(APIC_ESR, 0);
|
|
accept_status = (apic_read(APIC_ESR) & 0xEF);
|
|
}
|
|
pr_debug("NMI sent\n");
|
|
|
|
if (send_status)
|
|
pr_err("APIC never delivered???\n");
|
|
if (accept_status)
|
|
pr_err("APIC delivery error (%lx)\n", accept_status);
|
|
|
|
return (send_status | accept_status);
|
|
}
|
|
|
|
static int
|
|
wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
|
|
{
|
|
unsigned long send_status = 0, accept_status = 0;
|
|
int maxlvt, num_starts, j;
|
|
|
|
maxlvt = lapic_get_maxlvt();
|
|
|
|
/*
|
|
* Be paranoid about clearing APIC errors.
|
|
*/
|
|
if (APIC_INTEGRATED(boot_cpu_apic_version)) {
|
|
if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */
|
|
apic_write(APIC_ESR, 0);
|
|
apic_read(APIC_ESR);
|
|
}
|
|
|
|
pr_debug("Asserting INIT\n");
|
|
|
|
/*
|
|
* Turn INIT on target chip
|
|
*/
|
|
/*
|
|
* Send IPI
|
|
*/
|
|
apic_icr_write(APIC_INT_LEVELTRIG | APIC_INT_ASSERT | APIC_DM_INIT,
|
|
phys_apicid);
|
|
|
|
pr_debug("Waiting for send to finish...\n");
|
|
send_status = safe_apic_wait_icr_idle();
|
|
|
|
udelay(init_udelay);
|
|
|
|
pr_debug("Deasserting INIT\n");
|
|
|
|
/* Target chip */
|
|
/* Send IPI */
|
|
apic_icr_write(APIC_INT_LEVELTRIG | APIC_DM_INIT, phys_apicid);
|
|
|
|
pr_debug("Waiting for send to finish...\n");
|
|
send_status = safe_apic_wait_icr_idle();
|
|
|
|
mb();
|
|
|
|
/*
|
|
* Should we send STARTUP IPIs ?
|
|
*
|
|
* Determine this based on the APIC version.
|
|
* If we don't have an integrated APIC, don't send the STARTUP IPIs.
|
|
*/
|
|
if (APIC_INTEGRATED(boot_cpu_apic_version))
|
|
num_starts = 2;
|
|
else
|
|
num_starts = 0;
|
|
|
|
/*
|
|
* Run STARTUP IPI loop.
|
|
*/
|
|
pr_debug("#startup loops: %d\n", num_starts);
|
|
|
|
for (j = 1; j <= num_starts; j++) {
|
|
pr_debug("Sending STARTUP #%d\n", j);
|
|
if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */
|
|
apic_write(APIC_ESR, 0);
|
|
apic_read(APIC_ESR);
|
|
pr_debug("After apic_write\n");
|
|
|
|
/*
|
|
* STARTUP IPI
|
|
*/
|
|
|
|
/* Target chip */
|
|
/* Boot on the stack */
|
|
/* Kick the second */
|
|
apic_icr_write(APIC_DM_STARTUP | (start_eip >> 12),
|
|
phys_apicid);
|
|
|
|
/*
|
|
* Give the other CPU some time to accept the IPI.
|
|
*/
|
|
if (init_udelay == 0)
|
|
udelay(10);
|
|
else
|
|
udelay(300);
|
|
|
|
pr_debug("Startup point 1\n");
|
|
|
|
pr_debug("Waiting for send to finish...\n");
|
|
send_status = safe_apic_wait_icr_idle();
|
|
|
|
/*
|
|
* Give the other CPU some time to accept the IPI.
|
|
*/
|
|
if (init_udelay == 0)
|
|
udelay(10);
|
|
else
|
|
udelay(200);
|
|
|
|
if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */
|
|
apic_write(APIC_ESR, 0);
|
|
accept_status = (apic_read(APIC_ESR) & 0xEF);
|
|
if (send_status || accept_status)
|
|
break;
|
|
}
|
|
pr_debug("After Startup\n");
|
|
|
|
if (send_status)
|
|
pr_err("APIC never delivered???\n");
|
|
if (accept_status)
|
|
pr_err("APIC delivery error (%lx)\n", accept_status);
|
|
|
|
return (send_status | accept_status);
|
|
}
|
|
|
|
/* reduce the number of lines printed when booting a large cpu count system */
|
|
static void announce_cpu(int cpu, int apicid)
|
|
{
|
|
static int current_node = NUMA_NO_NODE;
|
|
int node = early_cpu_to_node(cpu);
|
|
static int width, node_width;
|
|
|
|
if (!width)
|
|
width = num_digits(num_possible_cpus()) + 1; /* + '#' sign */
|
|
|
|
if (!node_width)
|
|
node_width = num_digits(num_possible_nodes()) + 1; /* + '#' */
|
|
|
|
if (cpu == 1)
|
|
printk(KERN_INFO "x86: Booting SMP configuration:\n");
|
|
|
|
if (system_state < SYSTEM_RUNNING) {
|
|
if (node != current_node) {
|
|
if (current_node > (-1))
|
|
pr_cont("\n");
|
|
current_node = node;
|
|
|
|
printk(KERN_INFO ".... node %*s#%d, CPUs: ",
|
|
node_width - num_digits(node), " ", node);
|
|
}
|
|
|
|
/* Add padding for the BSP */
|
|
if (cpu == 1)
|
|
pr_cont("%*s", width + 1, " ");
|
|
|
|
pr_cont("%*s#%d", width - num_digits(cpu), " ", cpu);
|
|
|
|
} else
|
|
pr_info("Booting Node %d Processor %d APIC 0x%x\n",
|
|
node, cpu, apicid);
|
|
}
|
|
|
|
static int wakeup_cpu0_nmi(unsigned int cmd, struct pt_regs *regs)
|
|
{
|
|
int cpu;
|
|
|
|
cpu = smp_processor_id();
|
|
if (cpu == 0 && !cpu_online(cpu) && enable_start_cpu0)
|
|
return NMI_HANDLED;
|
|
|
|
return NMI_DONE;
|
|
}
|
|
|
|
/*
|
|
* Wake up AP by INIT, INIT, STARTUP sequence.
|
|
*
|
|
* Instead of waiting for STARTUP after INITs, BSP will execute the BIOS
|
|
* boot-strap code which is not a desired behavior for waking up BSP. To
|
|
* void the boot-strap code, wake up CPU0 by NMI instead.
|
|
*
|
|
* This works to wake up soft offlined CPU0 only. If CPU0 is hard offlined
|
|
* (i.e. physically hot removed and then hot added), NMI won't wake it up.
|
|
* We'll change this code in the future to wake up hard offlined CPU0 if
|
|
* real platform and request are available.
|
|
*/
|
|
static int
|
|
wakeup_cpu_via_init_nmi(int cpu, unsigned long start_ip, int apicid,
|
|
int *cpu0_nmi_registered)
|
|
{
|
|
int id;
|
|
int boot_error;
|
|
|
|
preempt_disable();
|
|
|
|
/*
|
|
* Wake up AP by INIT, INIT, STARTUP sequence.
|
|
*/
|
|
if (cpu) {
|
|
boot_error = wakeup_secondary_cpu_via_init(apicid, start_ip);
|
|
goto out;
|
|
}
|
|
|
|
/*
|
|
* Wake up BSP by nmi.
|
|
*
|
|
* Register a NMI handler to help wake up CPU0.
|
|
*/
|
|
boot_error = register_nmi_handler(NMI_LOCAL,
|
|
wakeup_cpu0_nmi, 0, "wake_cpu0");
|
|
|
|
if (!boot_error) {
|
|
enable_start_cpu0 = 1;
|
|
*cpu0_nmi_registered = 1;
|
|
if (apic->dest_logical == APIC_DEST_LOGICAL)
|
|
id = cpu0_logical_apicid;
|
|
else
|
|
id = apicid;
|
|
boot_error = wakeup_secondary_cpu_via_nmi(id, start_ip);
|
|
}
|
|
|
|
out:
|
|
preempt_enable();
|
|
|
|
return boot_error;
|
|
}
|
|
|
|
int common_cpu_up(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
int ret;
|
|
|
|
/* Just in case we booted with a single CPU. */
|
|
alternatives_enable_smp();
|
|
|
|
per_cpu(current_task, cpu) = idle;
|
|
|
|
/* Initialize the interrupt stack(s) */
|
|
ret = irq_init_percpu_irqstack(cpu);
|
|
if (ret)
|
|
return ret;
|
|
|
|
#ifdef CONFIG_X86_32
|
|
/* Stack for startup_32 can be just as for start_secondary onwards */
|
|
per_cpu(cpu_current_top_of_stack, cpu) = task_top_of_stack(idle);
|
|
#else
|
|
initial_gs = per_cpu_offset(cpu);
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* NOTE - on most systems this is a PHYSICAL apic ID, but on multiquad
|
|
* (ie clustered apic addressing mode), this is a LOGICAL apic ID.
|
|
* Returns zero if CPU booted OK, else error code from
|
|
* ->wakeup_secondary_cpu.
|
|
*/
|
|
static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle,
|
|
int *cpu0_nmi_registered)
|
|
{
|
|
/* start_ip had better be page-aligned! */
|
|
unsigned long start_ip = real_mode_header->trampoline_start;
|
|
|
|
unsigned long boot_error = 0;
|
|
unsigned long timeout;
|
|
|
|
idle->thread.sp = (unsigned long)task_pt_regs(idle);
|
|
early_gdt_descr.address = (unsigned long)get_cpu_gdt_rw(cpu);
|
|
initial_code = (unsigned long)start_secondary;
|
|
initial_stack = idle->thread.sp;
|
|
|
|
/* Enable the espfix hack for this CPU */
|
|
init_espfix_ap(cpu);
|
|
|
|
/* So we see what's up */
|
|
announce_cpu(cpu, apicid);
|
|
|
|
/*
|
|
* This grunge runs the startup process for
|
|
* the targeted processor.
|
|
*/
|
|
|
|
if (x86_platform.legacy.warm_reset) {
|
|
|
|
pr_debug("Setting warm reset code and vector.\n");
|
|
|
|
smpboot_setup_warm_reset_vector(start_ip);
|
|
/*
|
|
* Be paranoid about clearing APIC errors.
|
|
*/
|
|
if (APIC_INTEGRATED(boot_cpu_apic_version)) {
|
|
apic_write(APIC_ESR, 0);
|
|
apic_read(APIC_ESR);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* AP might wait on cpu_callout_mask in cpu_init() with
|
|
* cpu_initialized_mask set if previous attempt to online
|
|
* it timed-out. Clear cpu_initialized_mask so that after
|
|
* INIT/SIPI it could start with a clean state.
|
|
*/
|
|
cpumask_clear_cpu(cpu, cpu_initialized_mask);
|
|
smp_mb();
|
|
|
|
/*
|
|
* Wake up a CPU in difference cases:
|
|
* - Use the method in the APIC driver if it's defined
|
|
* Otherwise,
|
|
* - Use an INIT boot APIC message for APs or NMI for BSP.
|
|
*/
|
|
if (apic->wakeup_secondary_cpu)
|
|
boot_error = apic->wakeup_secondary_cpu(apicid, start_ip);
|
|
else
|
|
boot_error = wakeup_cpu_via_init_nmi(cpu, start_ip, apicid,
|
|
cpu0_nmi_registered);
|
|
|
|
if (!boot_error) {
|
|
/*
|
|
* Wait 10s total for first sign of life from AP
|
|
*/
|
|
boot_error = -1;
|
|
timeout = jiffies + 10*HZ;
|
|
while (time_before(jiffies, timeout)) {
|
|
if (cpumask_test_cpu(cpu, cpu_initialized_mask)) {
|
|
/*
|
|
* Tell AP to proceed with initialization
|
|
*/
|
|
cpumask_set_cpu(cpu, cpu_callout_mask);
|
|
boot_error = 0;
|
|
break;
|
|
}
|
|
schedule();
|
|
}
|
|
}
|
|
|
|
if (!boot_error) {
|
|
/*
|
|
* Wait till AP completes initial initialization
|
|
*/
|
|
while (!cpumask_test_cpu(cpu, cpu_callin_mask)) {
|
|
/*
|
|
* Allow other tasks to run while we wait for the
|
|
* AP to come online. This also gives a chance
|
|
* for the MTRR work(triggered by the AP coming online)
|
|
* to be completed in the stop machine context.
|
|
*/
|
|
schedule();
|
|
}
|
|
}
|
|
|
|
if (x86_platform.legacy.warm_reset) {
|
|
/*
|
|
* Cleanup possible dangling ends...
|
|
*/
|
|
smpboot_restore_warm_reset_vector();
|
|
}
|
|
|
|
return boot_error;
|
|
}
|
|
|
|
int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
|
|
{
|
|
int apicid = apic->cpu_present_to_apicid(cpu);
|
|
int cpu0_nmi_registered = 0;
|
|
unsigned long flags;
|
|
int err, ret = 0;
|
|
|
|
lockdep_assert_irqs_enabled();
|
|
|
|
pr_debug("++++++++++++++++++++=_---CPU UP %u\n", cpu);
|
|
|
|
if (apicid == BAD_APICID ||
|
|
!physid_isset(apicid, phys_cpu_present_map) ||
|
|
!apic->apic_id_valid(apicid)) {
|
|
pr_err("%s: bad cpu %d\n", __func__, cpu);
|
|
return -EINVAL;
|
|
}
|
|
|
|
/*
|
|
* Already booted CPU?
|
|
*/
|
|
if (cpumask_test_cpu(cpu, cpu_callin_mask)) {
|
|
pr_debug("do_boot_cpu %d Already started\n", cpu);
|
|
return -ENOSYS;
|
|
}
|
|
|
|
/*
|
|
* Save current MTRR state in case it was changed since early boot
|
|
* (e.g. by the ACPI SMI) to initialize new CPUs with MTRRs in sync:
|
|
*/
|
|
mtrr_save_state();
|
|
|
|
/* x86 CPUs take themselves offline, so delayed offline is OK. */
|
|
err = cpu_check_up_prepare(cpu);
|
|
if (err && err != -EBUSY)
|
|
return err;
|
|
|
|
/* the FPU context is blank, nobody can own it */
|
|
per_cpu(fpu_fpregs_owner_ctx, cpu) = NULL;
|
|
|
|
err = common_cpu_up(cpu, tidle);
|
|
if (err)
|
|
return err;
|
|
|
|
err = do_boot_cpu(apicid, cpu, tidle, &cpu0_nmi_registered);
|
|
if (err) {
|
|
pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
|
|
ret = -EIO;
|
|
goto unreg_nmi;
|
|
}
|
|
|
|
/*
|
|
* Check TSC synchronization with the AP (keep irqs disabled
|
|
* while doing so):
|
|
*/
|
|
local_irq_save(flags);
|
|
check_tsc_sync_source(cpu);
|
|
local_irq_restore(flags);
|
|
|
|
while (!cpu_online(cpu)) {
|
|
cpu_relax();
|
|
touch_nmi_watchdog();
|
|
}
|
|
|
|
unreg_nmi:
|
|
/*
|
|
* Clean up the nmi handler. Do this after the callin and callout sync
|
|
* to avoid impact of possible long unregister time.
|
|
*/
|
|
if (cpu0_nmi_registered)
|
|
unregister_nmi_handler(NMI_LOCAL, "wake_cpu0");
|
|
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* arch_disable_smp_support() - disables SMP support for x86 at runtime
|
|
*/
|
|
void arch_disable_smp_support(void)
|
|
{
|
|
disable_ioapic_support();
|
|
}
|
|
|
|
/*
|
|
* Fall back to non SMP mode after errors.
|
|
*
|
|
* RED-PEN audit/test this more. I bet there is more state messed up here.
|
|
*/
|
|
static __init void disable_smp(void)
|
|
{
|
|
pr_info("SMP disabled\n");
|
|
|
|
disable_ioapic_support();
|
|
|
|
init_cpu_present(cpumask_of(0));
|
|
init_cpu_possible(cpumask_of(0));
|
|
|
|
if (smp_found_config)
|
|
physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);
|
|
else
|
|
physid_set_mask_of_physid(0, &phys_cpu_present_map);
|
|
cpumask_set_cpu(0, topology_sibling_cpumask(0));
|
|
cpumask_set_cpu(0, topology_core_cpumask(0));
|
|
cpumask_set_cpu(0, topology_die_cpumask(0));
|
|
}
|
|
|
|
/*
|
|
* Various sanity checks.
|
|
*/
|
|
static void __init smp_sanity_check(void)
|
|
{
|
|
preempt_disable();
|
|
|
|
#if !defined(CONFIG_X86_BIGSMP) && defined(CONFIG_X86_32)
|
|
if (def_to_bigsmp && nr_cpu_ids > 8) {
|
|
unsigned int cpu;
|
|
unsigned nr;
|
|
|
|
pr_warn("More than 8 CPUs detected - skipping them\n"
|
|
"Use CONFIG_X86_BIGSMP\n");
|
|
|
|
nr = 0;
|
|
for_each_present_cpu(cpu) {
|
|
if (nr >= 8)
|
|
set_cpu_present(cpu, false);
|
|
nr++;
|
|
}
|
|
|
|
nr = 0;
|
|
for_each_possible_cpu(cpu) {
|
|
if (nr >= 8)
|
|
set_cpu_possible(cpu, false);
|
|
nr++;
|
|
}
|
|
|
|
nr_cpu_ids = 8;
|
|
}
|
|
#endif
|
|
|
|
if (!physid_isset(hard_smp_processor_id(), phys_cpu_present_map)) {
|
|
pr_warn("weird, boot CPU (#%d) not listed by the BIOS\n",
|
|
hard_smp_processor_id());
|
|
|
|
physid_set(hard_smp_processor_id(), phys_cpu_present_map);
|
|
}
|
|
|
|
/*
|
|
* Should not be necessary because the MP table should list the boot
|
|
* CPU too, but we do it for the sake of robustness anyway.
|
|
*/
|
|
if (!apic->check_phys_apicid_present(boot_cpu_physical_apicid)) {
|
|
pr_notice("weird, boot CPU (#%d) not listed by the BIOS\n",
|
|
boot_cpu_physical_apicid);
|
|
physid_set(hard_smp_processor_id(), phys_cpu_present_map);
|
|
}
|
|
preempt_enable();
|
|
}
|
|
|
|
static void __init smp_cpu_index_default(void)
|
|
{
|
|
int i;
|
|
struct cpuinfo_x86 *c;
|
|
|
|
for_each_possible_cpu(i) {
|
|
c = &cpu_data(i);
|
|
/* mark all to hotplug */
|
|
c->cpu_index = nr_cpu_ids;
|
|
}
|
|
}
|
|
|
|
static void __init smp_get_logical_apicid(void)
|
|
{
|
|
if (x2apic_mode)
|
|
cpu0_logical_apicid = apic_read(APIC_LDR);
|
|
else
|
|
cpu0_logical_apicid = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR));
|
|
}
|
|
|
|
/*
|
|
* Prepare for SMP bootup.
|
|
* @max_cpus: configured maximum number of CPUs, It is a legacy parameter
|
|
* for common interface support.
|
|
*/
|
|
void __init native_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
unsigned int i;
|
|
|
|
smp_cpu_index_default();
|
|
|
|
/*
|
|
* Setup boot CPU information
|
|
*/
|
|
smp_store_boot_cpu_info(); /* Final full version of the data */
|
|
cpumask_copy(cpu_callin_mask, cpumask_of(0));
|
|
mb();
|
|
|
|
for_each_possible_cpu(i) {
|
|
zalloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
|
|
zalloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
|
|
zalloc_cpumask_var(&per_cpu(cpu_die_map, i), GFP_KERNEL);
|
|
zalloc_cpumask_var(&per_cpu(cpu_llc_shared_map, i), GFP_KERNEL);
|
|
}
|
|
|
|
/*
|
|
* Set 'default' x86 topology, this matches default_topology() in that
|
|
* it has NUMA nodes as a topology level. See also
|
|
* native_smp_cpus_done().
|
|
*
|
|
* Must be done before set_cpus_sibling_map() is ran.
|
|
*/
|
|
set_sched_topology(x86_topology);
|
|
|
|
set_cpu_sibling_map(0);
|
|
init_freq_invariance();
|
|
smp_sanity_check();
|
|
|
|
switch (apic_intr_mode) {
|
|
case APIC_PIC:
|
|
case APIC_VIRTUAL_WIRE_NO_CONFIG:
|
|
disable_smp();
|
|
return;
|
|
case APIC_SYMMETRIC_IO_NO_ROUTING:
|
|
disable_smp();
|
|
/* Setup local timer */
|
|
x86_init.timers.setup_percpu_clockev();
|
|
return;
|
|
case APIC_VIRTUAL_WIRE:
|
|
case APIC_SYMMETRIC_IO:
|
|
break;
|
|
}
|
|
|
|
/* Setup local timer */
|
|
x86_init.timers.setup_percpu_clockev();
|
|
|
|
smp_get_logical_apicid();
|
|
|
|
pr_info("CPU0: ");
|
|
print_cpu_info(&cpu_data(0));
|
|
|
|
uv_system_init();
|
|
|
|
set_mtrr_aps_delayed_init();
|
|
|
|
smp_quirk_init_udelay();
|
|
|
|
speculative_store_bypass_ht_init();
|
|
}
|
|
|
|
void arch_enable_nonboot_cpus_begin(void)
|
|
{
|
|
set_mtrr_aps_delayed_init();
|
|
}
|
|
|
|
void arch_enable_nonboot_cpus_end(void)
|
|
{
|
|
mtrr_aps_init();
|
|
}
|
|
|
|
/*
|
|
* Early setup to make printk work.
|
|
*/
|
|
void __init native_smp_prepare_boot_cpu(void)
|
|
{
|
|
int me = smp_processor_id();
|
|
switch_to_new_gdt(me);
|
|
/* already set me in cpu_online_mask in boot_cpu_init() */
|
|
cpumask_set_cpu(me, cpu_callout_mask);
|
|
cpu_set_state_online(me);
|
|
native_pv_lock_init();
|
|
}
|
|
|
|
void __init calculate_max_logical_packages(void)
|
|
{
|
|
int ncpus;
|
|
|
|
/*
|
|
* Today neither Intel nor AMD support heterogenous systems so
|
|
* extrapolate the boot cpu's data to all packages.
|
|
*/
|
|
ncpus = cpu_data(0).booted_cores * topology_max_smt_threads();
|
|
__max_logical_packages = DIV_ROUND_UP(total_cpus, ncpus);
|
|
pr_info("Max logical packages: %u\n", __max_logical_packages);
|
|
}
|
|
|
|
void __init native_smp_cpus_done(unsigned int max_cpus)
|
|
{
|
|
pr_debug("Boot done\n");
|
|
|
|
calculate_max_logical_packages();
|
|
|
|
if (x86_has_numa_in_package)
|
|
set_sched_topology(x86_numa_in_package_topology);
|
|
|
|
nmi_selftest();
|
|
impress_friends();
|
|
mtrr_aps_init();
|
|
}
|
|
|
|
static int __initdata setup_possible_cpus = -1;
|
|
static int __init _setup_possible_cpus(char *str)
|
|
{
|
|
get_option(&str, &setup_possible_cpus);
|
|
return 0;
|
|
}
|
|
early_param("possible_cpus", _setup_possible_cpus);
|
|
|
|
|
|
/*
|
|
* cpu_possible_mask should be static, it cannot change as cpu's
|
|
* are onlined, or offlined. The reason is per-cpu data-structures
|
|
* are allocated by some modules at init time, and dont expect to
|
|
* do this dynamically on cpu arrival/departure.
|
|
* cpu_present_mask on the other hand can change dynamically.
|
|
* In case when cpu_hotplug is not compiled, then we resort to current
|
|
* behaviour, which is cpu_possible == cpu_present.
|
|
* - Ashok Raj
|
|
*
|
|
* Three ways to find out the number of additional hotplug CPUs:
|
|
* - If the BIOS specified disabled CPUs in ACPI/mptables use that.
|
|
* - The user can overwrite it with possible_cpus=NUM
|
|
* - Otherwise don't reserve additional CPUs.
|
|
* We do this because additional CPUs waste a lot of memory.
|
|
* -AK
|
|
*/
|
|
__init void prefill_possible_map(void)
|
|
{
|
|
int i, possible;
|
|
|
|
/* No boot processor was found in mptable or ACPI MADT */
|
|
if (!num_processors) {
|
|
if (boot_cpu_has(X86_FEATURE_APIC)) {
|
|
int apicid = boot_cpu_physical_apicid;
|
|
int cpu = hard_smp_processor_id();
|
|
|
|
pr_warn("Boot CPU (id %d) not listed by BIOS\n", cpu);
|
|
|
|
/* Make sure boot cpu is enumerated */
|
|
if (apic->cpu_present_to_apicid(0) == BAD_APICID &&
|
|
apic->apic_id_valid(apicid))
|
|
generic_processor_info(apicid, boot_cpu_apic_version);
|
|
}
|
|
|
|
if (!num_processors)
|
|
num_processors = 1;
|
|
}
|
|
|
|
i = setup_max_cpus ?: 1;
|
|
if (setup_possible_cpus == -1) {
|
|
possible = num_processors;
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
if (setup_max_cpus)
|
|
possible += disabled_cpus;
|
|
#else
|
|
if (possible > i)
|
|
possible = i;
|
|
#endif
|
|
} else
|
|
possible = setup_possible_cpus;
|
|
|
|
total_cpus = max_t(int, possible, num_processors + disabled_cpus);
|
|
|
|
/* nr_cpu_ids could be reduced via nr_cpus= */
|
|
if (possible > nr_cpu_ids) {
|
|
pr_warn("%d Processors exceeds NR_CPUS limit of %u\n",
|
|
possible, nr_cpu_ids);
|
|
possible = nr_cpu_ids;
|
|
}
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
if (!setup_max_cpus)
|
|
#endif
|
|
if (possible > i) {
|
|
pr_warn("%d Processors exceeds max_cpus limit of %u\n",
|
|
possible, setup_max_cpus);
|
|
possible = i;
|
|
}
|
|
|
|
nr_cpu_ids = possible;
|
|
|
|
pr_info("Allowing %d CPUs, %d hotplug CPUs\n",
|
|
possible, max_t(int, possible - num_processors, 0));
|
|
|
|
reset_cpu_possible_mask();
|
|
|
|
for (i = 0; i < possible; i++)
|
|
set_cpu_possible(i, true);
|
|
}
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
/* Recompute SMT state for all CPUs on offline */
|
|
static void recompute_smt_state(void)
|
|
{
|
|
int max_threads, cpu;
|
|
|
|
max_threads = 0;
|
|
for_each_online_cpu (cpu) {
|
|
int threads = cpumask_weight(topology_sibling_cpumask(cpu));
|
|
|
|
if (threads > max_threads)
|
|
max_threads = threads;
|
|
}
|
|
__max_smt_threads = max_threads;
|
|
}
|
|
|
|
static void remove_siblinginfo(int cpu)
|
|
{
|
|
int sibling;
|
|
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
|
|
|
for_each_cpu(sibling, topology_core_cpumask(cpu)) {
|
|
cpumask_clear_cpu(cpu, topology_core_cpumask(sibling));
|
|
/*/
|
|
* last thread sibling in this cpu core going down
|
|
*/
|
|
if (cpumask_weight(topology_sibling_cpumask(cpu)) == 1)
|
|
cpu_data(sibling).booted_cores--;
|
|
}
|
|
|
|
for_each_cpu(sibling, topology_die_cpumask(cpu))
|
|
cpumask_clear_cpu(cpu, topology_die_cpumask(sibling));
|
|
for_each_cpu(sibling, topology_sibling_cpumask(cpu))
|
|
cpumask_clear_cpu(cpu, topology_sibling_cpumask(sibling));
|
|
for_each_cpu(sibling, cpu_llc_shared_mask(cpu))
|
|
cpumask_clear_cpu(cpu, cpu_llc_shared_mask(sibling));
|
|
cpumask_clear(cpu_llc_shared_mask(cpu));
|
|
cpumask_clear(topology_sibling_cpumask(cpu));
|
|
cpumask_clear(topology_core_cpumask(cpu));
|
|
cpumask_clear(topology_die_cpumask(cpu));
|
|
c->cpu_core_id = 0;
|
|
c->booted_cores = 0;
|
|
cpumask_clear_cpu(cpu, cpu_sibling_setup_mask);
|
|
recompute_smt_state();
|
|
}
|
|
|
|
static void remove_cpu_from_maps(int cpu)
|
|
{
|
|
set_cpu_online(cpu, false);
|
|
cpumask_clear_cpu(cpu, cpu_callout_mask);
|
|
cpumask_clear_cpu(cpu, cpu_callin_mask);
|
|
/* was set by cpu_init() */
|
|
cpumask_clear_cpu(cpu, cpu_initialized_mask);
|
|
numa_remove_cpu(cpu);
|
|
}
|
|
|
|
void cpu_disable_common(void)
|
|
{
|
|
int cpu = smp_processor_id();
|
|
|
|
remove_siblinginfo(cpu);
|
|
|
|
/* It's now safe to remove this processor from the online map */
|
|
lock_vector_lock();
|
|
remove_cpu_from_maps(cpu);
|
|
unlock_vector_lock();
|
|
fixup_irqs();
|
|
lapic_offline();
|
|
}
|
|
|
|
int native_cpu_disable(void)
|
|
{
|
|
int ret;
|
|
|
|
ret = lapic_can_unplug_cpu();
|
|
if (ret)
|
|
return ret;
|
|
|
|
/*
|
|
* Disable the local APIC. Otherwise IPI broadcasts will reach
|
|
* it. It still responds normally to INIT, NMI, SMI, and SIPI
|
|
* messages.
|
|
*/
|
|
apic_soft_disable();
|
|
cpu_disable_common();
|
|
|
|
return 0;
|
|
}
|
|
|
|
int common_cpu_die(unsigned int cpu)
|
|
{
|
|
int ret = 0;
|
|
|
|
/* We don't do anything here: idle task is faking death itself. */
|
|
|
|
/* They ack this in play_dead() by setting CPU_DEAD */
|
|
if (cpu_wait_death(cpu, 5)) {
|
|
if (system_state == SYSTEM_RUNNING)
|
|
pr_info("CPU %u is now offline\n", cpu);
|
|
} else {
|
|
pr_err("CPU %u didn't die...\n", cpu);
|
|
ret = -1;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
void native_cpu_die(unsigned int cpu)
|
|
{
|
|
common_cpu_die(cpu);
|
|
}
|
|
|
|
void play_dead_common(void)
|
|
{
|
|
idle_task_exit();
|
|
|
|
/* Ack it */
|
|
(void)cpu_report_death();
|
|
|
|
/*
|
|
* With physical CPU hotplug, we should halt the cpu
|
|
*/
|
|
local_irq_disable();
|
|
}
|
|
|
|
static bool wakeup_cpu0(void)
|
|
{
|
|
if (smp_processor_id() == 0 && enable_start_cpu0)
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* We need to flush the caches before going to sleep, lest we have
|
|
* dirty data in our caches when we come back up.
|
|
*/
|
|
static inline void mwait_play_dead(void)
|
|
{
|
|
unsigned int eax, ebx, ecx, edx;
|
|
unsigned int highest_cstate = 0;
|
|
unsigned int highest_subcstate = 0;
|
|
void *mwait_ptr;
|
|
int i;
|
|
|
|
if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD ||
|
|
boot_cpu_data.x86_vendor == X86_VENDOR_HYGON)
|
|
return;
|
|
if (!this_cpu_has(X86_FEATURE_MWAIT))
|
|
return;
|
|
if (!this_cpu_has(X86_FEATURE_CLFLUSH))
|
|
return;
|
|
if (__this_cpu_read(cpu_info.cpuid_level) < CPUID_MWAIT_LEAF)
|
|
return;
|
|
|
|
eax = CPUID_MWAIT_LEAF;
|
|
ecx = 0;
|
|
native_cpuid(&eax, &ebx, &ecx, &edx);
|
|
|
|
/*
|
|
* eax will be 0 if EDX enumeration is not valid.
|
|
* Initialized below to cstate, sub_cstate value when EDX is valid.
|
|
*/
|
|
if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED)) {
|
|
eax = 0;
|
|
} else {
|
|
edx >>= MWAIT_SUBSTATE_SIZE;
|
|
for (i = 0; i < 7 && edx; i++, edx >>= MWAIT_SUBSTATE_SIZE) {
|
|
if (edx & MWAIT_SUBSTATE_MASK) {
|
|
highest_cstate = i;
|
|
highest_subcstate = edx & MWAIT_SUBSTATE_MASK;
|
|
}
|
|
}
|
|
eax = (highest_cstate << MWAIT_SUBSTATE_SIZE) |
|
|
(highest_subcstate - 1);
|
|
}
|
|
|
|
/*
|
|
* This should be a memory location in a cache line which is
|
|
* unlikely to be touched by other processors. The actual
|
|
* content is immaterial as it is not actually modified in any way.
|
|
*/
|
|
mwait_ptr = ¤t_thread_info()->flags;
|
|
|
|
wbinvd();
|
|
|
|
while (1) {
|
|
/*
|
|
* The CLFLUSH is a workaround for erratum AAI65 for
|
|
* the Xeon 7400 series. It's not clear it is actually
|
|
* needed, but it should be harmless in either case.
|
|
* The WBINVD is insufficient due to the spurious-wakeup
|
|
* case where we return around the loop.
|
|
*/
|
|
mb();
|
|
clflush(mwait_ptr);
|
|
mb();
|
|
__monitor(mwait_ptr, 0, 0);
|
|
mb();
|
|
__mwait(eax, 0);
|
|
/*
|
|
* If NMI wants to wake up CPU0, start CPU0.
|
|
*/
|
|
if (wakeup_cpu0())
|
|
start_cpu0();
|
|
}
|
|
}
|
|
|
|
void hlt_play_dead(void)
|
|
{
|
|
if (__this_cpu_read(cpu_info.x86) >= 4)
|
|
wbinvd();
|
|
|
|
while (1) {
|
|
native_halt();
|
|
/*
|
|
* If NMI wants to wake up CPU0, start CPU0.
|
|
*/
|
|
if (wakeup_cpu0())
|
|
start_cpu0();
|
|
}
|
|
}
|
|
|
|
void native_play_dead(void)
|
|
{
|
|
play_dead_common();
|
|
tboot_shutdown(TB_SHUTDOWN_WFS);
|
|
|
|
mwait_play_dead(); /* Only returns on failure */
|
|
if (cpuidle_play_dead())
|
|
hlt_play_dead();
|
|
}
|
|
|
|
#else /* ... !CONFIG_HOTPLUG_CPU */
|
|
int native_cpu_disable(void)
|
|
{
|
|
return -ENOSYS;
|
|
}
|
|
|
|
void native_cpu_die(unsigned int cpu)
|
|
{
|
|
/* We said "no" in __cpu_disable */
|
|
BUG();
|
|
}
|
|
|
|
void native_play_dead(void)
|
|
{
|
|
BUG();
|
|
}
|
|
|
|
#endif
|
|
|
|
/*
|
|
* APERF/MPERF frequency ratio computation.
|
|
*
|
|
* The scheduler wants to do frequency invariant accounting and needs a <1
|
|
* ratio to account for the 'current' frequency, corresponding to
|
|
* freq_curr / freq_max.
|
|
*
|
|
* Since the frequency freq_curr on x86 is controlled by micro-controller and
|
|
* our P-state setting is little more than a request/hint, we need to observe
|
|
* the effective frequency 'BusyMHz', i.e. the average frequency over a time
|
|
* interval after discarding idle time. This is given by:
|
|
*
|
|
* BusyMHz = delta_APERF / delta_MPERF * freq_base
|
|
*
|
|
* where freq_base is the max non-turbo P-state.
|
|
*
|
|
* The freq_max term has to be set to a somewhat arbitrary value, because we
|
|
* can't know which turbo states will be available at a given point in time:
|
|
* it all depends on the thermal headroom of the entire package. We set it to
|
|
* the turbo level with 4 cores active.
|
|
*
|
|
* Benchmarks show that's a good compromise between the 1C turbo ratio
|
|
* (freq_curr/freq_max would rarely reach 1) and something close to freq_base,
|
|
* which would ignore the entire turbo range (a conspicuous part, making
|
|
* freq_curr/freq_max always maxed out).
|
|
*
|
|
* Setting freq_max to anything less than the 1C turbo ratio makes the ratio
|
|
* freq_curr / freq_max to eventually grow >1, in which case we clip it to 1.
|
|
*/
|
|
|
|
DEFINE_STATIC_KEY_FALSE(arch_scale_freq_key);
|
|
|
|
static DEFINE_PER_CPU(u64, arch_prev_aperf);
|
|
static DEFINE_PER_CPU(u64, arch_prev_mperf);
|
|
static u64 arch_max_freq_ratio = SCHED_CAPACITY_SCALE;
|
|
|
|
static bool turbo_disabled(void)
|
|
{
|
|
u64 misc_en;
|
|
int err;
|
|
|
|
err = rdmsrl_safe(MSR_IA32_MISC_ENABLE, &misc_en);
|
|
if (err)
|
|
return false;
|
|
|
|
return (misc_en & MSR_IA32_MISC_ENABLE_TURBO_DISABLE);
|
|
}
|
|
|
|
#include <asm/cpu_device_id.h>
|
|
#include <asm/intel-family.h>
|
|
|
|
#define ICPU(model) \
|
|
{X86_VENDOR_INTEL, 6, model, X86_FEATURE_APERFMPERF, 0}
|
|
|
|
static const struct x86_cpu_id has_knl_turbo_ratio_limits[] = {
|
|
ICPU(INTEL_FAM6_XEON_PHI_KNL),
|
|
ICPU(INTEL_FAM6_XEON_PHI_KNM),
|
|
{}
|
|
};
|
|
|
|
static const struct x86_cpu_id has_skx_turbo_ratio_limits[] = {
|
|
ICPU(INTEL_FAM6_SKYLAKE_X),
|
|
{}
|
|
};
|
|
|
|
static const struct x86_cpu_id has_glm_turbo_ratio_limits[] = {
|
|
ICPU(INTEL_FAM6_ATOM_GOLDMONT),
|
|
ICPU(INTEL_FAM6_ATOM_GOLDMONT_D),
|
|
ICPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS),
|
|
{}
|
|
};
|
|
|
|
static bool core_set_max_freq_ratio(void)
|
|
{
|
|
u64 base_freq, turbo_freq;
|
|
int err;
|
|
|
|
err = rdmsrl_safe(MSR_PLATFORM_INFO, &base_freq);
|
|
if (err)
|
|
return false;
|
|
|
|
err = rdmsrl_safe(MSR_TURBO_RATIO_LIMIT, &turbo_freq);
|
|
if (err)
|
|
return false;
|
|
|
|
base_freq = (base_freq >> 8) & 0xFF; /* max P state */
|
|
turbo_freq = (turbo_freq >> 24) & 0xFF; /* 4C turbo */
|
|
|
|
arch_max_freq_ratio = div_u64(turbo_freq * SCHED_CAPACITY_SCALE,
|
|
base_freq);
|
|
return true;
|
|
}
|
|
|
|
static bool intel_set_max_freq_ratio(void)
|
|
{
|
|
/*
|
|
* TODO: add support for:
|
|
*
|
|
* - Xeon Gold/Platinum
|
|
* - Xeon Phi (KNM, KNL)
|
|
* - Atom Goldmont
|
|
* - Atom Silvermont
|
|
*/
|
|
|
|
if (x86_match_cpu(has_skx_turbo_ratio_limits) ||
|
|
x86_match_cpu(has_knl_turbo_ratio_limits) ||
|
|
x86_match_cpu(has_glm_turbo_ratio_limits))
|
|
return false;
|
|
|
|
if (turbo_disabled() || core_set_max_freq_ratio())
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
static void init_counter_refs(void *arg)
|
|
{
|
|
u64 aperf, mperf;
|
|
|
|
rdmsrl(MSR_IA32_APERF, aperf);
|
|
rdmsrl(MSR_IA32_MPERF, mperf);
|
|
|
|
this_cpu_write(arch_prev_aperf, aperf);
|
|
this_cpu_write(arch_prev_mperf, mperf);
|
|
}
|
|
|
|
static void init_freq_invariance(void)
|
|
{
|
|
bool ret = false;
|
|
|
|
if (smp_processor_id() != 0 || !boot_cpu_has(X86_FEATURE_APERFMPERF))
|
|
return;
|
|
|
|
if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
|
|
ret = intel_set_max_freq_ratio();
|
|
|
|
if (ret) {
|
|
on_each_cpu(init_counter_refs, NULL, 1);
|
|
static_branch_enable(&arch_scale_freq_key);
|
|
} else {
|
|
pr_debug("Couldn't determine max cpu frequency, necessary for scale-invariant accounting.\n");
|
|
}
|
|
}
|
|
|
|
DEFINE_PER_CPU(unsigned long, arch_freq_scale) = SCHED_CAPACITY_SCALE;
|
|
|
|
void arch_scale_freq_tick(void)
|
|
{
|
|
u64 freq_scale;
|
|
u64 aperf, mperf;
|
|
u64 acnt, mcnt;
|
|
|
|
if (!arch_scale_freq_invariant())
|
|
return;
|
|
|
|
rdmsrl(MSR_IA32_APERF, aperf);
|
|
rdmsrl(MSR_IA32_MPERF, mperf);
|
|
|
|
acnt = aperf - this_cpu_read(arch_prev_aperf);
|
|
mcnt = mperf - this_cpu_read(arch_prev_mperf);
|
|
if (!mcnt)
|
|
return;
|
|
|
|
this_cpu_write(arch_prev_aperf, aperf);
|
|
this_cpu_write(arch_prev_mperf, mperf);
|
|
|
|
acnt <<= 2*SCHED_CAPACITY_SHIFT;
|
|
mcnt *= arch_max_freq_ratio;
|
|
|
|
freq_scale = div64_u64(acnt, mcnt);
|
|
|
|
if (freq_scale > SCHED_CAPACITY_SCALE)
|
|
freq_scale = SCHED_CAPACITY_SCALE;
|
|
|
|
this_cpu_write(arch_freq_scale, freq_scale);
|
|
}
|