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>
Subject: [PATCH v2 14/26] iommu/amd: Introduce IOMMUFD vDevice support for AMD
Date: Thu, 28 May 2026 05:17:26 +0000 [thread overview]
Message-ID: <20260528051738.596013-15-suravee.suthikulpanit@amd.com> (raw)
In-Reply-To: <20260528051738.596013-1-suravee.suthikulpanit@amd.com>
Initialize vDevice for AMD vIOMMU by setting up the Device ID Mapping
table using the guest device ID.
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
drivers/iommu/amd/amd_iommu_types.h | 12 +++++++++++
drivers/iommu/amd/iommufd.c | 33 +++++++++++++++++++++++++++++
drivers/iommu/amd/nested.c | 12 +++++++++++
3 files changed, 57 insertions(+)
diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h
index 63410028bae3..836d5cd08134 100644
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -388,6 +388,11 @@
#define DTE_GPT_LEVEL_SHIFT 54
#define DTE_GPT_LEVEL_MASK GENMASK_ULL(55, 54)
+/* vIOMMU bit fields */
+#define DTE_VIOMMU_EN_SHIFT 15
+#define DTE_VIOMMU_GDEVICEID_MASK GENMASK_ULL(31, 16)
+#define DTE_VIOMMU_GUESTID_MASK GENMASK_ULL(47, 32)
+
#define GCR3_VALID 0x01ULL
/* DTE[128:179] | DTE[184:191] */
@@ -894,6 +899,9 @@ struct iommu_dev_data {
bool defer_attach;
struct ratelimit_state rs; /* Ratelimit IOPF messages */
+
+ u16 gid; /* Guest ID */
+ u16 gDevId; /* Guest Device ID */
};
/* Map HPET and IOAPIC ids to the devid used by the IOMMU */
@@ -1121,6 +1129,10 @@ struct amd_irte_ops {
void (*clear_allocated)(struct irq_remap_table *, int);
};
+struct amd_iommu_vdevice {
+ struct iommufd_vdevice core;
+};
+
#ifdef CONFIG_IRQ_REMAP
extern struct amd_irte_ops irte_32_ops;
extern struct amd_irte_ops irte_128_ops;
diff --git a/drivers/iommu/amd/iommufd.c b/drivers/iommu/amd/iommufd.c
index efa9e1f49550..eb43d02371a8 100644
--- a/drivers/iommu/amd/iommufd.c
+++ b/drivers/iommu/amd/iommufd.c
@@ -9,6 +9,7 @@
#include "amd_iommu.h"
#include "amd_viommu.h"
#include "amd_iommu_types.h"
+#include "../iommufd/iommufd_private.h"
static const struct iommufd_viommu_ops amd_viommu_ops;
@@ -127,6 +128,36 @@ static void amd_iommufd_viommu_destroy(struct iommufd_viommu *viommu)
amd_viommu_uninit_one(iommu, aviommu);
}
+/*
+ * Called from drivers/iommu/iommufd/viommu.c: iommufd_vdevice_alloc_ioctl()
+ */
+static int _amd_viommu_vdevice_init(struct iommufd_vdevice *vdev)
+{
+ struct iommu_dev_data *dev_data;
+ struct pci_dev *pdev = to_pci_dev(vdev->idev->dev);
+ struct iommufd_viommu *viommu = vdev->viommu;
+ struct amd_iommu_viommu *aviommu = container_of(viommu, struct amd_iommu_viommu, core);
+
+ if (!pdev) {
+ pr_err("%s: not a PCI device\n", __func__);
+ return -EINVAL;
+ }
+
+ dev_data = dev_iommu_priv_get(&pdev->dev);
+ if (!dev_data) {
+ pr_err("%s: Device not found (devid=%#x)\n",
+ __func__, pci_dev_id(pdev));
+ return -EINVAL;
+ }
+
+ dev_data->gid = aviommu->gid;
+ dev_data->gDevId = vdev->virt_id;
+ pr_debug("%s: gid=%#x, hdev_id=%#x, gdev_id=%#x\n", __func__,
+ dev_data->gid, pci_dev_id(pdev), dev_data->gDevId);
+
+ return 0;
+}
+
/*
* See include/linux/iommufd.h
* struct iommufd_viommu_ops - vIOMMU specific operations
@@ -134,4 +165,6 @@ static void amd_iommufd_viommu_destroy(struct iommufd_viommu *viommu)
static const struct iommufd_viommu_ops amd_viommu_ops = {
.alloc_domain_nested = amd_iommu_alloc_domain_nested,
.destroy = amd_iommufd_viommu_destroy,
+ .vdevice_size = VDEVICE_STRUCT_SIZE(struct amd_iommu_vdevice, core),
+ .vdevice_init = _amd_viommu_vdevice_init,
};
diff --git a/drivers/iommu/amd/nested.c b/drivers/iommu/amd/nested.c
index 15dc57cf7c5f..08f74ebb3523 100644
--- a/drivers/iommu/amd/nested.c
+++ b/drivers/iommu/amd/nested.c
@@ -227,6 +227,18 @@ static void set_dte_nested(struct amd_iommu *iommu, struct iommu_domain *dom,
/* Guest paging mode */
new->data[2] |= gdte->dte[2] & DTE_GPT_LEVEL_MASK;
+
+ /* vImuEn */
+ new->data[3] |= 1ULL << DTE_VIOMMU_EN_SHIFT;
+
+ /* GDeviceID */
+ new->data[3] |= FIELD_PREP(DTE_VIOMMU_GDEVICEID_MASK,
+ dev_data->gDevId);
+
+ /* GuestID */
+ new->data[3] |= FIELD_PREP(DTE_VIOMMU_GUESTID_MASK,
+ dev_data->gid);
+
}
static int nested_attach_device(struct iommu_domain *dom, struct device *dev,
--
2.34.1
next prev parent reply other threads:[~2026-05-28 5:19 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-28 5:17 [PATCH v2 00/26] iommu/amd: Introduce AMD Hardware-accelerated Virtualized IOMMU (vIOMMU) Support Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 01/26] iommu/amd: Make amd_iommu_completion_wait() non-static Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 02/26] iommu/amd: Introduce vIOMMU-specific events and event Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 03/26] iommu/amd: Detect and initialize AMD vIOMMU feature Suravee Suthikulpanit
2026-06-01 12:43 ` Jason Gunthorpe
2026-06-05 8:45 ` Suthikulpanit, Suravee
2026-05-28 5:17 ` [PATCH v2 04/26] iommu/amd: Introduce IOMMUFD vIOMMU support for AMD Suravee Suthikulpanit
2026-06-01 12:44 ` Jason Gunthorpe
2026-06-05 8:55 ` Suthikulpanit, Suravee
2026-05-28 5:17 ` [PATCH v2 05/26] iommu/amd: Allocate Guest IDs for IOMMUFD vIOMMU instances Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 06/26] iommu/amd: Map vIOMMU VF and VF Control MMIO BARs Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 07/26] iommu/amd: Add support for AMD vIOMMU VF MMIO region Suravee Suthikulpanit
2026-06-01 12:51 ` Jason Gunthorpe
2026-06-17 6:10 ` Suthikulpanit, Suravee
2026-05-28 5:17 ` [PATCH v2 08/26] iommu/amd: Introduce Reset vMMIO Command Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 09/26] iommu/amd: Introduce domain for IOMMU Private Address (IPA) region Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 10/26] iommu/amd: Assign IOMMU Private Address domain to IOMMU Suravee Suthikulpanit
2026-06-01 12:59 ` Jason Gunthorpe
2026-06-08 2:45 ` Suthikulpanit, Suravee
2026-05-28 5:17 ` [PATCH v2 11/26] iommu/amd: Allocate and map vIOMMU private regions Suravee Suthikulpanit
2026-06-01 13:05 ` Jason Gunthorpe
2026-05-28 5:17 ` [PATCH v2 12/26] iommu/amd: Add per-VM private IPA alloc/map helpers Suravee Suthikulpanit
2026-05-30 20:44 ` Weinan Liu
2026-06-18 3:55 ` Suthikulpanit, Suravee
2026-06-01 13:08 ` Jason Gunthorpe
2026-06-18 3:54 ` Suthikulpanit, Suravee
2026-06-01 13:11 ` Jason Gunthorpe
2026-06-18 4:06 ` Suthikulpanit, Suravee
2026-06-01 18:16 ` Weinan Liu
2026-05-28 5:17 ` [PATCH v2 13/26] iommu/amd: Add helper functions to manage DevID / DomID mapping tables Suravee Suthikulpanit
2026-05-30 21:26 ` Weinan Liu
2026-06-29 3:24 ` Suthikulpanit, Suravee
2026-05-28 5:17 ` Suravee Suthikulpanit [this message]
2026-05-28 5:17 ` [PATCH v2 15/26] iommu/amd: Introduce helper function for updating domain ID mapping table Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 16/26] iommu/amd: Introduce helper function for updating device " Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 17/26] iommu/amd: Pass KVM FD from userspace when initializing vIOMMU Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 18/26] iommu/amd: Add translation DTE and VFctrl TransDevID helpers Suravee Suthikulpanit
2026-06-01 13:31 ` Jason Gunthorpe
2026-05-28 5:17 ` [PATCH v2 19/26] iommu/amd: Add per-segment translate device ID pool Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 20/26] iommu/amd: Reserve translate-device-id for PCI requestor aliases Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 21/26] iommu/amd: Map kvmfd to shared translate device ID for vIOMMU Suravee Suthikulpanit
2026-06-01 13:35 ` Jason Gunthorpe
2026-06-18 5:50 ` Suthikulpanit, Suravee
2026-06-19 13:40 ` Jason Gunthorpe
2026-05-28 5:17 ` [PATCH v2 22/26] iommufd: Add hw_queue_init and split queue alloc paths Suravee Suthikulpanit
2026-05-29 0:14 ` Nicolin Chen
2026-06-03 0:30 ` Suthikulpanit, Suravee
2026-06-01 13:38 ` Jason Gunthorpe
2026-06-18 5:51 ` Suthikulpanit, Suravee
2026-05-28 5:17 ` [PATCH v2 23/26] iommu/amd: Add support for vIOMMU HW queues initialization Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 24/26] iommufd: Introduce vIOMMU command via VIOMMU_COMMAND ioctl Suravee Suthikulpanit
2026-05-28 5:17 ` [PATCH v2 25/26] iommu/amd: Handle set/get command for AMD vIOMMU Suravee Suthikulpanit
2026-05-29 23:20 ` Nicolin Chen
2026-06-03 3:53 ` Suthikulpanit, Suravee
2026-05-28 5:17 ` [PATCH v2 26/26] iommu/amd: Introduce logic to check and enable vIOMMU feature Suravee Suthikulpanit
2026-06-01 13:30 ` [PATCH v2 00/26] iommu/amd: Introduce AMD Hardware-accelerated Virtualized IOMMU (vIOMMU) Support Jason Gunthorpe
2026-06-03 4:13 ` Suthikulpanit, Suravee
2026-06-03 6:41 ` Suthikulpanit, Suravee
2026-06-03 12:13 ` Jason Gunthorpe
2026-06-05 8:41 ` 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=20260528051738.596013-15-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®