From: Oliver Upton <oliver.upton@linux.dev>
To: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
Quentin Perret <qperret@google.com>,
Marc Zyngier <maz@kernel.org>, James Morse <james.morse@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Sudeep Holla <sudeep.holla@arm.com>,
Sebastian Ene <sebastianene@google.com>,
Fuad Tabba <tabba@google.com>,
kvmarm@lists.linux.dev, kernel-team@android.com,
Andrew Walbran <qwandor@google.com>
Subject: Re: [PATCH v2 04/10] KVM: arm64: Handle FFA_RXTX_MAP and FFA_RXTX_UNMAP calls from the host
Date: Wed, 10 May 2023 20:50:39 +0000 [thread overview]
Message-ID: <ZFwDnwLdxjG/XCcM@linux.dev> (raw)
In-Reply-To: <20230419122051.1341-5-will@kernel.org>
Hi Will,
On Wed, Apr 19, 2023 at 01:20:45PM +0100, Will Deacon wrote:
> Handle FFA_RXTX_MAP and FFA_RXTX_UNMAP calls from the host by sharing
> the host's mailbox memory with the hypervisor and establishing a
> separate pair of mailboxes between the hypervisor and the SPMD at EL3.
>
> Co-developed-by: Andrew Walbran <qwandor@google.com>
> Signed-off-by: Andrew Walbran <qwandor@google.com>
> Signed-off-by: Will Deacon <will@kernel.org>
> ---
> arch/arm64/kvm/hyp/nvhe/ffa.c | 184 ++++++++++++++++++++++++++++++++++
> include/linux/arm_ffa.h | 8 ++
> 2 files changed, 192 insertions(+)
>
> diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c
> index de0fba79b195..9ee3be517e1e 100644
> --- a/arch/arm64/kvm/hyp/nvhe/ffa.c
> +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c
> @@ -31,6 +31,8 @@
> #include <asm/kvm_pkvm.h>
>
> #include <nvhe/ffa.h>
> +#include <nvhe/mem_protect.h>
> +#include <nvhe/memory.h>
> #include <nvhe/trap_handler.h>
> #include <nvhe/spinlock.h>
>
> @@ -52,6 +54,7 @@ struct kvm_ffa_buffers {
> * client.
> */
> static struct kvm_ffa_buffers hyp_buffers;
> +static struct kvm_ffa_buffers host_buffers;
>
> static void ffa_to_smccc_error(struct arm_smccc_res *res, u64 ffa_errno)
> {
> @@ -61,6 +64,15 @@ static void ffa_to_smccc_error(struct arm_smccc_res *res, u64 ffa_errno)
> };
> }
>
> +static void ffa_to_smccc_res(struct arm_smccc_res *res, int ret)
> +{
> + if (ret == FFA_RET_SUCCESS) {
> + *res = (struct arm_smccc_res) { .a0 = FFA_SUCCESS };
> + } else {
> + ffa_to_smccc_error(res, ret);
> + }
> +}
> +
> static void ffa_set_retval(struct kvm_cpu_context *ctxt,
> struct arm_smccc_res *res)
> {
> @@ -78,6 +90,140 @@ static bool is_ffa_call(u64 func_id)
> ARM_SMCCC_FUNC_NUM(func_id) <= FFA_MAX_FUNC_NUM;
> }
<snip>
> +static int spmd_map_ffa_buffers(u64 ffa_page_count)
> +{
> + struct arm_smccc_res res;
> +
> + arm_smccc_1_1_smc(FFA_FN64_RXTX_MAP,
> + hyp_virt_to_phys(hyp_buffers.tx),
> + hyp_virt_to_phys(hyp_buffers.rx),
> + ffa_page_count,
> + 0, 0, 0, 0,
> + &res);
> +
> + return res.a0 == FFA_SUCCESS ? FFA_RET_SUCCESS : res.a2;
> +}
> +
> +static int spmd_unmap_ffa_buffers(void)
> +{
> + struct arm_smccc_res res;
> +
> + arm_smccc_1_1_smc(FFA_RXTX_UNMAP,
> + HOST_FFA_ID,
> + 0, 0, 0, 0, 0, 0,
> + &res);
> +
> + return res.a0 == FFA_SUCCESS ? FFA_RET_SUCCESS : res.a2;
> +}
</snip>
I understand SPMD is significant in the context of the whole FF-A spec,
but I don't think the degree of precision is necessary to get the point
across for someone coming at this from a more KVM-centric background.
So, for the sake of readability, could these helpers be named
ffa_map_hyp_buffers()/ffa_unmap_hyp_buffers() (or similar)? Sticking
'hyp' in there somewhere helps the reader understand exactly what is
getting mapped, since there are both hyp and host buffers.
Apologies for bikeshedding, but I want to make sure folks w/o knowledge
of FF-A can at least grasp some of the mechanics here.
> +static void do_ffa_rxtx_map(struct arm_smccc_res *res,
> + struct kvm_cpu_context *ctxt)
This could do with some clarifying comments as well, since there is
rather significant interaction between host MAP calls and how we handle
host/hyp buffers.
> +{
> + DECLARE_REG(phys_addr_t, tx, ctxt, 1);
> + DECLARE_REG(phys_addr_t, rx, ctxt, 2);
> + DECLARE_REG(u32, npages, ctxt, 3);
> + int ret = 0;
> + void *rx_virt, *tx_virt;
> +
> + if (npages != (KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE) / FFA_PAGE_SIZE) {
> + ret = FFA_RET_INVALID_PARAMETERS;
> + goto out;
> + }
> +
> + if (!PAGE_ALIGNED(tx) || !PAGE_ALIGNED(rx)) {
> + ret = FFA_RET_INVALID_PARAMETERS;
> + goto out;
> + }
> +
> + hyp_spin_lock(&host_buffers.lock);
> + if (host_buffers.tx) {
> + ret = FFA_RET_DENIED;
> + goto out_unlock;
> + }
> +
> + ret = spmd_map_ffa_buffers(npages);
> + if (ret)
> + goto out_unlock;
> +
> + ret = __pkvm_host_share_hyp(hyp_phys_to_pfn(tx));
> + if (ret) {
> + ret = FFA_RET_INVALID_PARAMETERS;
> + goto err_unmap;
> + }
> +
> + ret = __pkvm_host_share_hyp(hyp_phys_to_pfn(rx));
> + if (ret) {
> + ret = FFA_RET_INVALID_PARAMETERS;
> + goto err_unshare_tx;
> + }
> +
> + tx_virt = hyp_phys_to_virt(tx);
> + ret = hyp_pin_shared_mem(tx_virt, tx_virt + 1);
> + if (ret) {
> + ret = FFA_RET_INVALID_PARAMETERS;
> + goto err_unshare_rx;
> + }
> +
> + rx_virt = hyp_phys_to_virt(rx);
> + ret = hyp_pin_shared_mem(rx_virt, rx_virt + 1);
> + if (ret) {
> + ret = FFA_RET_INVALID_PARAMETERS;
> + goto err_unpin_tx;
> + }
> +
> + host_buffers.tx = tx_virt;
> + host_buffers.rx = rx_virt;
> +
> +out_unlock:
> + hyp_spin_unlock(&host_buffers.lock);
> +out:
> + ffa_to_smccc_res(res, ret);
> + return;
> +
> +err_unpin_tx:
> + hyp_unpin_shared_mem(tx_virt, tx_virt + 1);
> +err_unshare_rx:
> + __pkvm_host_unshare_hyp(hyp_phys_to_pfn(rx));
> +err_unshare_tx:
> + __pkvm_host_unshare_hyp(hyp_phys_to_pfn(tx));
> +err_unmap:
> + spmd_unmap_ffa_buffers();
> + goto out_unlock;
> +}
--
Thanks,
Oliver
next prev parent reply other threads:[~2023-05-10 20:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-19 12:20 [PATCH v2 00/10] KVM: arm64: FF-A proxy for pKVM Will Deacon
2023-04-19 12:20 ` [PATCH v2 01/10] KVM: arm64: Block unsafe FF-A calls from the host Will Deacon
2023-05-10 19:08 ` Oliver Upton
2023-05-22 11:22 ` Will Deacon
2023-05-23 8:07 ` Oliver Upton
2023-04-19 12:20 ` [PATCH v2 02/10] KVM: arm64: Probe FF-A version and host/hyp partition ID during init Will Deacon
2023-04-19 12:20 ` [PATCH v2 03/10] KVM: arm64: Allocate pages for hypervisor FF-A mailboxes Will Deacon
2023-04-19 12:20 ` [PATCH v2 04/10] KVM: arm64: Handle FFA_RXTX_MAP and FFA_RXTX_UNMAP calls from the host Will Deacon
2023-05-10 20:50 ` Oliver Upton [this message]
2023-05-22 11:48 ` Will Deacon
2023-04-19 12:20 ` [PATCH v2 05/10] KVM: arm64: Add FF-A helpers to share/unshare memory with secure world Will Deacon
2023-04-19 12:20 ` [PATCH v2 06/10] KVM: arm64: Handle FFA_MEM_SHARE calls from the host Will Deacon
2023-04-19 12:20 ` [PATCH v2 07/10] KVM: arm64: Handle FFA_MEM_RECLAIM " Will Deacon
2023-04-19 12:20 ` [PATCH v2 08/10] KVM: arm64: Handle FFA_MEM_LEND " Will Deacon
2023-04-19 12:20 ` [PATCH v2 09/10] KVM: arm64: Handle FFA_FEATURES call " Will Deacon
2023-04-19 12:20 ` [PATCH v2 10/10] KVM: arm64: pkvm: Add support for fragmented FF-A descriptors Will Deacon
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=ZFwDnwLdxjG/XCcM@linux.dev \
--to=oliver.upton@linux.dev \
--cc=alexandru.elisei@arm.com \
--cc=james.morse@arm.com \
--cc=kernel-team@android.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=qperret@google.com \
--cc=qwandor@google.com \
--cc=sebastianene@google.com \
--cc=sudeep.holla@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=tabba@google.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox