From: Marc Zyngier <maz@kernel.org>
To: Will Deacon <will@kernel.org>,
Alexandru Elisei <alexandru.elisei@arm.com>
Cc: Prasad Sodagudi <psodagud@codeaurora.org>,
Srinivas Ramana <sramana@codeaurora.org>,
Catalin Marinas <catalin.marinas@arm.com>,
linux-kernel@vger.kernel.org, Ard Biesheuvel <ardb@kernel.org>,
Ajay Patil <pajay@qti.qualcomm.com>,
kernel-team@android.com, kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v6 06/21] arm64: Move VHE-specific SPE setup to mutate_to_vhe()
Date: Thu, 04 Feb 2021 09:50:01 +0000 [thread overview]
Message-ID: <12b87236475ec3e03d78dae620530c60@kernel.org> (raw)
In-Reply-To: <20210204093427.GB20244@willie-the-truck>
On 2021-02-04 09:34, Will Deacon wrote:
> On Thu, Feb 04, 2021 at 09:30:08AM +0000, Marc Zyngier wrote:
[...]
>> I think the following patch addresses the above issue, which I'll
>> squash
>> with the original patch. Please shout if I missed anything.
>>
>> Thanks,
>>
>> M.
>>
>> diff --git a/arch/arm64/kernel/hyp-stub.S
>> b/arch/arm64/kernel/hyp-stub.S
>> index aa7e8d592295..3e08dcc924b5 100644
>> --- a/arch/arm64/kernel/hyp-stub.S
>> +++ b/arch/arm64/kernel/hyp-stub.S
>> @@ -115,29 +115,9 @@ SYM_CODE_START_LOCAL(mutate_to_vhe)
>> mrs_s x0, SYS_VBAR_EL12
>> msr vbar_el1, x0
>>
>> - // Fixup SPE configuration, if supported...
>> - mrs x1, id_aa64dfr0_el1
>> - ubfx x1, x1, #ID_AA64DFR0_PMSVER_SHIFT, #4
>> - mov x2, xzr
>> - cbz x1, skip_spe
>> -
>> - // ... and not owned by EL3
>> - mrs_s x0, SYS_PMBIDR_EL1
>> - and x0, x0, #(1 << SYS_PMBIDR_EL1_P_SHIFT)
>> - cbnz x0, skip_spe
>> -
>> - // Let the SPE driver in control of the sampling
>> - mrs_s x0, SYS_PMSCR_EL1
>> - bic x0, x0, #(1 << SYS_PMSCR_EL2_PCT_SHIFT)
>> - bic x0, x0, #(1 << SYS_PMSCR_EL2_PA_SHIFT)
>> - msr_s SYS_PMSCR_EL1, x0
>> - mov x2, #MDCR_EL2_TPMS
>> -
>> -skip_spe:
>> - // For VHE, use EL2 translation and disable access from EL1
>> + // Use EL2 translations for SPE and disable access from EL1
>> mrs x0, mdcr_el2
>> bic x0, x0, #(MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT)
>> - orr x0, x0, x2
>> msr mdcr_el2, x0
>
> Looks a tonne better, thanks! Be nice if somebody could test it for us.
SPE-equipped machines are the silicon equivalent of hen's teeth...
Alex, any chance you could give this a go?
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org>
To: Will Deacon <will@kernel.org>,
Alexandru Elisei <alexandru.elisei@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>,
Jing Zhang <jingzhangos@google.com>,
Prasad Sodagudi <psodagud@codeaurora.org>,
Srinivas Ramana <sramana@codeaurora.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
linux-kernel@vger.kernel.org, Ard Biesheuvel <ardb@kernel.org>,
James Morse <james.morse@arm.com>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Ajay Patil <pajay@qti.qualcomm.com>,
David Brazdil <dbrazdil@google.com>,
kernel-team@android.com, kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v6 06/21] arm64: Move VHE-specific SPE setup to mutate_to_vhe()
Date: Thu, 04 Feb 2021 09:50:01 +0000 [thread overview]
Message-ID: <12b87236475ec3e03d78dae620530c60@kernel.org> (raw)
In-Reply-To: <20210204093427.GB20244@willie-the-truck>
On 2021-02-04 09:34, Will Deacon wrote:
> On Thu, Feb 04, 2021 at 09:30:08AM +0000, Marc Zyngier wrote:
[...]
>> I think the following patch addresses the above issue, which I'll
>> squash
>> with the original patch. Please shout if I missed anything.
>>
>> Thanks,
>>
>> M.
>>
>> diff --git a/arch/arm64/kernel/hyp-stub.S
>> b/arch/arm64/kernel/hyp-stub.S
>> index aa7e8d592295..3e08dcc924b5 100644
>> --- a/arch/arm64/kernel/hyp-stub.S
>> +++ b/arch/arm64/kernel/hyp-stub.S
>> @@ -115,29 +115,9 @@ SYM_CODE_START_LOCAL(mutate_to_vhe)
>> mrs_s x0, SYS_VBAR_EL12
>> msr vbar_el1, x0
>>
>> - // Fixup SPE configuration, if supported...
>> - mrs x1, id_aa64dfr0_el1
>> - ubfx x1, x1, #ID_AA64DFR0_PMSVER_SHIFT, #4
>> - mov x2, xzr
>> - cbz x1, skip_spe
>> -
>> - // ... and not owned by EL3
>> - mrs_s x0, SYS_PMBIDR_EL1
>> - and x0, x0, #(1 << SYS_PMBIDR_EL1_P_SHIFT)
>> - cbnz x0, skip_spe
>> -
>> - // Let the SPE driver in control of the sampling
>> - mrs_s x0, SYS_PMSCR_EL1
>> - bic x0, x0, #(1 << SYS_PMSCR_EL2_PCT_SHIFT)
>> - bic x0, x0, #(1 << SYS_PMSCR_EL2_PA_SHIFT)
>> - msr_s SYS_PMSCR_EL1, x0
>> - mov x2, #MDCR_EL2_TPMS
>> -
>> -skip_spe:
>> - // For VHE, use EL2 translation and disable access from EL1
>> + // Use EL2 translations for SPE and disable access from EL1
>> mrs x0, mdcr_el2
>> bic x0, x0, #(MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT)
>> - orr x0, x0, x2
>> msr mdcr_el2, x0
>
> Looks a tonne better, thanks! Be nice if somebody could test it for us.
SPE-equipped machines are the silicon equivalent of hen's teeth...
Alex, any chance you could give this a go?
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org>
To: Will Deacon <will@kernel.org>,
Alexandru Elisei <alexandru.elisei@arm.com>
Cc: linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org,
Catalin Marinas <catalin.marinas@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
David Brazdil <dbrazdil@google.com>,
Ard Biesheuvel <ardb@kernel.org>,
Jing Zhang <jingzhangos@google.com>,
Ajay Patil <pajay@qti.qualcomm.com>,
Prasad Sodagudi <psodagud@codeaurora.org>,
Srinivas Ramana <sramana@codeaurora.org>,
James Morse <james.morse@arm.com>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
kernel-team@android.com
Subject: Re: [PATCH v6 06/21] arm64: Move VHE-specific SPE setup to mutate_to_vhe()
Date: Thu, 04 Feb 2021 09:50:01 +0000 [thread overview]
Message-ID: <12b87236475ec3e03d78dae620530c60@kernel.org> (raw)
In-Reply-To: <20210204093427.GB20244@willie-the-truck>
On 2021-02-04 09:34, Will Deacon wrote:
> On Thu, Feb 04, 2021 at 09:30:08AM +0000, Marc Zyngier wrote:
[...]
>> I think the following patch addresses the above issue, which I'll
>> squash
>> with the original patch. Please shout if I missed anything.
>>
>> Thanks,
>>
>> M.
>>
>> diff --git a/arch/arm64/kernel/hyp-stub.S
>> b/arch/arm64/kernel/hyp-stub.S
>> index aa7e8d592295..3e08dcc924b5 100644
>> --- a/arch/arm64/kernel/hyp-stub.S
>> +++ b/arch/arm64/kernel/hyp-stub.S
>> @@ -115,29 +115,9 @@ SYM_CODE_START_LOCAL(mutate_to_vhe)
>> mrs_s x0, SYS_VBAR_EL12
>> msr vbar_el1, x0
>>
>> - // Fixup SPE configuration, if supported...
>> - mrs x1, id_aa64dfr0_el1
>> - ubfx x1, x1, #ID_AA64DFR0_PMSVER_SHIFT, #4
>> - mov x2, xzr
>> - cbz x1, skip_spe
>> -
>> - // ... and not owned by EL3
>> - mrs_s x0, SYS_PMBIDR_EL1
>> - and x0, x0, #(1 << SYS_PMBIDR_EL1_P_SHIFT)
>> - cbnz x0, skip_spe
>> -
>> - // Let the SPE driver in control of the sampling
>> - mrs_s x0, SYS_PMSCR_EL1
>> - bic x0, x0, #(1 << SYS_PMSCR_EL2_PCT_SHIFT)
>> - bic x0, x0, #(1 << SYS_PMSCR_EL2_PA_SHIFT)
>> - msr_s SYS_PMSCR_EL1, x0
>> - mov x2, #MDCR_EL2_TPMS
>> -
>> -skip_spe:
>> - // For VHE, use EL2 translation and disable access from EL1
>> + // Use EL2 translations for SPE and disable access from EL1
>> mrs x0, mdcr_el2
>> bic x0, x0, #(MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT)
>> - orr x0, x0, x2
>> msr mdcr_el2, x0
>
> Looks a tonne better, thanks! Be nice if somebody could test it for us.
SPE-equipped machines are the silicon equivalent of hen's teeth...
Alex, any chance you could give this a go?
M.
--
Jazz is not dead. It just smells funny...
next prev parent reply other threads:[~2021-02-04 9:50 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-01 11:56 [PATCH v6 00/21] arm64: Early CPU feature override, and applications to VHE, BTI and PAuth Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 01/21] arm64: Fix labels in el2_setup macros Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 02/21] arm64: Fix outdated TCR setup comment Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 03/21] arm64: Turn the MMU-on sequence into a macro Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 04/21] arm64: Provide an 'upgrade to VHE' stub hypercall Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 05/21] arm64: Initialise as nVHE before switching to VHE Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-05 12:01 ` Hector Martin 'marcan'
2021-02-05 12:01 ` Hector Martin 'marcan'
2021-02-05 12:01 ` Hector Martin 'marcan'
2021-02-05 14:04 ` Marc Zyngier
2021-02-05 14:04 ` Marc Zyngier
2021-02-05 14:04 ` Marc Zyngier
2021-02-06 14:29 ` Hector Martin 'marcan'
2021-02-01 11:56 ` [PATCH v6 06/21] arm64: Move VHE-specific SPE setup to mutate_to_vhe() Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-03 21:13 ` Will Deacon
2021-02-03 21:13 ` Will Deacon
2021-02-03 21:13 ` Will Deacon
2021-02-04 9:30 ` Marc Zyngier
2021-02-04 9:30 ` Marc Zyngier
2021-02-04 9:30 ` Marc Zyngier
2021-02-04 9:34 ` Will Deacon
2021-02-04 9:34 ` Will Deacon
2021-02-04 9:34 ` Will Deacon
2021-02-04 9:50 ` Marc Zyngier [this message]
2021-02-04 9:50 ` Marc Zyngier
2021-02-04 9:50 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 07/21] arm64: Simplify init_el2_state to be non-VHE only Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 08/21] arm64: Move SCTLR_EL1 initialisation to EL-agnostic code Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 09/21] arm64: cpufeature: Add global feature override facility Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 10/21] arm64: cpufeature: Use IDreg override in __read_sysreg_by_encoding() Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 11/21] arm64: Extract early FDT mapping from kaslr_early_init() Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 12/21] arm64: cpufeature: Add an early command-line cpufeature override facility Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-05 16:35 ` Will Deacon
2021-02-05 16:35 ` Will Deacon
2021-02-05 16:35 ` Will Deacon
2021-02-05 16:42 ` Marc Zyngier
2021-02-05 16:42 ` Marc Zyngier
2021-02-05 16:42 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 13/21] arm64: Allow ID_AA64MMFR1_EL1.VH to be overridden from the command line Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 14/21] arm64: Honor VHE being disabled from the command-line Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 15/21] arm64: Add an aliasing facility for the idreg override Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 16/21] arm64: Make kvm-arm.mode={nvhe, protected} an alias of id_aa64mmfr1.vh=0 Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 17/21] KVM: arm64: Document HVC_VHE_RESTART stub hypercall Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 18/21] arm64: Move "nokaslr" over to the early cpufeature infrastructure Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 19/21] arm64: cpufeatures: Allow disabling of BTI from the command-line Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 20/21] arm64: Defer enabling pointer authentication on boot core Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` [PATCH v6 21/21] arm64: cpufeatures: Allow disabling of Pointer Auth from the command-line Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
2021-02-01 11:56 ` Marc Zyngier
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=12b87236475ec3e03d78dae620530c60@kernel.org \
--to=maz@kernel.org \
--cc=alexandru.elisei@arm.com \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=kernel-team@android.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pajay@qti.qualcomm.com \
--cc=psodagud@codeaurora.org \
--cc=sramana@codeaurora.org \
--cc=will@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.