mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 09:10:28 +00:00
bhyve: abort and return FEATURE_NOT_SAVEABLE while set feature with a save flag for NVMe controller.
Currently bhyve's NVMe controller cannot save feature values cross reboot. It should return a FEATURE_NOT_SAVEABLE error when the command specifies a save flag. Quote from NVMe specification, page 205: https://nvmexpress.org/wp-content/uploads/NVM-Express-1_4-2019.06.10-Ratified.pdf If the Feature Identifier specified in the Set Features command is not saveable by the controller and the controller receives a Set Features command with the Save bit set to one, then the command shall be aborted with a status of Feature Identifier Not Saveable. Reviewed by: chuck (older version) Approved by: manu (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D32767
This commit is contained in:
parent
0fd43b0c6a
commit
8ab99dbea1
|
@ -566,9 +566,25 @@ enum nvme_critical_warning_state {
|
|||
#define NVME_SS_PAGE_SSTAT_GDE_SHIFT (8)
|
||||
#define NVME_SS_PAGE_SSTAT_GDE_MASK (0x1)
|
||||
|
||||
/* Features */
|
||||
/* Get Features */
|
||||
#define NVME_FEAT_GET_SEL_SHIFT (8)
|
||||
#define NVME_FEAT_GET_SEL_MASK (0x7)
|
||||
#define NVME_FEAT_GET_FID_SHIFT (0)
|
||||
#define NVME_FEAT_GET_FID_MASK (0xff)
|
||||
|
||||
/* Set Features */
|
||||
#define NVME_FEAT_SET_SV_SHIFT (31)
|
||||
#define NVME_FEAT_SET_SV_MASK (0x1)
|
||||
#define NVME_FEAT_SET_FID_SHIFT (0)
|
||||
#define NVME_FEAT_SET_FID_MASK (0xff)
|
||||
|
||||
/* Helper macro to combine *_MASK and *_SHIFT defines */
|
||||
#define NVMEB(name) (name##_MASK << name##_SHIFT)
|
||||
|
||||
/* Helper macro to extract value from x */
|
||||
#define NVMEV(name, x) (((x) >> name##_SHIFT) & name##_MASK)
|
||||
|
||||
/* CC register SHN field values */
|
||||
enum shn_value {
|
||||
NVME_SHN_NORMAL = 0x1,
|
||||
|
|
|
@ -1849,7 +1849,8 @@ nvme_opc_set_features(struct pci_nvme_softc *sc, struct nvme_command *command,
|
|||
{
|
||||
struct nvme_feature_obj *feat;
|
||||
uint32_t nsid = command->nsid;
|
||||
uint8_t fid = command->cdw10 & 0xFF;
|
||||
uint8_t fid = NVMEV(NVME_FEAT_SET_FID, command->cdw10);
|
||||
bool sv = NVMEV(NVME_FEAT_SET_SV, command->cdw10);
|
||||
|
||||
DPRINTF("%s: Feature ID 0x%x (%s)", __func__, fid, nvme_fid_to_name(fid));
|
||||
|
||||
|
@ -1858,6 +1859,13 @@ nvme_opc_set_features(struct pci_nvme_softc *sc, struct nvme_command *command,
|
|||
pci_nvme_status_genc(&compl->status, NVME_SC_INVALID_FIELD);
|
||||
return (1);
|
||||
}
|
||||
|
||||
if (sv) {
|
||||
pci_nvme_status_tc(&compl->status, NVME_SCT_COMMAND_SPECIFIC,
|
||||
NVME_SC_FEATURE_NOT_SAVEABLE);
|
||||
return (1);
|
||||
}
|
||||
|
||||
feat = &sc->feat[fid];
|
||||
|
||||
if (feat->namespace_specific && (nsid == NVME_GLOBAL_NAMESPACE_TAG)) {
|
||||
|
|
Loading…
Reference in a new issue