From: "Laszlo Ersek" <lersek@redhat.com>
To: Tom Lendacky <thomas.lendacky@amd.com>, devel@edk2.groups.io
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>,
Erdem Aktas <erdemaktas@google.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Jiewen Yao <jiewen.yao@intel.com>, Min Xu <min.m.xu@intel.com>,
Michael Roth <michael.roth@amd.com>
Subject: Re: [edk2-devel] [PATCH] OvmfPkg/IoMmuDxe: Provide an implementation for SetAttribute
Date: Tue, 30 Jan 2024 22:32:41 +0100 [thread overview]
Message-ID: <cc90ee7d-cbb7-728a-6499-446f29543d3b@redhat.com> (raw)
In-Reply-To: <c0f9e95f557b601a045da015c1a97201e8aec2ab.1706634932.git.thomas.lendacky@amd.com>
On 1/30/24 18:15, Tom Lendacky wrote:
> A recent change to the PciIoMap() function now propagates the return code
> from the IoMmu protocol SetAttribute() operation. The implementation of
> this operation in OvmfPkg/IoMmuDxe/CcIoMmu.c returns EFI_UNSUPPORTED,
> resulting in a failure to boot the guest.
>
> Provide an implementation for SetAttribute() that validates the IoMmu
> access method being requested against the IoMmu mapping operation.
>
> Suggested-by: Laszlo Ersek <lersek@redhat.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
> ---
> OvmfPkg/IoMmuDxe/CcIoMmu.c | 55 +++++++++++++++++++-
> 1 file changed, 53 insertions(+), 2 deletions(-)
Thanks -- I'd like Min or Jiewen to approve this, then I'm glad to merge it.
Laszlo
>
> diff --git a/OvmfPkg/IoMmuDxe/CcIoMmu.c b/OvmfPkg/IoMmuDxe/CcIoMmu.c
> index b83a9690062b..795b945dacb0 100644
> --- a/OvmfPkg/IoMmuDxe/CcIoMmu.c
> +++ b/OvmfPkg/IoMmuDxe/CcIoMmu.c
> @@ -5,7 +5,7 @@
> operations must be performed on unencrypted buffer hence we use a bounce
> buffer to map the guest buffer into an unencrypted DMA buffer.
>
> - Copyright (c) 2017, AMD Inc. All rights reserved.<BR>
> + Copyright (c) 2017 - 2024, AMD Inc. All rights reserved.<BR>
> Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -751,7 +751,58 @@ IoMmuSetAttribute (
> IN UINT64 IoMmuAccess
> )
> {
> - return EFI_UNSUPPORTED;
> + MAP_INFO *MapInfo;
> + EFI_STATUS Status;
> +
> + DEBUG ((DEBUG_VERBOSE, "%a: Mapping=0x%p Access=%lu\n", __func__, Mapping, IoMmuAccess));
> +
> + if (Mapping == NULL) {
> + return EFI_INVALID_PARAMETER;
> + }
> +
> + Status = EFI_SUCCESS;
> +
> + //
> + // An IoMmuAccess value of 0 is always accepted, validate any non-zero value.
> + //
> + if (IoMmuAccess != 0) {
> + MapInfo = (MAP_INFO *)Mapping;
> +
> + //
> + // The mapping operation already implied the access mode. Validate that
> + // the supplied access mode matches operation access mode.
> + //
> + switch (MapInfo->Operation) {
> + case EdkiiIoMmuOperationBusMasterRead:
> + case EdkiiIoMmuOperationBusMasterRead64:
> + if (IoMmuAccess != EDKII_IOMMU_ACCESS_READ) {
> + Status = EFI_INVALID_PARAMETER;
> + }
> +
> + break;
> +
> + case EdkiiIoMmuOperationBusMasterWrite:
> + case EdkiiIoMmuOperationBusMasterWrite64:
> + if (IoMmuAccess != EDKII_IOMMU_ACCESS_WRITE) {
> + Status = EFI_INVALID_PARAMETER;
> + }
> +
> + break;
> +
> + case EdkiiIoMmuOperationBusMasterCommonBuffer:
> + case EdkiiIoMmuOperationBusMasterCommonBuffer64:
> + if (IoMmuAccess != (EDKII_IOMMU_ACCESS_READ | EDKII_IOMMU_ACCESS_WRITE)) {
> + Status = EFI_INVALID_PARAMETER;
> + }
> +
> + break;
> +
> + default:
> + Status = EFI_UNSUPPORTED;
> + }
> + }
> +
> + return Status;
> }
>
> EDKII_IOMMU_PROTOCOL mIoMmu = {
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114829): https://edk2.groups.io/g/devel/message/114829
Mute This Topic: https://groups.io/mt/104058148/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2024-01-30 21:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-30 17:15 [edk2-devel] [PATCH] OvmfPkg/IoMmuDxe: Provide an implementation for SetAttribute Lendacky, Thomas via groups.io
2024-01-30 21:32 ` Laszlo Ersek [this message]
2024-01-31 2:47 ` Min Xu
2024-01-31 2:48 ` Min Xu
2024-01-31 13:28 ` Laszlo Ersek
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-list 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=cc90ee7d-cbb7-728a-6499-446f29543d3b@redhat.com \
--to=devel@edk2.groups.io \
/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