From: Andrew Jones <drjones@redhat.com>
To: Oliver Upton <oupton@google.com>
Cc: kvmarm@lists.cs.columbia.edu, Marc Zyngier <maz@kernel.org>,
James Morse <james.morse@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Peter Shier <pshier@google.com>,
Ricardo Koller <ricarkol@google.com>,
Reiji Watanabe <reijiw@google.com>,
Raghavendra Rao Anata <rananta@google.com>,
kvm@vger.kernel.org
Subject: Re: [PATCH v2 02/11] KVM: arm64: Clean up SMC64 PSCI filtering for AArch32 guests
Date: Tue, 5 Oct 2021 15:23:36 +0200 [thread overview]
Message-ID: <20211005132336.njnelrjkmtipzr5l@gator.home> (raw)
In-Reply-To: <20210923191610.3814698-3-oupton@google.com>
On Thu, Sep 23, 2021 at 07:16:01PM +0000, Oliver Upton wrote:
> The only valid calling SMC calling convention from an AArch32 state is
> SMC32. Disallow any PSCI function that sets the SMC64 function ID bit
> when called from AArch32 rather than comparing against known SMC64 PSCI
> functions.
>
> Signed-off-by: Oliver Upton <oupton@google.com>
> ---
> arch/arm64/kvm/psci.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c
> index d46842f45b0a..310b9cb2b32b 100644
> --- a/arch/arm64/kvm/psci.c
> +++ b/arch/arm64/kvm/psci.c
> @@ -208,15 +208,11 @@ static void kvm_psci_narrow_to_32bit(struct kvm_vcpu *vcpu)
>
> static unsigned long kvm_psci_check_allowed_function(struct kvm_vcpu *vcpu, u32 fn)
> {
> - switch(fn) {
> - case PSCI_0_2_FN64_CPU_SUSPEND:
> - case PSCI_0_2_FN64_CPU_ON:
> - case PSCI_0_2_FN64_AFFINITY_INFO:
> - /* Disallow these functions for 32bit guests */
> - if (vcpu_mode_is_32bit(vcpu))
> - return PSCI_RET_NOT_SUPPORTED;
> - break;
> - }
> + /*
> + * Prevent 32 bit guests from calling 64 bit PSCI functions.
> + */
> + if ((fn & PSCI_0_2_64BIT) && vcpu_mode_is_32bit(vcpu))
> + return PSCI_RET_NOT_SUPPORTED;
>
> return 0;
> }
> --
> 2.33.0.685.g46640cef36-goog
>
Reviewed-by: Andrew Jones <drjones@redhat.com>
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jones <drjones@redhat.com>
To: Oliver Upton <oupton@google.com>
Cc: kvm@vger.kernel.org, Marc Zyngier <maz@kernel.org>,
Peter Shier <pshier@google.com>,
kvmarm@lists.cs.columbia.edu
Subject: Re: [PATCH v2 02/11] KVM: arm64: Clean up SMC64 PSCI filtering for AArch32 guests
Date: Tue, 5 Oct 2021 15:23:36 +0200 [thread overview]
Message-ID: <20211005132336.njnelrjkmtipzr5l@gator.home> (raw)
In-Reply-To: <20210923191610.3814698-3-oupton@google.com>
On Thu, Sep 23, 2021 at 07:16:01PM +0000, Oliver Upton wrote:
> The only valid calling SMC calling convention from an AArch32 state is
> SMC32. Disallow any PSCI function that sets the SMC64 function ID bit
> when called from AArch32 rather than comparing against known SMC64 PSCI
> functions.
>
> Signed-off-by: Oliver Upton <oupton@google.com>
> ---
> arch/arm64/kvm/psci.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c
> index d46842f45b0a..310b9cb2b32b 100644
> --- a/arch/arm64/kvm/psci.c
> +++ b/arch/arm64/kvm/psci.c
> @@ -208,15 +208,11 @@ static void kvm_psci_narrow_to_32bit(struct kvm_vcpu *vcpu)
>
> static unsigned long kvm_psci_check_allowed_function(struct kvm_vcpu *vcpu, u32 fn)
> {
> - switch(fn) {
> - case PSCI_0_2_FN64_CPU_SUSPEND:
> - case PSCI_0_2_FN64_CPU_ON:
> - case PSCI_0_2_FN64_AFFINITY_INFO:
> - /* Disallow these functions for 32bit guests */
> - if (vcpu_mode_is_32bit(vcpu))
> - return PSCI_RET_NOT_SUPPORTED;
> - break;
> - }
> + /*
> + * Prevent 32 bit guests from calling 64 bit PSCI functions.
> + */
> + if ((fn & PSCI_0_2_64BIT) && vcpu_mode_is_32bit(vcpu))
> + return PSCI_RET_NOT_SUPPORTED;
>
> return 0;
> }
> --
> 2.33.0.685.g46640cef36-goog
>
Reviewed-by: Andrew Jones <drjones@redhat.com>
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2021-10-05 13:23 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-23 19:15 [PATCH v2 00/11] KVM: arm64: Implement PSCI SYSTEM_SUSPEND support Oliver Upton
2021-09-23 19:15 ` Oliver Upton
2021-09-23 19:16 ` [PATCH v2 01/11] KVM: arm64: Drop unused vcpu param to kvm_psci_valid_affinity() Oliver Upton
2021-09-23 19:16 ` Oliver Upton
2021-10-01 3:50 ` Reiji Watanabe
2021-10-01 3:50 ` Reiji Watanabe
2021-10-05 13:22 ` Andrew Jones
2021-10-05 13:22 ` Andrew Jones
2021-09-23 19:16 ` [PATCH v2 02/11] KVM: arm64: Clean up SMC64 PSCI filtering for AArch32 guests Oliver Upton
2021-09-23 19:16 ` Oliver Upton
2021-10-01 3:56 ` Reiji Watanabe
2021-10-01 3:56 ` Reiji Watanabe
2021-10-05 13:23 ` Andrew Jones [this message]
2021-10-05 13:23 ` Andrew Jones
2021-09-23 19:16 ` [PATCH v2 03/11] KVM: arm64: Encapsulate reset request logic in a helper function Oliver Upton
2021-09-23 19:16 ` Oliver Upton
2021-10-01 6:04 ` Reiji Watanabe
2021-10-01 6:04 ` Reiji Watanabe
2021-10-01 16:10 ` Oliver Upton
2021-10-01 16:10 ` Oliver Upton
2021-10-05 13:33 ` Andrew Jones
2021-10-05 13:33 ` Andrew Jones
2021-10-05 15:05 ` Oliver Upton
2021-10-05 15:05 ` Oliver Upton
2021-10-05 19:01 ` Andrew Jones
2021-10-05 19:01 ` Andrew Jones
2021-10-13 4:48 ` Reiji Watanabe
2021-10-13 4:48 ` Reiji Watanabe
2021-10-05 13:35 ` Andrew Jones
2021-10-05 13:35 ` Andrew Jones
2021-09-23 19:16 ` [PATCH v2 04/11] KVM: arm64: Rename the KVM_REQ_SLEEP handler Oliver Upton
2021-09-23 19:16 ` Oliver Upton
2021-10-05 13:34 ` Andrew Jones
2021-10-05 13:34 ` Andrew Jones
2021-09-23 19:16 ` [PATCH v2 05/11] KVM: arm64: Defer WFI emulation as a requested event Oliver Upton
2021-09-23 19:16 ` Oliver Upton
2021-09-30 10:50 ` Marc Zyngier
2021-09-30 10:50 ` Marc Zyngier
2021-09-30 17:09 ` Sean Christopherson
2021-09-30 17:09 ` Sean Christopherson
2021-09-30 17:32 ` Oliver Upton
2021-09-30 17:32 ` Oliver Upton
2021-09-30 18:08 ` Sean Christopherson
2021-09-30 18:08 ` Sean Christopherson
2021-09-30 21:57 ` Oliver Upton
2021-09-30 21:57 ` Oliver Upton
2021-10-01 13:57 ` Marc Zyngier
2021-10-01 13:57 ` Marc Zyngier
2021-09-23 19:16 ` [PATCH v2 06/11] KVM: arm64: Add support for SYSTEM_SUSPEND PSCI call Oliver Upton
2021-09-23 19:16 ` Oliver Upton
2021-09-30 12:29 ` Marc Zyngier
2021-09-30 12:29 ` Marc Zyngier
2021-09-30 17:19 ` Sean Christopherson
2021-09-30 17:19 ` Sean Christopherson
2021-09-30 17:35 ` Oliver Upton
2021-09-30 17:35 ` Oliver Upton
2021-09-30 17:40 ` Oliver Upton
2021-09-30 17:40 ` Oliver Upton
2021-10-01 14:02 ` Marc Zyngier
2021-10-01 14:02 ` Marc Zyngier
2021-10-05 16:02 ` Oliver Upton
2021-10-05 16:02 ` Oliver Upton
2021-09-23 19:16 ` [PATCH v2 07/11] selftests: KVM: Rename psci_cpu_on_test to psci_test Oliver Upton
2021-09-23 19:16 ` Oliver Upton
2021-10-05 13:36 ` Andrew Jones
2021-10-05 13:36 ` Andrew Jones
2021-09-23 19:16 ` [PATCH v2 08/11] selftests: KVM: Create helper for making SMCCC calls Oliver Upton
2021-09-23 19:16 ` Oliver Upton
2021-10-05 13:39 ` Andrew Jones
2021-10-05 13:39 ` Andrew Jones
2021-09-23 19:16 ` [PATCH v2 09/11] selftests: KVM: Use KVM_SET_MP_STATE to power off vCPU in psci_test Oliver Upton
2021-09-23 19:16 ` Oliver Upton
2021-09-23 19:16 ` [PATCH v2 10/11] selftests: KVM: Refactor psci_test to make it amenable to new tests Oliver Upton
2021-09-23 19:16 ` Oliver Upton
2021-10-05 13:45 ` Andrew Jones
2021-10-05 13:45 ` Andrew Jones
2021-10-05 14:54 ` Oliver Upton
2021-10-05 14:54 ` Oliver Upton
2021-10-05 19:05 ` Andrew Jones
2021-10-05 19:05 ` Andrew Jones
2021-09-23 19:16 ` [PATCH v2 11/11] selftests: KVM: Test SYSTEM_SUSPEND PSCI call Oliver Upton
2021-09-23 19:16 ` Oliver Upton
2021-10-05 13:49 ` Andrew Jones
2021-10-05 13:49 ` Andrew Jones
2021-10-05 15:07 ` Oliver Upton
2021-10-05 15:07 ` Oliver Upton
2021-09-23 20:15 ` [PATCH v2 00/11] KVM: arm64: Implement PSCI SYSTEM_SUSPEND support Oliver Upton
2021-09-23 20:15 ` Oliver Upton
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=20211005132336.njnelrjkmtipzr5l@gator.home \
--to=drjones@redhat.com \
--cc=alexandru.elisei@arm.com \
--cc=james.morse@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=maz@kernel.org \
--cc=oupton@google.com \
--cc=pshier@google.com \
--cc=rananta@google.com \
--cc=reijiw@google.com \
--cc=ricarkol@google.com \
--cc=suzuki.poulose@arm.com \
/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.