From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Jonathan Cameron <jonathan.cameron@huawei.com>,
Igor Mammedov <imammedo@redhat.com>, Ani Sinha <ani@anisinha.ca>,
Ben Widawsky <ben.widawsky@intel.com>
Subject: [PULL 34/91] mem/cxl_type3: Add read and write functions for associated hostmem.
Date: Mon, 16 May 2022 06:37:36 -0400 [thread overview]
Message-ID: <20220516095448.507876-35-mst@redhat.com> (raw)
In-Reply-To: <20220516095448.507876-1-mst@redhat.com>
From: Jonathan Cameron <jonathan.cameron@huawei.com>
Once a read or write reaches a CXL type 3 device, the HDM decoders
on the device are used to establish the Device Physical Address
which should be accessed. These functions peform the required maths
and then use a device specific address space to access the
hostmem->mr to fullfil the actual operation. Note that failed writes
are silent, but failed reads return poison. Note this is based
loosely on:
https://lore.kernel.org/qemu-devel/20200817161853.593247-6-f4bug@amsat.org/
[RFC PATCH 0/9] hw/misc: Add support for interleaved memory accesses
Only lightly tested so far. More complex test cases yet to be written.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Message-Id: <20220429144110.25167-33-Jonathan.Cameron@huawei.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/cxl/cxl_device.h | 6 +++
hw/mem/cxl_type3.c | 91 +++++++++++++++++++++++++++++++++++++
2 files changed, 97 insertions(+)
diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h
index 4285fbda08..1e141b6621 100644
--- a/include/hw/cxl/cxl_device.h
+++ b/include/hw/cxl/cxl_device.h
@@ -239,6 +239,7 @@ struct CXLType3Dev {
HostMemoryBackend *lsa;
/* State */
+ AddressSpace hostmem_as;
CXLComponentState cxl_cstate;
CXLDeviceState cxl_dstate;
};
@@ -259,4 +260,9 @@ struct CXLType3Class {
uint64_t offset);
};
+MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host_addr, uint64_t *data,
+ unsigned size, MemTxAttrs attrs);
+MemTxResult cxl_type3_write(PCIDevice *d, hwaddr host_addr, uint64_t data,
+ unsigned size, MemTxAttrs attrs);
+
#endif
diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c
index 6c6ed9a776..3bf2869573 100644
--- a/hw/mem/cxl_type3.c
+++ b/hw/mem/cxl_type3.c
@@ -97,7 +97,9 @@ static void ct3d_reg_write(void *opaque, hwaddr offset, uint64_t value,
static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
{
+ DeviceState *ds = DEVICE(ct3d);
MemoryRegion *mr;
+ char *name;
if (!ct3d->hostmem) {
error_setg(errp, "memdev property must be set");
@@ -112,6 +114,15 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)
memory_region_set_nonvolatile(mr, true);
memory_region_set_enabled(mr, true);
host_memory_backend_set_mapped(ct3d->hostmem, true);
+
+ if (ds->id) {
+ name = g_strdup_printf("cxl-type3-dpa-space:%s", ds->id);
+ } else {
+ name = g_strdup("cxl-type3-dpa-space");
+ }
+ address_space_init(&ct3d->hostmem_as, mr, name);
+ g_free(name);
+
ct3d->cxl_dstate.pmem_size = ct3d->hostmem->size;
if (!ct3d->lsa) {
@@ -167,6 +178,86 @@ static void ct3_exit(PCIDevice *pci_dev)
ComponentRegisters *regs = &cxl_cstate->crb;
g_free(regs->special_ops);
+ address_space_destroy(&ct3d->hostmem_as);
+}
+
+/* TODO: Support multiple HDM decoders and DPA skip */
+static bool cxl_type3_dpa(CXLType3Dev *ct3d, hwaddr host_addr, uint64_t *dpa)
+{
+ uint32_t *cache_mem = ct3d->cxl_cstate.crb.cache_mem_registers;
+ uint64_t decoder_base, decoder_size, hpa_offset;
+ uint32_t hdm0_ctrl;
+ int ig, iw;
+
+ decoder_base = (((uint64_t)cache_mem[R_CXL_HDM_DECODER0_BASE_HI] << 32) |
+ cache_mem[R_CXL_HDM_DECODER0_BASE_LO]);
+ if ((uint64_t)host_addr < decoder_base) {
+ return false;
+ }
+
+ hpa_offset = (uint64_t)host_addr - decoder_base;
+
+ decoder_size = ((uint64_t)cache_mem[R_CXL_HDM_DECODER0_SIZE_HI] << 32) |
+ cache_mem[R_CXL_HDM_DECODER0_SIZE_LO];
+ if (hpa_offset >= decoder_size) {
+ return false;
+ }
+
+ hdm0_ctrl = cache_mem[R_CXL_HDM_DECODER0_CTRL];
+ iw = FIELD_EX32(hdm0_ctrl, CXL_HDM_DECODER0_CTRL, IW);
+ ig = FIELD_EX32(hdm0_ctrl, CXL_HDM_DECODER0_CTRL, IG);
+
+ *dpa = (MAKE_64BIT_MASK(0, 8 + ig) & hpa_offset) |
+ ((MAKE_64BIT_MASK(8 + ig + iw, 64 - 8 - ig - iw) & hpa_offset) >> iw);
+
+ return true;
+}
+
+MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host_addr, uint64_t *data,
+ unsigned size, MemTxAttrs attrs)
+{
+ CXLType3Dev *ct3d = CXL_TYPE3(d);
+ uint64_t dpa_offset;
+ MemoryRegion *mr;
+
+ /* TODO support volatile region */
+ mr = host_memory_backend_get_memory(ct3d->hostmem);
+ if (!mr) {
+ return MEMTX_ERROR;
+ }
+
+ if (!cxl_type3_dpa(ct3d, host_addr, &dpa_offset)) {
+ return MEMTX_ERROR;
+ }
+
+ if (dpa_offset > int128_get64(mr->size)) {
+ return MEMTX_ERROR;
+ }
+
+ return address_space_read(&ct3d->hostmem_as, dpa_offset, attrs, data, size);
+}
+
+MemTxResult cxl_type3_write(PCIDevice *d, hwaddr host_addr, uint64_t data,
+ unsigned size, MemTxAttrs attrs)
+{
+ CXLType3Dev *ct3d = CXL_TYPE3(d);
+ uint64_t dpa_offset;
+ MemoryRegion *mr;
+
+ mr = host_memory_backend_get_memory(ct3d->hostmem);
+ if (!mr) {
+ return MEMTX_OK;
+ }
+
+ if (!cxl_type3_dpa(ct3d, host_addr, &dpa_offset)) {
+ return MEMTX_OK;
+ }
+
+ if (dpa_offset > int128_get64(mr->size)) {
+ return MEMTX_OK;
+ }
+ return address_space_write(&ct3d->hostmem_as, dpa_offset, attrs,
+ &data, size);
}
static void ct3d_reset(DeviceState *dev)
--
MST
next prev parent reply other threads:[~2022-05-16 11:32 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-16 10:35 [PULL 00/91] virtio,pc,pci: fixes,cleanups,features Michael S. Tsirkin
2022-05-16 10:35 ` [PULL 01/91] virtio: fix feature negotiation for ACCESS_PLATFORM Michael S. Tsirkin
2022-05-16 10:35 ` [PULL 02/91] intel-iommu: correct the value used for error_setg_errno() Michael S. Tsirkin
2022-05-16 10:35 ` [PULL 03/91] hw/pci/cxl: Add a CXL component type (interface) Michael S. Tsirkin
2022-05-16 10:35 ` [PULL 04/91] hw/cxl/component: Introduce CXL components (8.1.x, 8.2.5) Michael S. Tsirkin
2022-05-16 10:35 ` [PULL 05/91] MAINTAINERS: Add entry for Compute Express Link Emulation Michael S. Tsirkin
2022-05-16 10:35 ` [PULL 06/91] hw/cxl/device: Introduce a CXL device (8.2.8) Michael S. Tsirkin
2022-05-16 10:35 ` [PULL 07/91] hw/cxl/device: Implement the CAP array (8.2.8.1-2) Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 08/91] hw/cxl/device: Implement basic mailbox (8.2.8.4) Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 09/91] hw/cxl/device: Add memory device utilities Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 10/91] hw/cxl/device: Add cheap EVENTS implementation (8.2.9.1) Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 11/91] hw/cxl/device: Timestamp implementation (8.2.9.3) Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 12/91] hw/cxl/device: Add log commands (8.2.9.4) + CEL Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 13/91] hw/pxb: Use a type for realizing expanders Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 14/91] hw/pci/cxl: Create a CXL bus type Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 15/91] cxl: Machine level control on whether CXL support is enabled Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 16/91] hw/pxb: Allow creation of a CXL PXB (host bridge) Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 17/91] qtest/cxl: Introduce initial test for pxb-cxl only Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 18/91] hw/cxl/rp: Add a root port Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 19/91] hw/cxl/device: Add a memory device (8.2.8.5) Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 20/91] hw/cxl/device: Implement MMIO HDM decoding (8.2.5.12) Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 21/91] hw/cxl/device: Add some trivial commands Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 22/91] hw/cxl/device: Plumb real Label Storage Area (LSA) sizing Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 23/91] hw/cxl/device: Implement get/set Label Storage Area (LSA) Michael S. Tsirkin
2022-05-16 10:36 ` [PULL 24/91] qtests/cxl: Add initial root port and CXL type3 tests Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 25/91] hw/cxl/component: Implement host bridge MMIO (8.2.5, table 142) Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 26/91] acpi/cxl: Add _OSC implementation (9.14.2) Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 27/91] acpi/cxl: Create the CEDT (9.14.1) Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 28/91] hw/cxl/component: Add utils for interleave parameter encoding/decoding Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 29/91] hw/cxl/host: Add support for CXL Fixed Memory Windows Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 30/91] acpi/cxl: Introduce CFMWS structures in CEDT Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 31/91] hw/pci-host/gpex-acpi: Add support for dsdt construction for pxb-cxl Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 32/91] pci/pcie_port: Add pci_find_port_by_pn() Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 33/91] CXL/cxl_component: Add cxl_get_hb_cstate() Michael S. Tsirkin
2022-05-16 10:37 ` Michael S. Tsirkin [this message]
2022-05-16 10:37 ` [PULL 35/91] cxl/cxl-host: Add memops for CFMWS region Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 36/91] hw/cxl/component Add a dumb HDM decoder handler Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 37/91] i386/pc: Enable CXL fixed memory windows Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 38/91] tests/acpi: q35: Allow addition of a CXL test Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 39/91] qtests/bios-tables-test: Add a test for CXL emulation Michael S. Tsirkin
2022-05-16 10:37 ` [PULL 40/91] tests/acpi: Add tables " Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 41/91] qtest/cxl: Add more complex test cases with CFMWs Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 42/91] docs/cxl: Add initial Compute eXpress Link (CXL) documentation Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 43/91] vhost: Track descriptor chain in private at SVQ Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 44/91] vhost: Fix device's used descriptor dequeue Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 45/91] vdpa: Fix bad index calculus at vhost_vdpa_get_vring_base Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 46/91] vdpa: Fix index calculus at vhost_vdpa_svqs_start Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 47/91] hw/virtio: Replace g_memdup() by g_memdup2() Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 48/91] vhost: Fix element in vhost_svq_add failure Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 49/91] target/i386: Fix sanity check on max APIC ID / X2APIC enablement Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 50/91] intel_iommu: Support IR-only mode without DMA translation Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 51/91] intel_iommu: Only allow interrupt remapping to be enabled if it's supported Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 52/91] intel_iommu: Fix irqchip / X2APIC configuration checks Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 53/91] intel-iommu: remove VTD_FR_RESERVED_ERR Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 54/91] intel-iommu: block output address in interrupt address range Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 55/91] intel-iommu: update root_scalable before switching as during post_load Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 56/91] intel-iommu: update iq_dw during post load Michael S. Tsirkin
2022-05-16 10:38 ` [PULL 57/91] vhost_net: Print feature masks in hex Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 58/91] hw/virtio: move virtio-pci.h into shared include space Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 59/91] virtio-pci: add notification trace points Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 60/91] hw/virtio: add vhost_user_[read|write] " Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 61/91] docs: vhost-user: clean up request/reply description Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 62/91] docs: vhost-user: rewrite section on ring state machine Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 63/91] docs: vhost-user: replace master/slave with front-end/back-end Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 64/91] vhost-user.rst: add clarifying language about protocol negotiation Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 65/91] libvhost-user: expose vu_request_to_string Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 66/91] docs/devel: start documenting writing VirtIO devices Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 67/91] include/hw: start documenting the vhost API Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 68/91] hw/virtio/vhost-user: don't suppress F_CONFIG when supported Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 69/91] virtio/vhost-user: dynamically assign VhostUserHostNotifiers Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 70/91] virtio: drop name parameter for virtio_init() Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 71/91] virtio: add vhost support for virtio devices Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 72/91] qmp: add QMP command x-query-virtio Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 73/91] qmp: add QMP command x-query-virtio-status Michael S. Tsirkin
2022-05-16 10:39 ` [PULL 74/91] qmp: decode feature & status bits in virtio-status Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 75/91] qmp: add QMP commands for virtio/vhost queue-status Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 76/91] qmp: add QMP command x-query-virtio-queue-element Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 77/91] hmp: add virtio commands Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 78/91] vhost-user: more master/slave things Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 79/91] docs/vhost-user: Clarifications for VHOST_USER_ADD/REM_MEM_REG Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 80/91] include/hw/pci/pcie_host: Correct PCIE_MMCFG_BUS_MASK Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 81/91] include/hw/pci/pcie_host: Correct PCIE_MMCFG_SIZE_MAX Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 82/91] hw/i386: Make pit a property of common x86 base machine type Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 83/91] hw/i386: Make pic " Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 84/91] hw/i386/amd_iommu: Fix IOMMU event log encoding errors Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 85/91] virtio-net: setup vhost_dev and notifiers for cvq only when feature is negotiated Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 86/91] virtio-net: align ctrl_vq index for non-mq guest for vhost_vdpa Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 87/91] vhost-vdpa: fix improper cleanup in net_init_vhost_vdpa Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 88/91] vhost-net: fix improper cleanup in vhost_net_start Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 89/91] vhost-vdpa: backend feature should set only once Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 90/91] vhost-vdpa: change name and polarity for vhost_vdpa_one_time_request() Michael S. Tsirkin
2022-05-16 10:40 ` [PULL 91/91] virtio-net: don't handle mq request in userspace handler for vhost-vdpa Michael S. Tsirkin
2022-05-16 19:01 ` [PULL 00/91] virtio,pc,pci: fixes,cleanups,features Richard Henderson
2022-05-16 20:05 ` Michael S. Tsirkin
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=20220516095448.507876-35-mst@redhat.com \
--to=mst@redhat.com \
--cc=ani@anisinha.ca \
--cc=ben.widawsky@intel.com \
--cc=imammedo@redhat.com \
--cc=jonathan.cameron@huawei.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.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;
as well as URLs for NNTP newsgroup(s).