Merge tag 'x86_cache_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 resource control updates from Borislav Petkov:

 - Extend the resctrl machinery to support telemetry monitoring on
   Intel (Tony Luck)

   The practical usage of this is being able to tell how much energy or
   how much work can be attributed to a group of tasks tracked under a
   single idenitifier. Prepend this work with proper refactoring of
   resctrl domains handling code.

* tag 'x86_cache_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (30 commits)
  x86,fs/resctrl: Update documentation for telemetry events
  x86/resctrl: Enable RDT_RESOURCE_PERF_PKG
  fs/resctrl: Move RMID initialization to first mount
  x86,fs/resctrl: Compute number of RMIDs as minimum across resources
  fs/resctrl: Move allocation/free of closid_num_dirty_rmid[]
  x86/resctrl: Handle number of RMIDs supported by RDT_RESOURCE_PERF_PKG
  x86/resctrl: Add energy/perf choices to rdt boot option
  x86,fs/resctrl: Handle domain creation/deletion for RDT_RESOURCE_PERF_PKG
  fs/resctrl: Refactor rmdir_mondata_subdir_allrdtgrp()
  fs/resctrl: Refactor mkdir_mondata_subdir()
  x86/resctrl: Read telemetry events
  x86/resctrl: Find and enable usable telemetry events
  x86,fs/resctrl: Add architectural event pointer
  x86,fs/resctrl: Fill in details of events for performance and energy GUIDs
  x86/resctrl: Discover hardware telemetry events
  fs/resctrl: Emphasize that L3 monitoring resource is required for summing domains
  x86,fs/resctrl: Add and initialize a resource for package scope monitoring
  x86,fs/resctrl: Add an architectural hook called for first mount
  x86,fs/resctrl: Support binary fixed point event counters
  x86,fs/resctrl: Handle events that can be read from any CPU
  ...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc Documentation/filesystems/resctrl.rst
index 5b27321f2313f83862bda1df22ec30d1cd256f20,45dde877412881e5aa3bc91ac3c3e59451f6944c..ba609f8d4de57d6edf714d9c5076c1bdf08f384b
--- 1/Documentation/filesystems/resctrl.rst
--- 2/Documentation/filesystems/resctrl.rst
+++ b/Documentation/filesystems/resctrl.rst
@@@ -482,8 -481,26 +481,26 @@@ with the following files
  "max_threshold_occupancy":
                Read/write file provides the largest value (in
                bytes) at which a previously used LLC_occupancy
 -              counter can be considered for re-use.
 +              counter can be considered for reuse.
  
+ If telemetry monitoring is available there will be a "PERF_PKG_MON" directory
+ with the following files:
+ 
+ "num_rmids":
+               The number of RMIDs for telemetry monitoring events.
+ 
+               On Intel resctrl will not enable telemetry events if the number of
+               RMIDs that can be tracked concurrently is lower than the total number
+               of RMIDs supported. Telemetry events can be force-enabled with the
+               "rdt=" kernel parameter, but this may reduce the number of
+               monitoring groups that can be created.
+ 
+ "mon_features":
+               Lists the telemetry monitoring events that are enabled on this system.
+ 
+ The upper bound for how many "CTRL_MON" + "MON" can be created
+ is the smaller of the L3_MON and PERF_PKG_MON "num_rmids" values.
+ 
  Finally, in the top level of the "info" directory there is a file
  named "last_cmd_status". This is reset with every "command" issued
  via the file system (making new directories or writing to any of the

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/cpu/resctrl/core.c
Simple merge

diff --cc arch/x86/kernel/cpu/resctrl/internal.h
Simple merge