Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1329248 > unrolled thread

[PATCH 0/5] perf: Sanitize perf directory structure, p1

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/5] perf: Sanitize perf directory structure, p1 Borislav Petkov <bp@alien8.de> - 2016-02-08 17:10 +0100
    [PATCH 2/5] x86/events: Move perf_event_amd.c Borislav Petkov <bp@alien8.de> - 2016-02-08 17:20 +0100
    [PATCH 1/5] x86/events: Move perf_event.c Borislav Petkov <bp@alien8.de> - 2016-02-08 17:20 +0100
    [PATCH 5/5] x86/events: Move perf_event_amd_uncore.c Borislav Petkov <bp@alien8.de> - 2016-02-08 17:20 +0100

#1329248 — [PATCH 0/5] perf: Sanitize perf directory structure, p1

From: Borislav Petkov <bp@suse.de>

Hi,

here's v1 ontop of rc3 + tip/master, i.e., hopefully I've picked up all
relevant branches and rebased my pile ontop so that they don't break any
patches in-flight.

Please apply,
thanks.

Changelog:

v0:

so what better time to do that fun than during the holidays when no one
else is producing patches. :-)

Anyway, here's a part one conversion of the AMD perf events facilities.
Directory structure looks like this:

arch/x86/events/
|-- amd
|   |-- core.c
|   |-- ibs.c
|   |-- iommu.c
|   |-- iommu.h
|   `-- uncore.c
|-- core.c
`-- Makefile

and I've kept the churn at a mininum. Holler if something's not kosher.


Borislav Petkov (5):
  x86/events: Move perf_event.c
  x86/events: Move perf_event_amd.c
  x86/events: Move perf_event_amd_ibs.c
  x86/events: Move perf_event_amd_iommu.*
  x86/events: Move perf_event_amd_uncore.c

 arch/x86/Kbuild                                                   | 3 ++-
 arch/x86/events/Makefile                                          | 7 +++++++
 arch/x86/{kernel/cpu/perf_event_amd.c => events/amd/core.c}       | 2 +-
 arch/x86/{kernel/cpu/perf_event_amd_ibs.c => events/amd/ibs.c}    | 2 +-
 .../x86/{kernel/cpu/perf_event_amd_iommu.c => events/amd/iommu.c} | 4 ++--
 .../x86/{kernel/cpu/perf_event_amd_iommu.h => events/amd/iommu.h} | 0
 .../{kernel/cpu/perf_event_amd_uncore.c => events/amd/uncore.c}   | 0
 arch/x86/{kernel/cpu/perf_event.c => events/core.c}               | 2 +-
 arch/x86/kernel/cpu/Makefile                                      | 8 +-------
 9 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 arch/x86/events/Makefile
 rename arch/x86/{kernel/cpu/perf_event_amd.c => events/amd/core.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_amd_ibs.c => events/amd/ibs.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_amd_iommu.c => events/amd/iommu.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_amd_iommu.h => events/amd/iommu.h} (100%)
 rename arch/x86/{kernel/cpu/perf_event_amd_uncore.c => events/amd/uncore.c} (100%)
 rename arch/x86/{kernel/cpu/perf_event.c => events/core.c} (99%)

-- 
2.3.5

[toc] | [next] | [standalone]

#1329257 — [PATCH 2/5] x86/events: Move perf_event_amd.c

From: Borislav Petkov <bp@suse.de>

We distribute those in vendor subdirs, starting with .../events/amd/.

