From: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
To: <linux-kernel@vger.kernel.org>, <iommu@lists.linux.dev>,
<joro@8bytes.org>, <jgg@nvidia.com>
Cc: <yi.l.liu@intel.com>, <kevin.tian@intel.com>,
<nicolinc@nvidia.com>, <vasant.hegde@amd.com>,
<jon.grimm@amd.com>, <santosh.shukla@amd.com>,
<sairaj.arunkodilkar@amd.com>, <jay.chen@amd.com>,
<wvw@google.com>, <wnliu@google.com>, <dantuluris@google.com>,
<chriscli@google.com>, <kpsingh@google.com>,
Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
Vasant Hegde <Vasant.Hegde@amd.com>
Subject: [PATCH 07/22] iommu/amd: Add support for AMD vIOMMU VF MMIO region
Date: Mon, 30 Mar 2026 08:41:51 +0000 [thread overview]
Message-ID: <20260330084206.9251-8-suravee.suthikulpanit@amd.com> (raw)
In-Reply-To: <20260330084206.9251-1-suravee.suthikulpanit@amd.com>
The AMD vIOMMU virtualizes guest MMIO registers at the 3rd 4K region.
This is achieved using the iommufd_viommu_alloc_mmap().
Co-developed-by: Vasant Hegde <Vasant.Hegde@amd.com>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
drivers/iommu/amd/amd_viommu.h | 5 +++++
drivers/iommu/amd/iommufd.c | 17 ++++++++++++++++-
drivers/iommu/amd/viommu.c | 11 +++++++++++
include/uapi/linux/iommufd.h | 2 ++
4 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/amd/amd_viommu.h b/drivers/iommu/amd/amd_viommu.h
index 45c2b71af4ba..8dbb12241e8d 100644
--- a/drivers/iommu/amd/amd_viommu.h
+++ b/drivers/iommu/amd/amd_viommu.h
@@ -10,6 +10,7 @@
int amd_viommu_init(struct amd_iommu *iommu);
+u64 amd_viommu_get_vfmmio_addr(struct amd_iommu *iommu, u16 gid);
#else
static inline int amd_viommu_init(struct amd_iommu *iommu)
@@ -17,6 +18,10 @@ static inline int amd_viommu_init(struct amd_iommu *iommu)
return 0;
}
+u64 amd_viommu_get_vfmmio_addr(struct amd_iommu *iommu, u16 gid);
+{
+ return 0;
+}
#endif /* CONFIG_AMD_IOMMU_IOMMUFD */
#endif /* AMD_VIOMMU_H */
diff --git a/drivers/iommu/amd/iommufd.c b/drivers/iommu/amd/iommufd.c
index 6fba5d9b1310..5dcd3fc3ba99 100644
--- a/drivers/iommu/amd/iommufd.c
+++ b/drivers/iommu/amd/iommufd.c
@@ -7,6 +7,7 @@
#include "iommufd.h"
#include "amd_iommu.h"
+#include "amd_viommu.h"
#include "amd_iommu_types.h"
static const struct iommufd_viommu_ops amd_viommu_ops;
@@ -44,9 +45,11 @@ int amd_iommufd_viommu_init(struct iommufd_viommu *viommu, struct iommu_domain *
const struct iommu_user_data *user_data)
{
int ret;
+ phys_addr_t page_base;
unsigned long flags;
struct iommu_viommu_amd data;
struct protection_domain *pdom = to_pdomain(parent);
+ struct amd_iommu *iommu = container_of(viommu->iommu_dev, struct amd_iommu, iommu);
struct amd_iommu_viommu *aviommu = container_of(viommu, struct amd_iommu_viommu, core);
xa_init_flags(&aviommu->gdomid_array, XA_FLAGS_ALLOC1);
@@ -66,11 +69,21 @@ int amd_iommufd_viommu_init(struct iommufd_viommu *viommu, struct iommu_domain *
return aviommu->gid;
pr_debug("%s: gid=%#x", __func__, aviommu->gid);
+ page_base = amd_viommu_get_vfmmio_addr(iommu, aviommu->gid);
+ if (page_base <= 0)
+ return -ENODEV;
+
+ ret = iommufd_viommu_alloc_mmap(&aviommu->core,
+ page_base, SZ_4K,
+ (unsigned long *)&data.out_vfmmio_mmap_offset);
+ if (ret)
+ goto err_out;
+
ret = iommu_copy_struct_to_user(user_data, &data,
IOMMU_VIOMMU_TYPE_AMD,
reserved);
if (ret)
- goto err_out;
+ goto free_mmap;
viommu->ops = &amd_viommu_ops;
@@ -79,6 +92,8 @@ int amd_iommufd_viommu_init(struct iommufd_viommu *viommu, struct iommu_domain *
spin_unlock_irqrestore(&pdom->lock, flags);
return 0;
+free_mmap:
+ iommufd_viommu_destroy_mmap(&aviommu->core, data.out_vfmmio_mmap_offset);
err_out:
amd_iommu_gid_free(aviommu->gid);
return ret;
diff --git a/drivers/iommu/amd/viommu.c b/drivers/iommu/amd/viommu.c
index 887a9eb8122d..76198bf4f4f6 100644
--- a/drivers/iommu/amd/viommu.c
+++ b/drivers/iommu/amd/viommu.c
@@ -92,6 +92,17 @@ static int __init viommu_vf_vfcntl_init(struct amd_iommu *iommu)
return 0;
}
+/*
+ * Returns VF MMIO BAR offset for the give guest ID which will be
+ * mapped to guest vIOMMU 3rd 4K MMIO address
+ */
+u64 amd_viommu_get_vfmmio_addr(struct amd_iommu *iommu, u16 gid)
+{
+ /* TODO: Add check for sVIOMMU and set gid[bit 15] */
+ return iommu->vf_base_phys + gid * VIOMMU_VF_MMIO_ENTRY_SIZE;
+}
+EXPORT_SYMBOL(amd_viommu_get_vfmmio_addr);
+
int __init amd_viommu_init(struct amd_iommu *iommu)
{
int ret;
diff --git a/include/uapi/linux/iommufd.h b/include/uapi/linux/iommufd.h
index 3a2ac7234b9e..eff5fbd2da6b 100644
--- a/include/uapi/linux/iommufd.h
+++ b/include/uapi/linux/iommufd.h
@@ -1075,9 +1075,11 @@ struct iommu_viommu_tegra241_cmdqv {
/**
* struct iommu_viommu_amd - AMD vIOMMU Interface (IOMMU_VIOMMU_TYPE_AMD)
+ * @out_vfmmio_mmap_offset: (out) mmap offset for vIOMMU VF-MMIO
* @reserved: Must be zero
*/
struct iommu_viommu_amd {
+ __aligned_u64 out_vfmmio_mmap_offset;
__u32 reserved; /* must be last */
};
--
2.34.1
next prev parent reply other threads:[~2026-03-30 8:43 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-30 8:41 [PATCH 00/22] iommu/amd: Introduce AMD Hardware-accelerated Virtualized IOMMU (vIOMMU) Support Suravee Suthikulpanit
2026-03-30 8:41 ` [PATCH 01/22] iommu/amd: Make amd_iommu_completion_wait() non-static Suravee Suthikulpanit
2026-03-30 9:39 ` Nicolin Chen
2026-03-30 8:41 ` [PATCH 02/22] iommu/amd: Introduce vIOMMU-specific events and event info Suravee Suthikulpanit
2026-03-30 9:34 ` Nicolin Chen
2026-04-06 3:25 ` Suthikulpanit, Suravee
2026-03-30 8:41 ` [PATCH 03/22] iommu/amd: Detect and initialize AMD vIOMMU feature Suravee Suthikulpanit
2026-03-31 5:12 ` iommu/amd: Initialize IOMMU Private Address (IPA) space mapping region Weinan Liu
2026-04-06 8:32 ` Suthikulpanit, Suravee
2026-03-30 8:41 ` [PATCH 04/22] iommu/amd: Introduce IOMMUFD vIOMMU support for AMD Suravee Suthikulpanit
2026-04-07 6:46 ` [PATCH 4/22] " Weinan Liu
2026-05-12 15:14 ` Suthikulpanit, Suravee
2026-03-30 8:41 ` [PATCH 05/22] iommu/amd: Introduce vIOMMU Guest-ID (GID) Suravee Suthikulpanit
2026-04-07 7:01 ` Weinan Liu
2026-05-12 15:07 ` Suthikulpanit, Suravee
2026-03-30 8:41 ` [PATCH 06/22] iommu/amd: Map vIOMMU VF MMIO and VF Control MMIO regions Suravee Suthikulpanit
2026-03-31 5:30 ` Weinan Liu
2026-04-06 8:57 ` Suthikulpanit, Suravee
2026-03-30 8:41 ` Suravee Suthikulpanit [this message]
2026-03-31 5:55 ` [PATCH 07/22] iommu/amd: Add support for AMD vIOMMU VF MMIO region Weinan Liu
2026-04-06 9:03 ` Suthikulpanit, Suravee
2026-03-30 8:41 ` [PATCH 08/22] iommu/amd: Introduce Reset vMMIO Command Suravee Suthikulpanit
2026-04-07 7:20 ` [PATCH 8/22] " Weinan Liu
2026-03-30 8:41 ` [PATCH 09/22] iommu/amd: Introduce domain for IOMMU Private Address (IPA) region Suravee Suthikulpanit
2026-03-30 12:20 ` Jason Gunthorpe
2026-04-06 3:48 ` Suthikulpanit, Suravee
2026-04-06 11:47 ` Jason Gunthorpe
2026-03-30 8:41 ` [PATCH 10/22] iommu/amd: Assign IOMMU Private Address domain to IOMMU Suravee Suthikulpanit
2026-03-30 8:41 ` [PATCH 11/22] iommu/amd: Allocate and map vIOMMU private regions Suravee Suthikulpanit
2026-03-30 8:41 ` [PATCH 12/22] iommu/amd: Add helper functions to manage private address region for each VM Suravee Suthikulpanit
2026-03-30 8:41 ` [PATCH 13/22] iommu/amd: Add helper functions to manage DevID / DomID mapping tables Suravee Suthikulpanit
2026-03-30 8:41 ` [PATCH 14/22] iommu/amd: Introduce IOMMUFD vDevice support for AMD Suravee Suthikulpanit
2026-03-30 8:41 ` [PATCH 15/22] iommu/amd: Introduce helper function for updating domain ID mapping table Suravee Suthikulpanit
2026-03-30 12:17 ` Jason Gunthorpe
2026-04-06 3:49 ` Suthikulpanit, Suravee
2026-03-30 8:42 ` [PATCH 16/22] iommu/amd: Introduce helper function for updating device " Suravee Suthikulpanit
2026-03-30 8:42 ` [PATCH 17/22] iommu/amd: Introduce vIOMMU Translation DTE Suravee Suthikulpanit
2026-03-30 8:42 ` [PATCH 18/22] iommufd: Introduce iommufd_viommu_ops.hw_queue_init Suravee Suthikulpanit
2026-03-30 8:42 ` [PATCH 19/22] iommu/amd: Add support for vIOMMU HW queues initialization Suravee Suthikulpanit
2026-03-30 8:42 ` [PATCH 20/22] iommufd: Introduce vIOMMU option via IOMMU_OPTION ioctl Suravee Suthikulpanit
2026-03-30 12:15 ` Jason Gunthorpe
2026-04-06 17:02 ` Suthikulpanit, Suravee
2026-03-30 8:42 ` [PATCH 21/22] iommu/amd: Handle set/get option for AMD vIOMMU hw_queue Suravee Suthikulpanit
2026-03-30 8:42 ` [PATCH 22/22] iommu/amd: Introduce logic to check and enable vIOMMU feature Suravee Suthikulpanit
2026-03-30 12:15 ` Jason Gunthorpe
2026-04-06 3:51 ` Suthikulpanit, Suravee
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=20260330084206.9251-8-suravee.suthikulpanit@amd.com \
--to=suravee.suthikulpanit@amd.com \
--cc=chriscli@google.com \
--cc=dantuluris@google.com \
--cc=iommu@lists.linux.dev \
--cc=jay.chen@amd.com \
--cc=jgg@nvidia.com \
--cc=jon.grimm@amd.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kpsingh@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolinc@nvidia.com \
--cc=sairaj.arunkodilkar@amd.com \
--cc=santosh.shukla@amd.com \
--cc=vasant.hegde@amd.com \
--cc=wnliu@google.com \
--cc=wvw@google.com \
--cc=yi.l.liu@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®