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

Started byBorislav Petkov <bp@alien8.de>
First post2016-02-08 17:10 +0100
Last post2016-02-09 13:20 +0100
Articles 12 — 6 participants

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
      [tip:perf/core] perf/x86: Move perf_event_amd.c ........... =>   x86/events/amd/core.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-09 13:20 +0100
    [PATCH 1/5] x86/events: Move perf_event.c Borislav Petkov <bp@alien8.de> - 2016-02-08 17:20 +0100
      [tip:perf/core] perf/x86: Move perf_event.c ............... =>   x86/events/core.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-09 13:20 +0100
        Re: [tip:perf/core] perf/x86: Move perf_event.c ............... =>   x86/events/core.c Vince Weaver <vincent.weaver@maine.edu> - 2016-02-09 15:00 +0100
          Re: [tip:perf/core] perf/x86: Move perf_event.c ............... =>  x86/events/core.c Ingo Molnar <mingo@kernel.org> - 2016-02-09 15:10 +0100
            Re: [tip:perf/core] perf/x86: Move perf_event.c ............... =>  x86/events/core.c Borislav Petkov <bp@suse.de> - 2016-02-09 15:20 +0100
            Re: {SPAM?} Re: [tip:perf/core] perf/x86: Move perf_event.c  ............... => x86/events/core.c Vince Weaver <vincent.weaver@maine.edu> - 2016-02-12 23:20 +0100
          Re: [tip:perf/core] perf/x86: Move perf_event.c ............... =>  x86/events/core.c Thomas Gleixner <tglx@linutronix.de> - 2016-02-09 15:10 +0100
    [PATCH 5/5] x86/events: Move perf_event_amd_uncore.c Borislav Petkov <bp@alien8.de> - 2016-02-08 17:20 +0100
      [tip:perf/core] perf/x86: Move perf_event_amd_uncore.c .... =>   x86/events/amd/uncore.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-09 13:20 +0100

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

FromBorislav Petkov <bp@alien8.de>
Date2016-02-08 17:10 +0100
Subject[PATCH 0/5] perf: Sanitize perf directory structure, p1
Message-ID<qZWxZ-7BS-33@gated-at.bofh.it>
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

FromBorislav Petkov <bp@alien8.de>
Date2016-02-08 17:20 +0100
Subject[PATCH 2/5] x86/events: Move perf_event_amd.c
Message-ID<qZWHE-7Fq-19@gated-at.bofh.it>
In reply to#1329248
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]

#1330152 — [tip:perf/core] perf/x86: Move perf_event_amd.c ........... => x86/events/amd/core.c

Fromtip-bot for Borislav Petkov <tipbot@zytor.com>
Date2016-02-09 13:20 +0100
Subject[tip:perf/core] perf/x86: Move perf_event_amd.c ........... => x86/events/amd/core.c
Message-ID<r0fqX-3Sj-33@gated-at.bofh.it>
In reply to#1329257
Commit-ID:  39b0332a215832ce3a8f8f57344da4a64370e3ca
Gitweb:     http://git.kernel.org/tip/39b0332a215832ce3a8f8f57344da4a64370e3ca
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 8 Feb 2016 17:09:05 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 9 Feb 2016 10:23:49 +0100

perf/x86: Move perf_event_amd.c ........... => x86/events/amd/core.c

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

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1454947748-28629-3-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 3fad3ce..e0560b6 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 5861053..51b1658 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 77000d5..d549b02 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

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

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

FromBorislav Petkov <bp@alien8.de>
Date2016-02-08 17:20 +0100
Subject[PATCH 1/5] x86/events: Move perf_event.c
Message-ID<qZWHE-7Fq-29@gated-at.bofh.it>
In reply to#1329248
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]

#1330161 — [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c

