[GIT PULL] x86/cache for v5.11

[GIT PULL] x86/cache for v5.11

[Borislav Petkov]

Hi Linus,

please pull the resource control updates accumulated for v5.11. This
branch conflicts with yours due to previous urgent fixes going in
earlier and the merge conflict resolution should look like this:

---
diff --cc arch/x86/kernel/cpu/resctrl/monitor.c
index a98519a3a2e6,622073ffa715..000000000000
--- a/arch/x86/kernel/cpu/resctrl/monitor.c
+++ b/arch/x86/kernel/cpu/resctrl/monitor.c
@@@ -279,7 -343,8 +343,7 @@@ static void mbm_bw_count(u32 rmid, stru
  		return;
  
  	chunks = mbm_overflow_count(m->prev_bw_msr, tval, rr->r->mbm_width);
- 	cur_bw = (chunks * r->mon_scale) >> 20;
 -	m->chunks += chunks;
+ 	cur_bw = (get_corrected_mbm_count(rmid, chunks) * r->mon_scale) >> 20;
  
  	if (m->delta_comp)
  		m->delta_bw = abs(cur_bw - m->prev_bw);
---

Please pull,
thx.

---

The following changes since commit b65054597872ce3aefbc6a666385eabdf9e288da:

  Linux 5.10-rc6 (2020-11-29 15:50:50 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/x86_cache_for_v5.11

for you to fetch changes up to 19eb86a72df50adcf554f234469bb5b7209b7640:

  x86/resctrl: Clean up unused function parameter in rmdir path (2020-12-01 18:06:35 +0100)

----------------------------------------------------------------
- Add logic to correct MBM total and local values fixing errata SKX99 and BDF102
(Fenghua Yu)

- Cleanups.

----------------------------------------------------------------
Borislav Petkov (1):
      Merge tag 'v5.10-rc6' into x86/cache

Fenghua Yu (2):
      Documentation/x86: Rename resctrl_ui.rst and add two errata to the file
      x86/resctrl: Correct MBM total and local values

Rikard Falkeborn (1):
      x86/resctrl: Constify kernfs_ops

Xiaochen Shen (1):
      x86/resctrl: Clean up unused function parameter in rmdir path

 Documentation/x86/index.rst                       |  2 +-
 Documentation/x86/{resctrl_ui.rst => resctrl.rst} | 93 +++++++++++++++++++++++
 arch/x86/kernel/cpu/resctrl/core.c                |  4 +
 arch/x86/kernel/cpu/resctrl/internal.h            |  3 +-
 arch/x86/kernel/cpu/resctrl/monitor.c             | 82 +++++++++++++++++++-
 arch/x86/kernel/cpu/resctrl/rdtgroup.c            | 21 +++--
 6 files changed, 189 insertions(+), 16 deletions(-)
 rename Documentation/x86/{resctrl_ui.rst => resctrl.rst} (90%)

-- 
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

Re: [GIT PULL] x86/cache for v5.11

[pr-tracker-bot]

The pull request you sent on Mon, 14 Dec 2020 16:35:20 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/x86_cache_for_v5.11

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8ba27ae36b416a1507e783dbee4bb521fd6bb519

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html