From: <mhonap@nvidia.com>
To: <alex@shazbot.org>, <jgg@ziepe.ca>, <ankita@nvidia.com>,
<jic23@kernel.org>, <dave.jiang@intel.com>,
<alejandro.lucero-palau@amd.com>, <smadhavan@nvidia.com>,
<corbet@lwn.net>, <skhan@linuxfoundation.org>,
<dave@stgolabs.net>, <alison.schofield@intel.com>,
<vishal.l.verma@intel.com>, <iweiny@kernel.org>,
<ming.li@zohomail.com>, <yishaih@nvidia.com>,
<skolothumtho@nvidia.com>, <kevin.tian@intel.com>,
<bhelgaas@google.com>, <dmatlack@google.com>, <kees@kernel.org>,
<gustavoars@kernel.org>
Cc: <cjia@nvidia.com>, <kjaju@nvidia.com>, <vsethi@nvidia.com>,
<zhiw@nvidia.com>, <mhonap@nvidia.com>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<kvm@vger.kernel.org>, <linux-cxl@vger.kernel.org>,
<linux-pci@vger.kernel.org>, <linux-kselftest@vger.kernel.org>,
<linux-hardening@vger.kernel.org>
Subject: [PATCH v4 20/27] vfio/cxl: Emulate the HDM decoder commit handshake
Date: Thu, 13 Aug 2026 15:06:24 +0530 [thread overview]
Message-ID: <20260813093631.2288172-21-mhonap@nvidia.com> (raw)
In-Reply-To: <20260813093631.2288172-1-mhonap@nvidia.com>
From: Manish Honap <mhonap@nvidia.com>
Let the guest drive its virtual decoder now that the register window is
trapped. Writes stay in the per-open shadow so the guest never touches
the physical decoder; the host has already resolved the HPA.
The control register carries the commit handshake, so reflect a commit
request straight to committed and drop the error bit. A decoder that
committed with lock set stays frozen until the device is reset, when the
shadow is sampled afresh.
Apply per-field write semantics to the rest of the block rather than
storing every write verbatim: gate base and size on the committed state,
so they change only across a decommit, and drop writes to the read-only
capability register.
Signed-off-by: Manish Honap <mhonap@nvidia.com>
---
drivers/vfio/pci/cxl/vfio_cxl_core.c | 156 ++++++++++++++++++++++++---
1 file changed, 142 insertions(+), 14 deletions(-)
diff --git a/drivers/vfio/pci/cxl/vfio_cxl_core.c b/drivers/vfio/pci/cxl/vfio_cxl_core.c
index f91f6eb8b8fb..ec938813bd91 100644
--- a/drivers/vfio/pci/cxl/vfio_cxl_core.c
+++ b/drivers/vfio/pci/cxl/vfio_cxl_core.c
@@ -15,6 +15,7 @@
#include <linux/uaccess.h>
#include <linux/vfio_pci_core.h>
#include <cxl/cxl.h>
+#include <cxl/cxl_regs.h>
#include <cxl/pci.h>
/**
@@ -222,33 +223,159 @@ static int vfio_cxl_register_pfn_space(struct vfio_pci_core_device *vdev)
return register_pfn_address_space(&cxl->dpa_pfn_space);
}
+/*
+ * Only an endpoint decoder's control register carries the commit handshake.
+ * A single non-interleaved decoder is assumed; switch topologies would widen
+ * which offsets qualify.
+ */
+static bool vfio_cxl_ctrl_offset(loff_t pos)
+{
+ unsigned int stride = CXL_HDM_DECODER0_CTRL_OFFSET(1) -
+ CXL_HDM_DECODER0_CTRL_OFFSET(0);
+ loff_t off = pos - CXL_HDM_DECODER0_CTRL_OFFSET(0);
+
+ return pos >= CXL_HDM_DECODER0_CTRL_OFFSET(0) && off % stride == 0;
+}
+
+static void vfio_cxl_ctrl_write(struct vfio_cxl_state *cxl, u32 idx, u32 val)
+{
+ u32 old = le32_to_cpu(cxl->hdm_shadow[idx]);
+ u32 wmask = CXL_HDM_DECODER0_CTRL_IG_MASK |
+ CXL_HDM_DECODER0_CTRL_IW_MASK |
+ CXL_HDM_DECODER0_CTRL_LOCK |
+ CXL_HDM_DECODER0_CTRL_COMMIT |
+ CXL_HDM_DECODER0_CTRL_HOSTONLY;
+
+ /* A committed decoder that asked to lock stays put until reset. */
+ if ((old & CXL_HDM_DECODER0_CTRL_COMMITTED) &&
+ (old & CXL_HDM_DECODER0_CTRL_LOCK))
+ return;
+
+ /*
+ * Take only the guest-writable fields and preserve the reserved bits and
+ * the emulation-owned status bits (COMMITTED/COMMIT_ERROR) from the
+ * shadow, so the VMM never reads back guest-authored reserved state.
+ */
+ val = (old & ~wmask) | (val & wmask);
+
+ /*
+ * The host resolved the HPA before the guest ever saw the device, so a
+ * commit request always lands and clearing it tears the guest view down.
+ */
+ if (val & CXL_HDM_DECODER0_CTRL_COMMIT)
+ val = (val | CXL_HDM_DECODER0_CTRL_COMMITTED) &
+ ~CXL_HDM_DECODER0_CTRL_COMMIT_ERROR;
+ else
+ val &= ~CXL_HDM_DECODER0_CTRL_COMMITTED;
+
+ cxl->hdm_shadow[idx] = cpu_to_le32(val);
+}
+
+/*
+ * Base, size, and the Target List / Skip registers are all RWL: they lock on
+ * commit, so every one of them is filtered through the committed guard.
+ */
+static bool vfio_cxl_base_size_offset(loff_t pos)
+{
+ return pos == CXL_HDM_DECODER0_BASE_LOW_OFFSET(0) ||
+ pos == CXL_HDM_DECODER0_BASE_HIGH_OFFSET(0) ||
+ pos == CXL_HDM_DECODER0_SIZE_LOW_OFFSET(0) ||
+ pos == CXL_HDM_DECODER0_SIZE_HIGH_OFFSET(0) ||
+ pos == CXL_HDM_DECODER0_SKIP_LOW(0) ||
+ pos == CXL_HDM_DECODER0_SKIP_HIGH(0);
+}
+
+/*
+ * Reserved dwords in the single-decoder HDM block: 0x08 and 0x0c between the
+ * global control register and decoder 0, and 0x2c after decoder 0's registers.
+ * Keep them read-only so the VMM never reads back guest-authored reserved state.
+ */
+static bool vfio_cxl_reserved_offset(loff_t pos)
+{
+ return pos == 0x08 || pos == 0x0c || pos == 0x2c;
+}
+
+/*
+ * BASE_LOW and SIZE_LOW expose only the 256MB-aligned upper nibble [31:28];
+ * bits [27:0] are RsvdP. Preserve the reserved low bits so the VMM never reads
+ * back an unaligned base or size.
+ */
+#define CXL_HDM_DECODER_LOW_ADDR_MASK 0xf0000000U
+
+static void vfio_cxl_base_size_write(struct vfio_cxl_state *cxl, u32 idx,
+ __le32 val)
+{
+ u32 ctrl = le32_to_cpu(cxl->hdm_shadow[CXL_HDM_DECODER0_CTRL_OFFSET(0) /
+ sizeof(u32)]);
+ loff_t off = (loff_t)idx * sizeof(u32);
+ u32 new = le32_to_cpu(val);
+
+ /* A committed decoder holds its position fields until it decommits. */
+ if (ctrl & CXL_HDM_DECODER0_CTRL_COMMITTED)
+ return;
+
+ if (off == CXL_HDM_DECODER0_BASE_LOW_OFFSET(0) ||
+ off == CXL_HDM_DECODER0_SIZE_LOW_OFFSET(0)) {
+ u32 old = le32_to_cpu(cxl->hdm_shadow[idx]);
+
+ new = (old & ~CXL_HDM_DECODER_LOW_ADDR_MASK) |
+ (new & CXL_HDM_DECODER_LOW_ADDR_MASK);
+ }
+
+ cxl->hdm_shadow[idx] = cpu_to_le32(new);
+}
+
static ssize_t vfio_cxl_comp_rw(struct vfio_pci_core_device *vdev,
char __user *buf, size_t count, loff_t *ppos,
bool iswrite)
{
struct vfio_cxl_state *cxl = vdev->cxl;
loff_t pos = *ppos & VFIO_PCI_OFFSET_MASK;
+ size_t o;
- /*
- * The guest programs a GPA into this decoder and the host resolves the
- * HPA, so the guest never drives the physical decoder. Reads come from
- * the open-time snapshot; write emulation lands in a later change.
- */
- if (iswrite)
+ if (pos >= cxl->hdm_len)
return -EINVAL;
- if (pos >= cxl->hdm_len)
+ /* The decoder registers only take aligned dword accesses. */
+ if (pos % sizeof(u32) || count % sizeof(u32))
return -EINVAL;
count = min_t(size_t, count, cxl->hdm_len - pos);
+
+ if (!iswrite) {
+ /*
+ * The shadow mirrors the physical decoder, so BASE_LOW/HIGH
+ * carry the host HPA. That is visible only to the trusted VMM
+ * holding the fd; the VMM virtualizes the base so the guest sees
+ * its own GPA and never the host address.
+ */
+ if (copy_to_user(buf, (u8 *)cxl->hdm_shadow + pos, count))
+ return -EFAULT;
+ *ppos += count;
+ return count;
+ }
+
/*
- * The shadow mirrors the physical decoder, so BASE_LOW/HIGH carry the
- * host HPA. That is visible only to the trusted VMM holding the fd; the
- * VMM virtualizes the base so the guest sees its own GPA and never the
- * host address.
+ * The guest programs a GPA into this decoder while the host resolves
+ * the HPA, so writes stay in the shadow. Each register follows its own
+ * class: control runs the commit handshake, base and size are locked
+ * once committed, and the capability header is fixed.
*/
- if (copy_to_user(buf, (u8 *)cxl->hdm_shadow + pos, count))
- return -EFAULT;
+ for (o = 0; o < count; o += sizeof(u32)) {
+ u32 idx = (pos + o) / sizeof(u32);
+ __le32 val;
+
+ if (copy_from_user(&val, buf + o, sizeof(val)))
+ return -EFAULT;
+
+ if (vfio_cxl_ctrl_offset(pos + o))
+ vfio_cxl_ctrl_write(cxl, idx, le32_to_cpu(val));
+ else if (vfio_cxl_base_size_offset(pos + o))
+ vfio_cxl_base_size_write(cxl, idx, val);
+ else if (pos + o >= sizeof(u32) &&
+ !vfio_cxl_reserved_offset(pos + o))
+ cxl->hdm_shadow[idx] = val;
+ }
*ppos += count;
return count;
@@ -454,7 +581,8 @@ static int vfio_cxl_open_device(struct vfio_pci_core_device *vdev)
ret = vfio_pci_core_register_dev_region(vdev, VFIO_REGION_TYPE_CXL,
VFIO_REGION_SUBTYPE_CXL_COMP_REGS,
&vfio_cxl_comp_regops, cxl->hdm_len,
- VFIO_REGION_INFO_FLAG_READ, cxl);
+ VFIO_REGION_INFO_FLAG_READ |
+ VFIO_REGION_INFO_FLAG_WRITE, cxl);
if (ret)
goto err_unregister_hdm;
--
2.25.1
next prev parent reply other threads:[~2026-08-13 9:40 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-13 9:36 [PATCH v4 00/27] vfio/pci: Add CXL Type-2 device passthrough support mhonap
2026-08-13 9:36 ` [PATCH v4 01/27] cxl: Fix resource.c include path and export cxl_restore_hdm_after_pci_reset mhonap
2026-08-13 9:36 ` [PATCH v4 02/27] cxl/regs: Skip sub-block region request for BAR-owning drivers mhonap
2026-08-13 9:36 ` [PATCH v4 03/27] cxl: Move component register defines to uapi/cxl/cxl_regs.h mhonap
2026-08-13 9:36 ` [PATCH v4 04/27] cxl: Establish media readiness in cxl_mem_probe() mhonap
2026-08-13 9:36 ` [PATCH v4 05/27] cxl: Add a function-scoped reset entry for vfio-pci mhonap
2026-08-13 9:36 ` [PATCH v4 06/27] vfio/pci: Add CXL ops registration interface mhonap
2026-08-13 9:36 ` [PATCH v4 07/27] vfio/pci: Detect CXL devices and load vfio-cxl on demand mhonap
2026-08-13 9:36 ` [PATCH v4 08/27] vfio/cxl: Add the vfio-cxl module skeleton mhonap
2026-08-13 9:36 ` [PATCH v4 09/27] vfio/cxl: Create the CXL memory device at bind mhonap
2026-08-13 9:36 ` [PATCH v4 10/27] vfio/cxl: Reject unsupported decoder topologies " mhonap
2026-08-13 9:36 ` [PATCH v4 11/27] vfio/cxl: Own the whole component register BAR mhonap
2026-08-13 9:36 ` [PATCH v4 12/27] vfio/pci: Let a provider exclude a BAR sub-range from mmap mhonap
2026-08-13 9:36 ` [PATCH v4 13/27] vfio/pci: Refuse read/write to an excluded BAR sub-range mhonap
2026-08-13 9:36 ` [PATCH v4 14/27] vfio: Add CXL region type for the HDM region mhonap
2026-08-13 9:36 ` [PATCH v4 15/27] vfio/pci: Call CXL open and close hooks around device use mhonap
2026-08-13 9:36 ` [PATCH v4 16/27] vfio/cxl: Shadow the CXL DVSEC body at open mhonap
2026-08-13 9:36 ` [PATCH v4 17/27] vfio/cxl: Virtualize the CXL DVSEC mhonap
2026-08-13 9:36 ` [PATCH v4 18/27] vfio/cxl: Expose the HDM memory and trap the decoder registers mhonap
2026-08-13 9:36 ` [PATCH v4 19/27] vfio/cxl: Keep the HDM decoder block off the direct BAR mapping mhonap
2026-08-13 9:36 ` mhonap [this message]
2026-08-13 9:36 ` [PATCH v4 21/27] vfio/cxl: Describe the CXL device and decoder geometry to userspace mhonap
2026-08-13 9:36 ` [PATCH v4 22/27] vfio/cxl: Revoke the HDM mapping on reset and power transitions mhonap
2026-08-13 9:36 ` [PATCH v4 23/27] vfio/cxl: Refresh the decoder snapshot after a device reset mhonap
2026-08-13 9:36 ` [PATCH v4 24/27] vfio/cxl: Service a guest-triggered CXL reset mhonap
2026-08-13 9:36 ` [PATCH v4 25/27] vfio/pci: Provide an opt-out for the CXL Type-2 extensions mhonap
2026-08-13 9:36 ` [PATCH v4 26/27] Documentation: vfio-pci: Document CXL Type-2 device passthrough mhonap
2026-08-13 9:36 ` [PATCH v4 27/27] selftests/vfio: Add CXL Type-2 passthrough corner-case tests mhonap
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=20260813093631.2288172-21-mhonap@nvidia.com \
--to=mhonap@nvidia.com \
--cc=alejandro.lucero-palau@amd.com \
--cc=alex@shazbot.org \
--cc=alison.schofield@intel.com \
--cc=ankita@nvidia.com \
--cc=bhelgaas@google.com \
--cc=cjia@nvidia.com \
--cc=corbet@lwn.net \
--cc=dave.jiang@intel.com \
--cc=dave@stgolabs.net \
--cc=dmatlack@google.com \
--cc=gustavoars@kernel.org \
--cc=iweiny@kernel.org \
--cc=jgg@ziepe.ca \
--cc=jic23@kernel.org \
--cc=kees@kernel.org \
--cc=kevin.tian@intel.com \
--cc=kjaju@nvidia.com \
--cc=kvm@vger.kernel.org \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=ming.li@zohomail.com \
--cc=skhan@linuxfoundation.org \
--cc=skolothumtho@nvidia.com \
--cc=smadhavan@nvidia.com \
--cc=vishal.l.verma@intel.com \
--cc=vsethi@nvidia.com \
--cc=yishaih@nvidia.com \
--cc=zhiw@nvidia.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