hw/cxl/host: Add support for CXL Fixed Memory Windows.
The concept of these is introduced in [1] in terms of the description the CEDT ACPI table. The principal is more general. Unlike once traffic hits the CXL root bridges, the host system memory address routing is implementation defined and effectively static once observable by standard / generic system software. Each CXL Fixed Memory Windows (CFMW) is a region of PA space which has fixed system dependent routing configured so that accesses can be routed to the CXL devices below a set of target root bridges. The accesses may be interleaved across multiple root bridges. For QEMU we could have fully specified these regions in terms of a base PA + size, but as the absolute address does not matter it is simpler to let individual platforms place the memory regions. ExampleS: -cxl-fixed-memory-window targets.0=cxl.0,size=128G -cxl-fixed-memory-window targets.0=cxl.1,size=128G -cxl-fixed-memory-window targets.0=cxl0,targets.1=cxl.1,size=256G,interleave-granularity=2k Specifies * 2x 128G regions not interleaved across root bridges, one for each of the root bridges with ids cxl.0 and cxl.1 * 256G region interleaved across root bridges with ids cxl.0 and cxl.1 with a 2k interleave granularity. When system software enumerates the devices below a given root bridge it can then decide which CFMW to use. If non interleave is desired (or possible) it can use the appropriate CFMW for the root bridge in question. If there are suitable devices to interleave across the two root bridges then it may use the 3rd CFMS. A number of other designs were considered but the following constraints made it hard to adapt existing QEMU approaches to this particular problem. 1) The size must be known before a specific architecture / board brings up it's PA memory map. We need to set up an appropriate region. 2) Using links to the host bridges provides a clean command line interface but these links cannot be established until command line devices have been added. Hence the two step process used here of first establishing the size, interleave-ways and granularity + caching the ids of the host bridges and then, once available finding the actual host bridges so they can be used later to support interleave decoding. [1] CXL 2.0 ECN: CEDT CFMWS & QTG DSM (computeexpresslink.org / specifications) Signed-off-by: Jonathan Cameron <jonathan.cameron@huawei.com> Acked-by: Markus Armbruster <armbru@redhat.com> # QAPI Schema Message-Id: <20220429144110.25167-28-Jonathan.Cameron@huawei.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jonathan Cameron
Michael S. Tsirkin
parent
829de299d1
commit
aadfe32091
|
|
@ -0,0 +1,14 @@
|
|||
/*
|
||||
* CXL host parameter parsing routine stubs
|
||||
*
|
||||
* Copyright (c) 2022 Huawei
|
||||
*/
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "hw/cxl/cxl.h"
|
||||
|
||||
void cxl_fixed_memory_window_config(MachineState *ms,
|
||||
CXLFixedMemoryWindowOptions *object,
|
||||
Error **errp) {};
|
||||
|
||||
void cxl_fixed_memory_window_link_targets(Error **errp) {};
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
/*
|
||||
* CXL host parameter parsing routines
|
||||
*
|
||||
* Copyright (c) 2022 Huawei
|
||||
* Modeled loosely on the NUMA options handling in hw/core/numa.c
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/units.h"
|
||||
#include "qemu/bitmap.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qapi/error.h"
|
||||
#include "sysemu/qtest.h"
|
||||
#include "hw/boards.h"
|
||||
|
||||
#include "qapi/qapi-visit-machine.h"
|
||||
#include "hw/cxl/cxl.h"
|
||||
|
||||
void cxl_fixed_memory_window_config(MachineState *ms,
|
||||
CXLFixedMemoryWindowOptions *object,
|
||||
Error **errp)
|
||||
{
|
||||
CXLFixedWindow *fw = g_malloc0(sizeof(*fw));
|
||||
strList *target;
|
||||
int i;
|
||||
|
||||
for (target = object->targets; target; target = target->next) {
|
||||
fw->num_targets++;
|
||||
}
|
||||
|
||||
fw->enc_int_ways = cxl_interleave_ways_enc(fw->num_targets, errp);
|
||||
if (*errp) {
|
||||
return;
|
||||
}
|
||||
|
||||
fw->targets = g_malloc0_n(fw->num_targets, sizeof(*fw->targets));
|
||||
for (i = 0, target = object->targets; target; i++, target = target->next) {
|
||||
/* This link cannot be resolved yet, so stash the name for now */
|
||||
fw->targets[i] = g_strdup(target->value);
|
||||
}
|
||||
|
||||
if (object->size % (256 * MiB)) {
|
||||
error_setg(errp,
|
||||
"Size of a CXL fixed memory window must my a multiple of 256MiB");
|
||||
return;
|
||||
}
|
||||
fw->size = object->size;
|
||||
|
||||
if (object->has_interleave_granularity) {
|
||||
fw->enc_int_gran =
|
||||
cxl_interleave_granularity_enc(object->interleave_granularity,
|
||||
errp);
|
||||
if (*errp) {
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
/* Default to 256 byte interleave */
|
||||
fw->enc_int_gran = 0;
|
||||
}
|
||||
|
||||
ms->cxl_devices_state->fixed_windows =
|
||||
g_list_append(ms->cxl_devices_state->fixed_windows, fw);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void cxl_fixed_memory_window_link_targets(Error **errp)
|
||||
{
|
||||
MachineState *ms = MACHINE(qdev_get_machine());
|
||||
|
||||
if (ms->cxl_devices_state && ms->cxl_devices_state->fixed_windows) {
|
||||
GList *it;
|
||||
|
||||
for (it = ms->cxl_devices_state->fixed_windows; it; it = it->next) {
|
||||
CXLFixedWindow *fw = it->data;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < fw->num_targets; i++) {
|
||||
Object *o;
|
||||
bool ambig;
|
||||
|
||||
o = object_resolve_path_type(fw->targets[i],
|
||||
TYPE_PXB_CXL_DEVICE,
|
||||
&ambig);
|
||||
if (!o) {
|
||||
error_setg(errp, "Could not resolve CXLFM target %s",
|
||||
fw->targets[i]);
|
||||
return;
|
||||
}
|
||||
fw->target_hbs[i] = PXB_CXL_DEV(o);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3,4 +3,10 @@ softmmu_ss.add(when: 'CONFIG_CXL',
|
|||
'cxl-component-utils.c',
|
||||
'cxl-device-utils.c',
|
||||
'cxl-mailbox-utils.c',
|
||||
'cxl-host.c',
|
||||
),
|
||||
if_false: files(
|
||||
'cxl-host-stubs.c',
|
||||
))
|
||||
|
||||
softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('cxl-host-stubs.c'))
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@
|
|||
#ifndef CXL_H
|
||||
#define CXL_H
|
||||
|
||||
|
||||
#include "qapi/qapi-types-machine.h"
|
||||
#include "hw/pci/pci_bridge.h"
|
||||
#include "hw/pci/pci_host.h"
|
||||
#include "cxl_pci.h"
|
||||
#include "cxl_component.h"
|
||||
|
|
@ -20,10 +23,23 @@
|
|||
|
||||
#define CXL_WINDOW_MAX 10
|
||||
|
||||
typedef struct CXLFixedWindow {
|
||||
uint64_t size;
|
||||
char **targets;
|
||||
struct PXBDev *target_hbs[8];
|
||||
uint8_t num_targets;
|
||||
uint8_t enc_int_ways;
|
||||
uint8_t enc_int_gran;
|
||||
/* Todo: XOR based interleaving */
|
||||
MemoryRegion mr;
|
||||
hwaddr base;
|
||||
} CXLFixedWindow;
|
||||
|
||||
typedef struct CXLState {
|
||||
bool is_enabled;
|
||||
MemoryRegion host_mr;
|
||||
unsigned int next_mr_idx;
|
||||
GList *fixed_windows;
|
||||
} CXLState;
|
||||
|
||||
struct CXLHost {
|
||||
|
|
@ -35,4 +51,9 @@ struct CXLHost {
|
|||
#define TYPE_PXB_CXL_HOST "pxb-cxl-host"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(CXLHost, PXB_CXL_HOST)
|
||||
|
||||
void cxl_fixed_memory_window_config(MachineState *ms,
|
||||
CXLFixedMemoryWindowOptions *object,
|
||||
Error **errp);
|
||||
void cxl_fixed_memory_window_link_targets(Error **errp);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -502,6 +502,27 @@
|
|||
'dst': 'uint16',
|
||||
'val': 'uint8' }}
|
||||
|
||||
##
|
||||
# @CXLFixedMemoryWindowOptions:
|
||||
#
|
||||
# Create a CXL Fixed Memory Window
|
||||
#
|
||||
# @size: Size of the Fixed Memory Window in bytes. Must be a multiple
|
||||
# of 256MiB.
|
||||
# @interleave-granularity: Number of contiguous bytes for which
|
||||
# accesses will go to a given interleave target.
|
||||
# Accepted values [256, 512, 1k, 2k, 4k, 8k, 16k]
|
||||
# @targets: Target root bridge IDs from -device ...,id=<ID> for each root
|
||||
# bridge.
|
||||
#
|
||||
# Since 7.1
|
||||
##
|
||||
{ 'struct': 'CXLFixedMemoryWindowOptions',
|
||||
'data': {
|
||||
'size': 'size',
|
||||
'*interleave-granularity': 'size',
|
||||
'targets': ['str'] }}
|
||||
|
||||
##
|
||||
# @X86CPURegister32:
|
||||
#
|
||||
|
|
|
|||
|
|
@ -467,6 +467,44 @@ SRST
|
|||
-numa hmat-cache,node-id=1,size=10K,level=1,associativity=direct,policy=write-back,line=8
|
||||
ERST
|
||||
|
||||
DEF("cxl-fixed-memory-window", HAS_ARG, QEMU_OPTION_cxl_fixed_memory_window,
|
||||
"-cxl-fixed-memory-window targets.0=firsttarget,targets.1=secondtarget,size=size[,interleave-granularity=granularity]\n",
|
||||
QEMU_ARCH_ALL)
|
||||
SRST
|
||||
``-cxl-fixed-memory-window targets.0=firsttarget,targets.1=secondtarget,size=size[,interleave-granularity=granularity]``
|
||||
Define a CXL Fixed Memory Window (CFMW).
|
||||
|
||||
Described in the CXL 2.0 ECN: CEDT CFMWS & QTG _DSM.
|
||||
|
||||
They are regions of Host Physical Addresses (HPA) on a system which
|
||||
may be interleaved across one or more CXL host bridges. The system
|
||||
software will assign particular devices into these windows and
|
||||
configure the downstream Host-managed Device Memory (HDM) decoders
|
||||
in root ports, switch ports and devices appropriately to meet the
|
||||
interleave requirements before enabling the memory devices.
|
||||
|
||||
``targets.X=firsttarget`` provides the mapping to CXL host bridges
|
||||
which may be identified by the id provied in the -device entry.
|
||||
Multiple entries are needed to specify all the targets when
|
||||
the fixed memory window represents interleaved memory. X is the
|
||||
target index from 0.
|
||||
|
||||
``size=size`` sets the size of the CFMW. This must be a multiple of
|
||||
256MiB. The region will be aligned to 256MiB but the location is
|
||||
platform and configuration dependent.
|
||||
|
||||
``interleave-granularity=granularity`` sets the granularity of
|
||||
interleave. Default 256KiB. Only 256KiB, 512KiB, 1024KiB, 2048KiB
|
||||
4096KiB, 8192KiB and 16384KiB granularities supported.
|
||||
|
||||
Example:
|
||||
|
||||
::
|
||||
|
||||
-cxl-fixed-memory-window targets.0=cxl.0,targets.1=cxl.1,size=128G,interleave-granularity=512k
|
||||
|
||||
ERST
|
||||
|
||||
DEF("add-fd", HAS_ARG, QEMU_OPTION_add_fd,
|
||||
"-add-fd fd=fd,set=set[,opaque=opaque]\n"
|
||||
" Add 'fd' to fd 'set'\n", QEMU_ARCH_ALL)
|
||||
|
|
|
|||
47
softmmu/vl.c
47
softmmu/vl.c
|
|
@ -93,6 +93,7 @@
|
|||
#include "qemu/config-file.h"
|
||||
#include "qemu/qemu-options.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "hw/cxl/cxl.h"
|
||||
#ifdef CONFIG_VIRTFS
|
||||
#include "fsdev/qemu-fsdev.h"
|
||||
#endif
|
||||
|
|
@ -118,6 +119,7 @@
|
|||
#include "qapi/qapi-events-run-state.h"
|
||||
#include "qapi/qapi-visit-block-core.h"
|
||||
#include "qapi/qapi-visit-compat.h"
|
||||
#include "qapi/qapi-visit-machine.h"
|
||||
#include "qapi/qapi-visit-ui.h"
|
||||
#include "qapi/qapi-commands-block-core.h"
|
||||
#include "qapi/qapi-commands-migration.h"
|
||||
|
|
@ -143,6 +145,12 @@ typedef struct BlockdevOptionsQueueEntry {
|
|||
|
||||
typedef QSIMPLEQ_HEAD(, BlockdevOptionsQueueEntry) BlockdevOptionsQueue;
|
||||
|
||||
typedef struct CXLFMWOptionQueueEntry {
|
||||
CXLFixedMemoryWindowOptions *opts;
|
||||
Location loc;
|
||||
QSIMPLEQ_ENTRY(CXLFMWOptionQueueEntry) entry;
|
||||
} CXLFMWOptionQueueEntry;
|
||||
|
||||
typedef struct ObjectOption {
|
||||
ObjectOptions *opts;
|
||||
QTAILQ_ENTRY(ObjectOption) next;
|
||||
|
|
@ -169,6 +177,8 @@ static int snapshot;
|
|||
static bool preconfig_requested;
|
||||
static QemuPluginList plugin_list = QTAILQ_HEAD_INITIALIZER(plugin_list);
|
||||
static BlockdevOptionsQueue bdo_queue = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue);
|
||||
static QSIMPLEQ_HEAD(, CXLFMWOptionQueueEntry) CXLFMW_opts =
|
||||
QSIMPLEQ_HEAD_INITIALIZER(CXLFMW_opts);
|
||||
static bool nographic = false;
|
||||
static int mem_prealloc; /* force preallocation of physical target memory */
|
||||
static const char *vga_model = NULL;
|
||||
|
|
@ -1153,6 +1163,24 @@ static void parse_display(const char *p)
|
|||
}
|
||||
}
|
||||
|
||||
static void parse_cxl_fixed_memory_window(const char *optarg)
|
||||
{
|
||||
CXLFMWOptionQueueEntry *cfmws_entry;
|
||||
Visitor *v;
|
||||
|
||||
v = qobject_input_visitor_new_str(optarg, "cxl-fixed-memory-window",
|
||||
&error_fatal);
|
||||
cfmws_entry = g_new(CXLFMWOptionQueueEntry, 1);
|
||||
visit_type_CXLFixedMemoryWindowOptions(v, NULL, &cfmws_entry->opts,
|
||||
&error_fatal);
|
||||
if (!cfmws_entry->opts) {
|
||||
exit(1);
|
||||
}
|
||||
visit_free(v);
|
||||
loc_save(&cfmws_entry->loc);
|
||||
QSIMPLEQ_INSERT_TAIL(&CXLFMW_opts, cfmws_entry, entry);
|
||||
}
|
||||
|
||||
static inline bool nonempty_str(const char *str)
|
||||
{
|
||||
return str && *str;
|
||||
|
|
@ -2015,6 +2043,20 @@ static void qemu_create_late_backends(void)
|
|||
qemu_semihosting_console_init();
|
||||
}
|
||||
|
||||
static void cxl_set_opts(void)
|
||||
{
|
||||
while (!QSIMPLEQ_EMPTY(&CXLFMW_opts)) {
|
||||
CXLFMWOptionQueueEntry *cfmws_entry = QSIMPLEQ_FIRST(&CXLFMW_opts);
|
||||
|
||||
loc_restore(&cfmws_entry->loc);
|
||||
QSIMPLEQ_REMOVE_HEAD(&CXLFMW_opts, entry);
|
||||
cxl_fixed_memory_window_config(current_machine, cfmws_entry->opts,
|
||||
&error_fatal);
|
||||
qapi_free_CXLFixedMemoryWindowOptions(cfmws_entry->opts);
|
||||
g_free(cfmws_entry);
|
||||
}
|
||||
}
|
||||
|
||||
static void qemu_resolve_machine_memdev(void)
|
||||
{
|
||||
if (ram_memdev_id) {
|
||||
|
|
@ -2661,6 +2703,7 @@ void qmp_x_exit_preconfig(Error **errp)
|
|||
|
||||
qemu_init_board();
|
||||
qemu_create_cli_devices();
|
||||
cxl_fixed_memory_window_link_targets(errp);
|
||||
qemu_machine_creation_done();
|
||||
|
||||
if (loadvm) {
|
||||
|
|
@ -2841,6 +2884,9 @@ void qemu_init(int argc, char **argv, char **envp)
|
|||
exit(1);
|
||||
}
|
||||
break;
|
||||
case QEMU_OPTION_cxl_fixed_memory_window:
|
||||
parse_cxl_fixed_memory_window(optarg);
|
||||
break;
|
||||
case QEMU_OPTION_display:
|
||||
parse_display(optarg);
|
||||
break;
|
||||
|
|
@ -3652,6 +3698,7 @@ void qemu_init(int argc, char **argv, char **envp)
|
|||
|
||||
qemu_resolve_machine_memdev();
|
||||
parse_numa_opts(current_machine);
|
||||
cxl_set_opts();
|
||||
|
||||
if (vmstate_dump_file) {
|
||||
/* dump and exit */
|
||||
|
|
|
|||
Loading…
Reference in New Issue