Skip to contentSkip to conversation

perf/x86: Trivial cleanups

PATCH New Alexander Shishkin 2 participants 5 messages Jun 24, 2015 – Aug 4, 2015

Subsystems (2)
lore
Share & tools
lore

Alexander Shishkin

author reviewer
#0 lore raw

cover perf/x86: Trivial cleanups

Hi Peter and Ingo,

Here are two simple cleanups from my initial AUX/PT/BTS patchset.

Alexander Shishkin (2):
perf/x86/intel/bts: Cleanup: drop redundant declarations perf/x86/intel: Kill off intel_pmu_needs_lbr_smpl for good

 arch/x86/kernel/cpu/perf_event.h           | 14 --------------
 arch/x86/kernel/cpu/perf_event_intel_bts.c |  3 ---
 2 files changed, 17 deletions(-)
Signature · 1 line
2.1.4
author reviewer
#1 lore raw

PATCH 1/2 perf/x86/intel/bts: Cleanup: drop redundant declarations

Both intel_pmu_enable_bts() and intel_pmu_disable_bts() are in perf_event.h header file, no need to have them declared again in the driver.

---
 arch/x86/kernel/cpu/perf_event_intel_bts.c | 3 ---
 1 file changed, 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_bts.c +0 -3
index 7795f3f8b1..57479ed49e 100644
@@ -62,9 +62,6 @@ struct bts_buffer {
 
 struct pmu bts_pmu;
 
-void intel_pmu_enable_bts(u64 config);
-void intel_pmu_disable_bts(void);
-
 static size_t buf_size(struct page *page)
 {
 	return 1 << (PAGE_SHIFT + page_private(page));
Signature · 1 line
2.1.4
#2 lore raw

[tip:perf/core] perf/x86/intel/bts: Drop redundant declarations

perf/x86/intel/bts: Drop redundant declarations
Commit-ID:  e9b3bd379c283577e102529bfb22484238be7c91
Gitweb:     http://git.kernel.org/tip/e9b3bd379c283577e102529bfb22484238be7c91
Author:     Alexander Shishkin <[email protected]>
AuthorDate: Wed, 24 Jun 2015 13:05:48 +0300
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 4 Aug 2015 10:16:53 +0200

perf/x86/intel/bts: Drop redundant declarations

Both intel_pmu_enable_bts() and intel_pmu_disable_bts() are in perf_event.h header file, no need to have them declared again in the driver.

---
 arch/x86/kernel/cpu/perf_event_intel_bts.c | 3 ---
 1 file changed, 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_bts.c +0 -3
index 43dd672..54690e8 100644
@@ -62,9 +62,6 @@ struct bts_buffer {
 
 struct pmu bts_pmu;
 
-void intel_pmu_enable_bts(u64 config);
-void intel_pmu_disable_bts(void);
-
 static size_t buf_size(struct page *page)
 {
 	return 1 << (PAGE_SHIFT + page_private(page));
author reviewer
#3 lore raw

PATCH 2/2 perf/x86/intel: Kill off intel_pmu_needs_lbr_smpl for good

In reply to Alexander Shishkin

The x86_lbr_exclusive commit (4807034248be "perf/x86: Mark Intel PT and LBR/BTS as mutually exclusive") mistakenly moved intel_pmu_needs_lbr_smpl() to perf_event.h, while another commit (a46a2300019 "perf: Simplify the branch stack check") removed it in favor of needs_branch_stack().

This patch gets rid of intel_pmu_needs_lbr_smpl() for good.

---
 arch/x86/kernel/cpu/perf_event.h | 14 --------------
 1 file changed, 14 deletions(-)
arch/x86/kernel/cpu/perf_event.h +0 -14
index 06a9ab79d6..0cd854671b 100644
@@ -794,20 +794,6 @@ static inline int amd_pmu_init(void)
 
 #ifdef CONFIG_CPU_SUP_INTEL
 
-static inline bool intel_pmu_needs_lbr_smpl(struct perf_event *event)
-{
-	/* user explicitly requested branch sampling */
-	if (has_branch_stack(event))
-		return true;
-
-	/* implicit branch sampling to correct PEBS skid */
-	if (x86_pmu.intel_cap.pebs_trap && event->attr.precise_ip > 1 &&
-	    x86_pmu.intel_cap.pebs_format < 2)
-		return true;
-
-	return false;
-}
-
 static inline bool intel_pmu_has_bts(struct perf_event *event)
 {
 	if (event->attr.config == PERF_COUNT_HW_BRANCH_INSTRUCTIONS &&
Signature · 1 line
2.1.4
#4 lore raw

[tip:perf/core] perf/x86/intel/lbr: Kill off intel_pmu_needs_lbr_smpl for good

perf/x86/intel/lbr: Kill off intel_pmu_needs_lbr_smpl for good
Commit-ID:  c749b3e96398fcc39286267b72fb8b85c0f757ea
Gitweb:     http://git.kernel.org/tip/c749b3e96398fcc39286267b72fb8b85c0f757ea
Author:     Alexander Shishkin <[email protected]>
AuthorDate: Wed, 24 Jun 2015 13:05:49 +0300
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 4 Aug 2015 10:16:53 +0200

perf/x86/intel/lbr: Kill off intel_pmu_needs_lbr_smpl for good

The x86_lbr_exclusive commit (4807034248be "perf/x86: Mark Intel PT and LBR/BTS as mutually exclusive") mistakenly moved intel_pmu_needs_lbr_smpl() to perf_event.h, while another commit (a46a2300019 "perf: Simplify the branch stack check") removed it in favor of needs_branch_stack().

This patch gets rid of intel_pmu_needs_lbr_smpl() for good.

---
 arch/x86/kernel/cpu/perf_event.h | 14 --------------
 1 file changed, 14 deletions(-)
arch/x86/kernel/cpu/perf_event.h +0 -14
index 3e7fd27..3474cf2 100644
@@ -808,20 +808,6 @@ static inline int amd_pmu_init(void)
 
 #ifdef CONFIG_CPU_SUP_INTEL
 
-static inline bool intel_pmu_needs_lbr_smpl(struct perf_event *event)
-{
-	/* user explicitly requested branch sampling */
-	if (has_branch_stack(event))
-		return true;
-
-	/* implicit branch sampling to correct PEBS skid */
-	if (x86_pmu.intel_cap.pebs_trap && event->attr.precise_ip > 1 &&
-	    x86_pmu.intel_cap.pebs_format < 2)
-		return true;
-
-	return false;
-}
-
 static inline bool intel_pmu_has_bts(struct perf_event *event)
 {
 	if (event->attr.config == PERF_COUNT_HW_BRANCH_INSTRUCTIONS &&