Fromtip-bot for Borislav Petkov <tipbot@zytor.com>
Date2016-02-09 13:20 +0100
Subject[tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c
Message-ID<r0fqY-3Sj-57@gated-at.bofh.it>
In reply to#1329262
Commit-ID:  fa9cbf320e996eaa3d219344b6f7013b096cafd9
Gitweb:     http://git.kernel.org/tip/fa9cbf320e996eaa3d219344b6f7013b096cafd9
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 8 Feb 2016 17:09:04 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 9 Feb 2016 10:23:49 +0100

perf/x86: Move perf_event.c ............... => x86/events/core.c

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>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1454947748-28629-2-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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(-)

diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild
index 1538562..eb3abf8 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 0000000..3fad3ce
--- /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 7402c818..90ca601 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 5803130..77000d5 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

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

#1330246 — Re: [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c

FromVince Weaver <vincent.weaver@maine.edu>
Date2016-02-09 15:00 +0100
SubjectRe: [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c
Message-ID<r0gZI-4N6-19@gated-at.bofh.it>
In reply to#1330161
On Tue, 9 Feb 2016, tip-bot for Borislav Petkov wrote:

> Commit-ID:  fa9cbf320e996eaa3d219344b6f7013b096cafd9
> Gitweb:     http://git.kernel.org/tip/fa9cbf320e996eaa3d219344b6f7013b096cafd9
> Author:     Borislav Petkov <bp@suse.de>
> AuthorDate: Mon, 8 Feb 2016 17:09:04 +0100
> Committer:  Ingo Molnar <mingo@kernel.org>
> CommitDate: Tue, 9 Feb 2016 10:23:49 +0100
> 
> perf/x86: Move perf_event.c ............... => x86/events/core.c
> 
> Also, keep the churn at minimum by adjusting the include "perf_event.h"
> when each file gets moved.

I have to admit I've been falling behind on my lkml reading, but is there 
a good reason for moving all these files around?

I'm often using "git blame" to track down when bugs are introduced, and 
it's a big pain trying to do that across file moves like this.  Although 
that's maybe just due to difficiencies in my git usage skills.

Vince

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

#1330263 — Re: [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c

FromIngo Molnar <mingo@kernel.org>
Date2016-02-09 15:10 +0100
SubjectRe: [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c
Message-ID<r0h9o-56j-11@gated-at.bofh.it>
In reply to#1330246
* Vince Weaver <vincent.weaver@maine.edu> wrote:

> On Tue, 9 Feb 2016, tip-bot for Borislav Petkov wrote:
> 
> > Commit-ID:  fa9cbf320e996eaa3d219344b6f7013b096cafd9
> > Gitweb:     http://git.kernel.org/tip/fa9cbf320e996eaa3d219344b6f7013b096cafd9
> > Author:     Borislav Petkov <bp@suse.de>
> > AuthorDate: Mon, 8 Feb 2016 17:09:04 +0100
> > Committer:  Ingo Molnar <mingo@kernel.org>
> > CommitDate: Tue, 9 Feb 2016 10:23:49 +0100
> > 
> > perf/x86: Move perf_event.c ............... => x86/events/core.c
> > 
> > Also, keep the churn at minimum by adjusting the include "perf_event.h"
> > when each file gets moved.
> 
> I have to admit I've been falling behind on my lkml reading, but is there 
> a good reason for moving all these files around?

Yeah, as the PMU drivers grew organically the naming scheme became a bit messy:

 - for example the uncore drivers are under kernel/cpu/, although they are not
   bound to CPUs.

 - separation between various vendor drivers is not always chrystal clear.

 - the 'kernel/' subdirectory is a needless anachronism, we try to move bits out
   of it when the opportunity presents itself.

 - the new naming also better follows the core kernel/events/ perf code.

I presume after this round of patches is in, Boris will send another round to 
reorganize the Intel PMU drivers as well.

> I'm often using "git blame" to track down when bugs are introduced, and it's a 
> big pain trying to do that across file moves like this.  Although that's maybe 
> just due to difficiencies in my git usage skills.

It seems to work reasonably well here:

241771ef016b5 arch/x86/kernel/cpu/perf_counter.c (Ingo Molnar            2008-12-03 10:39:53 +0100    1) /*
cdd6c482c9ff9 arch/x86/kernel/cpu/perf_event.c   (Ingo Molnar            2009-09-21 12:02:48 +0200    2)  * Performance events x86 architecture code
241771ef016b5 arch/x86/kernel/cpu/perf_counter.c (Ingo Molnar            2008-12-03 10:39:53 +0100    3)  *
98144511427c1 arch/x86/kernel/cpu/perf_counter.c (Ingo Molnar            2009-04-29 14:52:50 +0200    4)  *  Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
98144511427c1 arch/x86/kernel/cpu/perf_counter.c (Ingo Molnar            2009-04-29 14:52:50 +0200    5)  *  Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
98144511427c1 arch/x86/kernel/cpu/perf_counter.c (Ingo Molnar            2009-04-29 14:52:50 +0200    6)  *  Copyright (C) 2009 Jaswinder Singh Rajput
98144511427c1 arch/x86/kernel/cpu/perf_counter.c (Ingo Molnar            2009-04-29 14:52:50 +0200    7)  *  Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter
90eec103b96e3 arch/x86/kernel/cpu/perf_event.c   (Peter Zijlstra         2015-11-16 11:08:45 +0100    8)  *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra
30dd568c91260 arch/x86/kernel/cpu/perf_counter.c (Markus Metzger         2009-07-21 15:56:48 +0200    9)  *  Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com>
1da53e023029c arch/x86/kernel/cpu/perf_event.c   (Stephane Eranian       2010-01-18 10:58:01 +0200   10)  *  Copyright (C) 2009 Google, Inc., Stephane Eranian
241771ef016b5 arch/x86/kernel/cpu/perf_counter.c (Ingo Molnar            2008-12-03 10:39:53 +0100   11)  *
241771ef016b5 arch/x86/kernel/cpu/perf_counter.c (Ingo Molnar            2008-12-03 10:39:53 +0100   12)  *  For licencing details see kernel-base/COPYING
241771ef016b5 arch/x86/kernel/cpu/perf_counter.c (Ingo Molnar            2008-12-03 10:39:53 +0100   13)  */
241771ef016b5 arch/x86/kernel/cpu/perf_counter.c (Ingo Molnar            2008-12-03 10:39:53 +0100   14) 
[...]
c48b60538c3ba arch/x86/kernel/cpu/perf_event.c   (Vince Weaver           2012-03-01 17:28:14 -0500   84)        rdpmcl(hwc->event_base_rdpmc, new_raw_count);

see for example how Git still knows that we had a 
arch/x86/kernel/cpu/perf_counter.c initial file name.

Or how you did an optimization in c48b60538c3ba when the file was already named 
cpu/perf_event.c! :-)

Thanks,

	Ingo

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

#1330277 — Re: [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c

FromBorislav Petkov <bp@suse.de>
Date2016-02-09 15:20 +0100
SubjectRe: [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c
Message-ID<r0hj4-59v-21@gated-at.bofh.it>
In reply to#1330263
On Tue, Feb 09, 2016 at 03:05:51PM +0100, Ingo Molnar wrote:
> I presume after this round of patches is in, Boris will send another
> round to reorganize the Intel PMU drivers as well.

Yes, he will. He will base them ontop of newest tip/master too.

:-)

-- 
Regards/Gruss,
    Boris.

SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--

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

#1333174 — Re: {SPAM?} Re: [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c

FromVince Weaver <vincent.weaver@maine.edu>
Date2016-02-12 23:20 +0100
SubjectRe: {SPAM?} Re: [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c
Message-ID<r1ued-4Bn-11@gated-at.bofh.it>
In reply to#1330263
On Tue, 9 Feb 2016, Ingo Molnar wrote:

> see for example how Git still knows that we had a 
> arch/x86/kernel/cpu/perf_counter.c initial file name.
> 
> Or how you did an optimization in c48b60538c3ba when the file was already named 
> cpu/perf_event.c! :-)

yes, for simple renames it works, but once files start getting 
"reorganized" and split up it gets tricky.  For example trying to track 
things across the single perf_event.h to the separate perf_event.h files
after the UAPI split is always a pain.

But anyway, it sounds like the renames are being done for reasonably good 
reasons, it's just the tip commit message that came my way didn't have 
this extra context.

Thanks,

Vince

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

#1330266 — Re: [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c

FromThomas Gleixner <tglx@linutronix.de>
Date2016-02-09 15:10 +0100
SubjectRe: [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c
Message-ID<r0h9o-56j-21@gated-at.bofh.it>
In reply to#1330246
On Tue, 9 Feb 2016, Vince Weaver wrote:
> On Tue, 9 Feb 2016, tip-bot for Borislav Petkov wrote:
> 
> > Commit-ID:  fa9cbf320e996eaa3d219344b6f7013b096cafd9
> > Gitweb:     http://git.kernel.org/tip/fa9cbf320e996eaa3d219344b6f7013b096cafd9
> > Author:     Borislav Petkov <bp@suse.de>
> > AuthorDate: Mon, 8 Feb 2016 17:09:04 +0100
> > Committer:  Ingo Molnar <mingo@kernel.org>
> > CommitDate: Tue, 9 Feb 2016 10:23:49 +0100
> > 
> > perf/x86: Move perf_event.c ............... => x86/events/core.c
> > 
> > Also, keep the churn at minimum by adjusting the include "perf_event.h"
> > when each file gets moved.
> 
> I have to admit I've been falling behind on my lkml reading, but is there 
> a good reason for moving all these files around?
> 
> I'm often using "git blame" to track down when bugs are introduced, and 
> it's a big pain trying to do that across file moves like this.  Although 
> that's maybe just due to difficiencies in my git usage skills.

git blame still tells you which commit modified a particular line. That's not
lost accross a file move.

git log stops per default when a file moved, but you can tell it not to do so
via "--follow".

Thanks,

	tglx

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

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

FromBorislav Petkov <bp@alien8.de>
Date2016-02-08 17:20 +0100
Subject[PATCH 5/5] x86/events: Move perf_event_amd_uncore.c
Message-ID<qZWHF-7Fq-49@gated-at.bofh.it>
In reply to#1329248
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] | [next] | [standalone]

#1330147 — [tip:perf/core] perf/x86: Move perf_event_amd_uncore.c .... => x86/events/amd/uncore.c

Fromtip-bot for Borislav Petkov <tipbot@zytor.com>
Date2016-02-09 13:20 +0100
Subject[tip:perf/core] perf/x86: Move perf_event_amd_uncore.c .... => x86/events/amd/uncore.c
Message-ID<r0fqW-3Sj-19@gated-at.bofh.it>
In reply to#1329268
Commit-ID:  d0af1c0525d561fe3ab6d7a767cdd52704da25cd
Gitweb:     http://git.kernel.org/tip/d0af1c0525d561fe3ab6d7a767cdd52704da25cd
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 8 Feb 2016 17:09:08 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 9 Feb 2016 10:23:50 +0100

perf/x86: Move perf_event_amd_uncore.c .... => x86/events/amd/uncore.c

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1454947748-28629-6-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 838195d..7d1ecff 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 2e15d9d..7edbeb9 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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web