Signed-off-by: Borislav Petkov <bp@suse.de>
---
 arch/x86/events/Makefile                                    | 2 ++
 arch/x86/{kernel/cpu/perf_event_amd.c => events/amd/core.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_amd.c => events/amd/core.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 3fad3ce1bbab..e0560b6dd77b 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -1 +1,3 @@
 obj-y			+= core.o
+
+obj-$(CONFIG_CPU_SUP_AMD)               += amd/core.o
diff --git a/arch/x86/kernel/cpu/perf_event_amd.c b/arch/x86/events/amd/core.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_amd.c
rename to arch/x86/events/amd/core.c
index 58610539b048..51b16583679c 100644
--- a/arch/x86/kernel/cpu/perf_event_amd.c
+++ b/arch/x86/events/amd/core.c
@@ -5,7 +5,7 @@
 #include <linux/slab.h>
 #include <asm/apicdef.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 static __initconst const u64 amd_hw_cache_event_ids
 				[PERF_COUNT_HW_CACHE_MAX]
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 8cbc41b63447..2ba0e37acb2d 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -31,7 +31,7 @@ obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
 obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
 
 ifdef CONFIG_PERF_EVENTS
-obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_amd.o perf_event_amd_uncore.o
+obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_amd_uncore.o
 ifdef CONFIG_AMD_IOMMU
 obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_amd_iommu.o
 endif
-- 
2.3.5

[toc] | [prev] | [next] | [standalone]

#1329262 — [PATCH 1/5] x86/events: Move perf_event.c

From: Borislav Petkov <bp@suse.de>

Also, keep the churn at minimum by adjusting the include "perf_event.h"
when each file gets moved.

Signed-off-by: Borislav Petkov <bp@suse.de>
---
 arch/x86/Kbuild                                     | 3 ++-
 arch/x86/events/Makefile                            | 1 +
 arch/x86/{kernel/cpu/perf_event.c => events/core.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                        | 2 --
 4 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 arch/x86/events/Makefile
 rename arch/x86/{kernel/cpu/perf_event.c => events/core.c} (99%)

diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild
index 1538562cc720..eb3abf8ac44e 100644
--- a/arch/x86/Kbuild
+++ b/arch/x86/Kbuild
@@ -1,6 +1,7 @@
-
 obj-y += entry/
 
+obj-$(CONFIG_PERF_EVENTS) += events/
+
 obj-$(CONFIG_KVM) += kvm/
 
 # Xen paravirtualization support
diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
new file mode 100644
index 000000000000..3fad3ce1bbab
--- /dev/null
+++ b/arch/x86/events/Makefile
@@ -0,0 +1 @@
+obj-y			+= core.o
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/events/core.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event.c
rename to arch/x86/events/core.c
index 7402c8182813..90ca601b5d5c 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/events/core.c
@@ -37,7 +37,7 @@
 #include <asm/desc.h>
 #include <asm/ldt.h>
 
-#include "perf_event.h"
+#include "../kernel/cpu/perf_event.h"
 
 struct x86_pmu x86_pmu __read_mostly;
 
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index faa7b5204129..8cbc41b63447 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -30,8 +30,6 @@ obj-$(CONFIG_CPU_SUP_CENTAUR)		+= centaur.o
 obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
 obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
 
-obj-$(CONFIG_PERF_EVENTS)		+= perf_event.o
-
 ifdef CONFIG_PERF_EVENTS
 obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_amd.o perf_event_amd_uncore.o
 ifdef CONFIG_AMD_IOMMU
-- 
2.3.5

[toc] | [prev] | [next] | [standalone]

#1329268 — [PATCH 5/5] x86/events: Move perf_event_amd_uncore.c

From: Borislav Petkov <bp@suse.de>

Signed-off-by: Borislav Petkov <bp@suse.de>
---
 arch/x86/events/Makefile                                             | 2 +-
 arch/x86/{kernel/cpu/perf_event_amd_uncore.c => events/amd/uncore.c} | 0
 arch/x86/kernel/cpu/Makefile                                         | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_amd_uncore.c => events/amd/uncore.c} (100%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 838195d90961..7d1ecff583b0 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -1,6 +1,6 @@
 obj-y			+= core.o
 
-obj-$(CONFIG_CPU_SUP_AMD)               += amd/core.o
+obj-$(CONFIG_CPU_SUP_AMD)               += amd/core.o amd/uncore.o
 obj-$(CONFIG_X86_LOCAL_APIC)            += amd/ibs.o
 ifdef CONFIG_AMD_IOMMU
 obj-$(CONFIG_CPU_SUP_AMD)               += amd/iommu.o
diff --git a/arch/x86/kernel/cpu/perf_event_amd_uncore.c b/arch/x86/events/amd/uncore.c
similarity index 100%
rename from arch/x86/kernel/cpu/perf_event_amd_uncore.c
rename to arch/x86/events/amd/uncore.c
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 37444ffd714d..d8cf3338a035 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -31,7 +31,6 @@ obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
 obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
 
 ifdef CONFIG_PERF_EVENTS
-obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_amd_uncore.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_p6.o perf_event_knc.o perf_event_p4.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o perf_event_intel_cqm.o
-- 
2.3.5

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web