SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/cxl/mbox: replace sanitize_running() with cxl_dev_media_disabled()

Browse Source 
The spec states that reads/writes should have no effect and a part of
commands should be ignored when the media is disabled, not when the
sanitize command is running.

Introduce cxl_dev_media_disabled() to check if the media is disabled and
replace sanitize_running() with it.

Make sure that the media has been correctly disabled during sanitation
by adding an assert to __toggle_media(). Now, enabling when already
enabled or vice versa results in an assert() failure.

Suggested-by: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Link: https://lore.kernel.org/r/20231222090051.3265307-4-42.hyeyoo@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Message-Id: <20240705120643.959422-3-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:
Hyeonggon Yoo 2024-07-05 13:06:41 +01:00 committed by Michael S. Tsirkin
parent d61cc5b6a8
commit 75b800dd3b
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/cxl/cxl-mailbox-utils.c
View File

@ -2108,6 +2108,7 @@ int cxl_process_cci_message(CXLCCI *cci, uint8_t set, uint8_t cmd,
int ret; int ret;
const struct cxl_cmd *cxl_cmd; const struct cxl_cmd *cxl_cmd;
opcode_handler h; opcode_handler h;
CXLDeviceState *cxl_dstate;
*len_out = 0; *len_out = 0;
cxl_cmd = &cci->cxl_cmd_set[set][cmd]; cxl_cmd = &cci->cxl_cmd_set[set][cmd];
@ -2128,18 +2129,22 @@ int cxl_process_cci_message(CXLCCI *cci, uint8_t set, uint8_t cmd,
return CXL_MBOX_BUSY; return CXL_MBOX_BUSY;
} }
/* forbid any selected commands while overwriting */ /* forbid any selected commands while the media is disabled */
if (sanitize_running(cci)) { if (object_dynamic_cast(OBJECT(cci->d), TYPE_CXL_TYPE3)) {
if (h == cmd_events_get_records || cxl_dstate = &CXL_TYPE3(cci->d)->cxl_dstate;
h == cmd_ccls_get_partition_info ||
h == cmd_ccls_set_lsa || if (cxl_dev_media_disabled(cxl_dstate)) {
h == cmd_ccls_get_lsa || if (h == cmd_events_get_records ||
h == cmd_logs_get_log || h == cmd_ccls_get_partition_info ||
h == cmd_media_get_poison_list || h == cmd_ccls_set_lsa ||
h == cmd_media_inject_poison || h == cmd_ccls_get_lsa ||
h == cmd_media_clear_poison || h == cmd_logs_get_log ||
h == cmd_sanitize_overwrite) { h == cmd_media_get_poison_list ||
return CXL_MBOX_MEDIA_DISABLED; h == cmd_media_inject_poison ||
h == cmd_media_clear_poison ||
h == cmd_sanitize_overwrite) {
return CXL_MBOX_MEDIA_DISABLED;
}
} }
} }

4
hw/mem/cxl_type3.c
View File

@ -1142,7 +1142,7 @@ MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host_addr, uint64_t *data,
return MEMTX_ERROR; return MEMTX_ERROR;
} }
if (sanitize_running(&ct3d->cci)) { if (cxl_dev_media_disabled(&ct3d->cxl_dstate)) {
qemu_guest_getrandom_nofail(data, size); qemu_guest_getrandom_nofail(data, size);
return MEMTX_OK; return MEMTX_OK;
} }
@ -1164,7 +1164,7 @@ MemTxResult cxl_type3_write(PCIDevice *d, hwaddr host_addr, uint64_t data,
return MEMTX_ERROR; return MEMTX_ERROR;
} }
if (sanitize_running(&ct3d->cci)) { if (cxl_dev_media_disabled(&ct3d->cxl_dstate)) {
return MEMTX_OK; return MEMTX_OK;
} }

10
include/hw/cxl/cxl_device.h
View File

@ -397,16 +397,16 @@ static inline void __toggle_media(CXLDeviceState *cxl_dstate, int val)
#define cxl_dev_enable_media(cxlds) \ #define cxl_dev_enable_media(cxlds) \
do { __toggle_media((cxlds), 0x1); } while (0) do { __toggle_media((cxlds), 0x1); } while (0)
static inline bool cxl_dev_media_disabled(CXLDeviceState *cxl_dstate)
{
uint64_t dev_status_reg = cxl_dstate->mbox_reg_state64[R_CXL_MEM_DEV_STS];
return FIELD_EX64(dev_status_reg, CXL_MEM_DEV_STS, MEDIA_STATUS) == 0x3;
}
static inline bool scan_media_running(CXLCCI *cci) static inline bool scan_media_running(CXLCCI *cci)
{ {
return !!cci->bg.runtime && cci->bg.opcode == 0x4304; return !!cci->bg.runtime && cci->bg.opcode == 0x4304;
} }
static inline bool sanitize_running(CXLCCI *cci)
{
return !!cci->bg.runtime && cci->bg.opcode == 0x4400;
}
typedef struct CXLError { typedef struct CXLError {
QTAILQ_ENTRY(CXLError) node; QTAILQ_ENTRY(CXLError) node;
int type; /* Error code as per FE definition */ int type; /* Error code as per FE definition */