motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 18:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/nvme: Allocate sec-ctrl-list as a dynamic array

Browse source 
To prevent further bumping up the number of maximum VF te support, this
patch allocates a dynamic array (NvmeCtrl *)->sec_ctrl_list based on
number of VF supported by sriov_max_vfs property.

Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Minwoo Im <minwoo.im@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
This commit is contained in:
Minwoo Im 2024-05-29 21:42:33 +09:00 • committed by Klaus Jensen
parent 1a494d119a
commit c6159d0e38
3 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/nvme/ctrl.c
View file

@ -7868,12 +7868,6 @@ static bool nvme_check_params(NvmeCtrl *n, Error **errp)
return false; return false;
} }
if (params->sriov_max_vfs > NVME_MAX_VFS) {
error_setg(errp, "sriov_max_vfs must be between 0 and %d",
NVME_MAX_VFS);
return false;
}
if (params->cmb_size_mb) { if (params->cmb_size_mb) {
error_setg(errp, "CMB is not supported with SR-IOV"); error_setg(errp, "CMB is not supported with SR-IOV");
return false; return false;
@ -8485,7 +8479,7 @@ static Property nvme_props[] = {
DEFINE_PROP_UINT8("zoned.zasl", NvmeCtrl, params.zasl, 0), DEFINE_PROP_UINT8("zoned.zasl", NvmeCtrl, params.zasl, 0),
DEFINE_PROP_BOOL("zoned.auto_transition", NvmeCtrl, DEFINE_PROP_BOOL("zoned.auto_transition", NvmeCtrl,
params.auto_transition_zones, true), params.auto_transition_zones, true),
DEFINE_PROP_UINT8("sriov_max_vfs", NvmeCtrl, params.sriov_max_vfs, 0), DEFINE_PROP_UINT16("sriov_max_vfs", NvmeCtrl, params.sriov_max_vfs, 0),
DEFINE_PROP_UINT16("sriov_vq_flexible", NvmeCtrl, DEFINE_PROP_UINT16("sriov_vq_flexible", NvmeCtrl,
params.sriov_vq_flexible, 0), params.sriov_vq_flexible, 0),
DEFINE_PROP_UINT16("sriov_vi_flexible", NvmeCtrl, DEFINE_PROP_UINT16("sriov_vi_flexible", NvmeCtrl,

5
hw/nvme/nvme.h
View file

@ -26,7 +26,6 @@
#define NVME_MAX_CONTROLLERS 256 #define NVME_MAX_CONTROLLERS 256
#define NVME_MAX_NAMESPACES 256 #define NVME_MAX_NAMESPACES 256
#define NVME_MAX_VFS 127
#define NVME_EUI64_DEFAULT ((uint64_t)0x5254000000000000) #define NVME_EUI64_DEFAULT ((uint64_t)0x5254000000000000)
#define NVME_FDP_MAX_EVENTS 63 #define NVME_FDP_MAX_EVENTS 63
#define NVME_FDP_MAXPIDS 128 #define NVME_FDP_MAXPIDS 128
@ -533,7 +532,7 @@ typedef struct NvmeParams {
bool auto_transition_zones; bool auto_transition_zones;
bool legacy_cmb; bool legacy_cmb;
bool ioeventfd; bool ioeventfd;
uint8_t sriov_max_vfs; uint16_t sriov_max_vfs;
uint16_t sriov_vq_flexible; uint16_t sriov_vq_flexible;
uint16_t sriov_vi_flexible; uint16_t sriov_vi_flexible;
uint8_t sriov_max_vq_per_vf; uint8_t sriov_max_vq_per_vf;
@ -615,7 +614,7 @@ typedef struct NvmeCtrl {
NvmePriCtrlCap pri_ctrl_cap; NvmePriCtrlCap pri_ctrl_cap;
uint32_t nr_sec_ctrls; uint32_t nr_sec_ctrls;
NvmeSecCtrlEntry sec_ctrl_list[NVME_MAX_VFS]; NvmeSecCtrlEntry *sec_ctrl_list;
struct { struct {
uint16_t vqrfap; uint16_t vqrfap;
uint16_t virfap; uint16_t virfap;

2
hw/nvme/subsys.c
View file

@ -61,6 +61,8 @@ int nvme_subsys_register_ctrl(NvmeCtrl *n, Error **errp)
if (pci_is_vf(&n->parent_obj)) { if (pci_is_vf(&n->parent_obj)) {
cntlid = le16_to_cpu(sctrl->scid); cntlid = le16_to_cpu(sctrl->scid);
} else { } else {
n->sec_ctrl_list = g_new0(NvmeSecCtrlEntry, num_vfs);
for (cntlid = 0; cntlid < ARRAY_SIZE(subsys->ctrls); cntlid++) { for (cntlid = 0; cntlid < ARRAY_SIZE(subsys->ctrls); cntlid++) {
if (!subsys->ctrls[cntlid]) { if (!subsys->ctrls[cntlid]) {
break; break;