History

Merge tag 'perf_urgent_for_v5.18_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Borislav Petkov: - Add Sapphire Rapids CPU support - Fix a perf vmalloc-ed buffer mapping error (PERF_USE_VMALLOC in use) * tag 'perf_urgent_for_v5.18_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/cstate: Add SAPPHIRERAPIDS_X CPU support perf/core: Fix perf_mmap fail when CONFIG_PERF_USE_VMALLOC enabled

Linus Torvalds committed 4 years ago

Commit f48ffef2 parents b877ca4 528c9f14 files · +10 −9Browse files

Unified · Split

4 files
  1. arch/x86/events/intel/cstate.c +4 −3
  2. kernel/events/core.c +1 −1
  3. kernel/events/internal.h +5 −0
  4. kernel/events/ring_buffer.c +0 −5
arch/x86/events/intel/cstate.c+4−3
@@ -51,7 +51,7 @@ · 50 unmodified lines
51 * perf code: 0x0251 * perf code: 0x02
52 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,52 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
53 * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,53 * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,
54 * TGL,TNT,RKL,ADL,RPL54 * TGL,TNT,RKL,ADL,RPL,SPR
55 * Scope: Core55 * Scope: Core
56 * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter56 * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter
57 * perf code: 0x0357 * perf code: 0x03
@@ -62,7 +62,7 @@ · 4 unmodified lines
62 * perf code: 0x0062 * perf code: 0x00
63 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,63 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
64 * KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,64 * KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
65 * RPL65 * RPL,SPR
66 * Scope: Package (physical package)66 * Scope: Package (physical package)
67 * MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter.67 * MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter.
68 * perf code: 0x0168 * perf code: 0x01
@@ -74,7 +74,7 @@ · 5 unmodified lines
74 * perf code: 0x0274 * perf code: 0x02
75 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,75 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
76 * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,76 * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,
77 * TGL,TNT,RKL,ADL,RPL77 * TGL,TNT,RKL,ADL,RPL,SPR
78 * Scope: Package (physical package)78 * Scope: Package (physical package)
79 * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter.79 * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter.
80 * perf code: 0x0380 * perf code: 0x03
@@ -675,6 +675,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = { · 594 unmodified lines
675 X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &icl_cstates),675 X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &icl_cstates),
676 X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &icx_cstates),676 X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &icx_cstates),
677 X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, &icx_cstates),677 X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, &icx_cstates),
678 X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &icx_cstates),
678 679
679 X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &icl_cstates),680 X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &icl_cstates),
680 X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &icl_cstates),681 X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &icl_cstates),
kernel/events/core.c+1−1
@@ -6247,7 +6247,7 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma) · 6246 unmodified lines
6247again:6247again:
6248 mutex_lock(&event->mmap_mutex);6248 mutex_lock(&event->mmap_mutex);
6249 if (event->rb) {6249 if (event->rb) {
6250 if (event->rb->nr_pages != nr_pages) {6250 if (data_page_nr(event->rb) != nr_pages) {
6251 ret = -EINVAL;6251 ret = -EINVAL;
6252 goto unlock;6252 goto unlock;
6253 }6253 }
kernel/events/internal.h+5−0
@@ -116,6 +116,11 @@ static inline int page_order(struct perf_buffer *rb) · 115 unmodified lines
116}116}
117#endif117#endif
118 118
119static inline int data_page_nr(struct perf_buffer *rb)
120{
121 return rb->nr_pages << page_order(rb);
122}
123
119static inline unsigned long perf_data_size(struct perf_buffer *rb)124static inline unsigned long perf_data_size(struct perf_buffer *rb)
120{125{
121 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));126 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
kernel/events/ring_buffer.c+0−5
@@ -859,11 +859,6 @@ void rb_free(struct perf_buffer *rb) · 858 unmodified lines
859}859}
860 860
861#else861#else
862static int data_page_nr(struct perf_buffer *rb)
863{
864 return rb->nr_pages << page_order(rb);
865}
866
867static struct page *862static struct page *
868__perf_mmap_to_page(struct perf_buffer *rb, unsigned long pgoff)863__perf_mmap_to_page(struct perf_buffer *rb, unsigned long pgoff)
869{864{