From: zhaoshenglong@huawei.com (Shannon Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v13 01/20] ARM64: Move PMU register related defines to asm/perf_event.h
Date: Thu, 25 Feb 2016 10:02:00 +0800 [thread overview]
Message-ID: <56CE6098.8070001@huawei.com> (raw)
In-Reply-To: <20160224175247.GE12471@arm.com>
On 2016/2/25 1:52, Will Deacon wrote:
> On Wed, Feb 24, 2016 at 01:08:21PM +0800, Shannon Zhao wrote:
>> From: Shannon Zhao <shannon.zhao@linaro.org>
>>
>> To use the ARMv8 PMU related register defines from the KVM code, we move
>> the relevant definitions to asm/perf_event.h header file and rename them
>> with prefix ARMV8_PMU_.
>>
>> Signed-off-by: Anup Patel <anup.patel@linaro.org>
>> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
>> Acked-by: Marc Zyngier <marc.zyngier@arm.com>
>> Reviewed-by: Andrew Jones <drjones@redhat.com>
>> ---
>> arch/arm64/include/asm/perf_event.h | 35 +++++++++++++++++++
>> arch/arm64/kernel/perf_event.c | 68 ++++++++++---------------------------
>> 2 files changed, 52 insertions(+), 51 deletions(-)
>
> Looks fine to me, but we're going to get some truly horrible conflicts
> in -next.
>
> I'm open to suggestions on the best way to handle this, but one way
> would be:
>
> 1. Duplicate all the #defines privately in KVM (queue via kvm tree)
This way seems not proper I think.
> 2. Rebase this patch onto my perf/updates branch [1] (queue via me)
While to this series, it really relies on the perf_event.h to compile
and test, so maybe for KVM-ARM and KVM maintainers it's not proper.
> 3. Patch at -rc1 dropping the #defines from (1) and moving to the new
> perf_event.h stuff
>
I vote for this way. Since the patch in [1] is small and nothing else
relies on them, I think it would be simple to rebase them onto this series.
> Thoughts?
>
Anyway, there are only 3 lines which have conflicts. I'm not sure
whether we could handle this when we merge them.
> Will
>
> [1] git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git perf/updates
>
> .
>
Thanks,
--
Shannon
next prev parent reply other threads:[~2016-02-25 2:02 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 5:08 [PATCH v13 00/20] KVM: ARM64: Add guest PMU support Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 01/20] ARM64: Move PMU register related defines to asm/perf_event.h Shannon Zhao
2016-02-24 17:52 ` Will Deacon
2016-02-25 2:02 ` Shannon Zhao [this message]
2016-02-25 10:48 ` Will Deacon
2016-02-29 13:07 ` Marc Zyngier
2016-02-29 13:59 ` Marc Zyngier
2016-02-29 15:41 ` Will Deacon
2016-02-29 15:53 ` Marc Zyngier
2016-02-29 15:43 ` Will Deacon
2016-02-29 18:50 ` Shannon Zhao
2016-02-29 19:03 ` Marc Zyngier
2016-02-24 5:08 ` [PATCH v13 02/20] KVM: ARM64: Define PMU data structure for each vcpu Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 03/20] KVM: ARM64: Add access handler for PMCR register Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 04/20] KVM: ARM64: Add access handler for PMSELR register Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 05/20] KVM: ARM64: Add access handler for PMCEID0 and PMCEID1 register Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 06/20] KVM: ARM64: Add access handler for event counter register Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 07/20] KVM: ARM64: Add access handler for PMCNTENSET and PMCNTENCLR register Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 08/20] KVM: ARM64: PMU: Add perf event map and introduce perf event creating function Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 09/20] KVM: ARM64: Add access handler for event type register Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 10/20] KVM: ARM64: Add access handler for PMINTENSET and PMINTENCLR register Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 11/20] KVM: ARM64: Add access handler for PMOVSSET and PMOVSCLR register Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 12/20] KVM: ARM64: Add access handler for PMSWINC register Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 13/20] KVM: ARM64: Add helper to handle PMCR register bits Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 14/20] KVM: ARM64: Add access handler for PMUSERENR register Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 15/20] KVM: ARM64: Add PMU overflow interrupt routing Shannon Zhao
2016-02-24 12:27 ` Christoffer Dall
2016-02-24 13:19 ` Marc Zyngier
2016-02-24 13:26 ` Shannon Zhao
2016-02-24 13:42 ` Marc Zyngier
2016-02-24 14:33 ` [PATCH v14 " Shannon Zhao
2016-02-26 8:52 ` Christoffer Dall
2016-02-26 11:29 ` [PATCH v15 " Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 16/20] KVM: ARM64: Reset PMU state when resetting vcpu Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 17/20] KVM: ARM64: Free perf event of PMU when destroying vcpu Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 18/20] KVM: ARM64: Add a new feature bit for PMUv3 Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 19/20] KVM: ARM: Introduce per-vcpu kvm device controls Shannon Zhao
2016-02-24 5:08 ` [PATCH v13 20/20] KVM: ARM64: Add a new vcpu device control group for PMUv3 Shannon Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56CE6098.8070001@huawei.com \
--to=zhaoshenglong@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).