Skip to content

x86: make PAT and MTRR independent from each other

Juergen Gross linux-pm lkml 5 versions – Applied

Status from this message: The following commit has been merged into the x86/cpu branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest16 patches 16 repliesApplied
  2. v416 patches 21 repliesApplied
  3. v310 patches 30 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v210 patches11 repliesApplied
v13 patches38 repliesSuperseded

Changes in v5 from the cover letter

- addressed comments

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/16x86/mtrr: add comment for set_mtrr_state() serializationarch/x86/kernel/cpu/mtrr/generic.c+4 -10 replies
2/16x86/mtrr: remove unused cyrix_set_all() functionarch/x86/kernel/cpu/mtrr/cyrix.c+0 -340 replies
3/16x86/mtrr: replace use_intel() with a local flagarch/x86/include/asm/cacheinfo.h arch/x86/kernel/cpu/cacheinfo.c arch/x86/kernel/cpu/mtrr/generic.c +2 more+21 -180 replies
4/16x86/mtrr: rename prepare_set() and post_set()arch/x86/include/asm/cacheinfo.h arch/x86/kernel/cpu/mtrr/generic.c+24 -220 replies
5/16x86/mtrr: split MTRR specific handling from cache dis/enablingarch/x86/include/asm/mtrr.h arch/x86/kernel/cpu/mtrr/generic.c+23 -70 replies
6/16x86: move some code out of arch/x86/kernel/cpu/mtrrarch/x86/kernel/cpu/cacheinfo.c arch/x86/kernel/cpu/mtrr/generic.c+77 -740 replies
7/16x86/mtrr: Disentangle MTRR init from PAT init.arch/x86/include/asm/cacheinfo.h arch/x86/include/asm/mtrr.h arch/x86/kernel/cpu/cacheinfo.c +1 more+22 -130 replies
8/16x86/mtrr: remove set_all callback from struct mtrr_opsarch/x86/kernel/cpu/mtrr/generic.c arch/x86/kernel/cpu/mtrr/mtrr.c arch/x86/kernel/cpu/mtrr/mtrr.h+5 -80 replies
9/16x86/mtrr: simplify mtrr_bp_init()arch/x86/kernel/cpu/mtrr/generic.c arch/x86/kernel/cpu/mtrr/mtrr.c arch/x86/kernel/cpu/mtrr/mtrr.h+1 -200 replies
10/16x86/mtrr: get rid of __mtrr_enabled boolarch/x86/kernel/cpu/mtrr/mtrr.c+5 -80 replies
11/16x86/mtrr: let cache_aps_delayed_init replace mtrr_aps_delayed_initarch/x86/include/asm/cacheinfo.h arch/x86/include/asm/mtrr.h arch/x86/kernel/cpu/cacheinfo.c +2 more+22 -170 replies
12/16x86/mtrr: add a stop_machine() handler calling only cache_cpu_init()arch/x86/include/asm/cacheinfo.h arch/x86/include/asm/mtrr.h arch/x86/kernel/cpu/cacheinfo.c +5 more+74 -990 replies
13/16x86: decouple PAT and MTRR handlingarch/x86/include/asm/memtype.h arch/x86/kernel/cpu/cacheinfo.c arch/x86/kernel/cpu/mtrr/mtrr.c +2 more+57 -12811 replies
14/16x86: switch cache_ap_init() to hotplug callbackarch/x86/include/asm/cacheinfo.h arch/x86/kernel/cpu/cacheinfo.c arch/x86/kernel/cpu/common.c +2 more+16 -70 replies
15/16x86: do MTRR/PAT setup on all secondary CPUs in parallelarch/x86/include/asm/cacheinfo.h arch/x86/include/asm/mtrr.h arch/x86/kernel/cpu/cacheinfo.c +1 more+45 -460 replies
16/16x86/mtrr: simplify mtrr_ops initializationarch/x86/kernel/cpu/mtrr/amd.c arch/x86/kernel/cpu/mtrr/centaur.c arch/x86/kernel/cpu/mtrr/cyrix.c +2 more+10 -540 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v5 yet.

Read the v5 thread

Cover letter [PATCH v5 00/16] x86: make PAT and MTRR independent from each other

Today PAT can't be used without MTRR being available, unless MTRR is at least configured via CONFIG_MTRR and the system is running as Xen PV guest. In this case PAT is automatically available via the hypervisor, but the PAT MSR can't be modified by the kernel and MTRR is disabled.

The same applies to a kernel built with no MTRR support: it won't allow to use the PAT MSR, even if there is no technical reason for that, other than setting up PAT on all CPUs the same way (which is a requirement of the processor's cache management) is relying on some MTRR specific code.

Fix all of that by:

- moving the function needed by PAT from MTRR specific code one level up
- reworking the init sequences of MTRR and PAT to be more similar to each other without calling PAT from MTRR code
- removing the dependency of PAT on MTRR

There is some more cleanup done reducing code size.

Note that patches 1+2 have already been applied to tip.git x86/cpu. They are included in this series only for reference.

Changes in V5:
- addressed comments

Changes in V4:
- new patches 10, 14, 15, 16
- split up old patch 4 into 3 patches
- addressed comments

Changes in V3:
- replace patch 1 by just adding a comment

Changes in V2:
- complete rework of the patches based on comments by Boris Petkov
- added several patches to the series

Juergen Gross (16):
x86/mtrr: add comment for set_mtrr_state() serialization x86/mtrr: remove unused cyrix_set_all() function x86/mtrr: replace use_intel() with a local flag
x86/mtrr: rename prepare_set() and post_set()
x86/mtrr: split MTRR specific handling from cache dis/enabling
x86: move some code out of arch/x86/kernel/cpu/mtrr x86/mtrr: Disentangle MTRR init from PAT init.
x86/mtrr: remove set_all callback from struct mtrr_ops x86/mtrr: simplify mtrr_bp_init()
x86/mtrr: get rid of __mtrr_enabled bool
x86/mtrr: let cache_aps_delayed_init replace mtrr_aps_delayed_init x86/mtrr: add a stop_machine() handler calling only cache_cpu_init()
x86: decouple PAT and MTRR handling
x86: switch cache_ap_init() to hotplug callback
x86: do MTRR/PAT setup on all secondary CPUs in parallel x86/mtrr: simplify mtrr_ops initialization

 arch/x86/include/asm/cacheinfo.h   |  19 ++++
 arch/x86/include/asm/memtype.h     |   5 +-
 arch/x86/include/asm/mtrr.h        |  17 +--
 arch/x86/kernel/cpu/cacheinfo.c    | 173 +++++++++++++++++++++++++++++
 arch/x86/kernel/cpu/common.c       |   2 +-
 arch/x86/kernel/cpu/mtrr/amd.c     |   8 +-
 arch/x86/kernel/cpu/mtrr/centaur.c |   8 +-
 arch/x86/kernel/cpu/mtrr/cyrix.c   |  42 +------
 arch/x86/kernel/cpu/mtrr/generic.c | 127 ++++-----------------
 arch/x86/kernel/cpu/mtrr/mtrr.c    | 171 ++++------------------------
 arch/x86/kernel/cpu/mtrr/mtrr.h    |  15 +--
 arch/x86/kernel/setup.c            |  14 +--
 arch/x86/kernel/smpboot.c          |   9 +-
 arch/x86/mm/pat/memtype.c          | 152 +++++++++----------------
 arch/x86/power/cpu.c               |   3 +-
 include/linux/cpuhotplug.h         |   1 +
 16 files changed, 308 insertions(+), 458 deletions(-)
Signature · 1 line
2.35.3