Retry discovery log page on DNR #810
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The ioctl might return 0, but the NVMe status might indicate an error. In these cases we should return EPROTO to indicate that the command did not succeed. Signed-off-by: Hannes Reinecke <[email protected]>
Reading the discovery log page might result in an NVMe status, so we should evaluate the DNR bit to check if it's safe to retry the command. Signed-off-by: Hannes Reinecke <[email protected]>
Update the function documentation to reflect the change in the ioctl return values. Signed-off-by: Hannes Reinecke <[email protected]>
Modify stub functions to correctly update the return values if the ioctl succeeded but an NVMe status was returned. Signed-off-by: Hannes Reinecke <[email protected]>
All 'set features' commands have an 'result' field as the last argument, so add an alternative function nvme_set_features_timestamp2() to follow the same calling convention. Signed-off-by: Hannes Reinecke <[email protected]>
All 'set features' commands have an 'result' field as the last argument, so add an alternative function nvme_set_features_host_behavior2() to follow the same calling convention. Signed-off-by: Hannes Reinecke <[email protected]>
All 'set features' commands have an 'result' field as the last argument, so add an alternative function nvme_set_features_host_id2() to follow the same calling convention. Signed-off-by: Hannes Reinecke <[email protected]>
All 'set features' commands have an 'result' field as the last argument, so add an alternative function nvme_set_features_iocs_profile2() to follow the same calling convention. Signed-off-by: Hannes Reinecke <[email protected]>
All 'get features' commands have an 'result' field as the last argument, so add an alternative function nvme_get_features_timestamp2() to follow the same calling convention. Signed-off-by: Hannes Reinecke <[email protected]>
All 'get features' commands have an 'result' field as the last argument, so add an alternative function nvme_get_features_host_id2() to follow the same calling convention. Signed-off-by: Hannes Reinecke <[email protected]>
Documentation states that the NVMe status code should be returned, to fix up the code to actually do it. Signed-off-by: Hannes Reinecke <[email protected]>
|
Quite a mess with the nvme status and ioctl return values. Looks way saner now. Thanks! |
calebsander
reviewed
Apr 11, 2024
| @@ -1113,6 +1122,9 @@ static struct nvmf_discovery_log *nvme_discovery_log( | |||
| nvme_msg(r, LOG_INFO, | |||
| "%s: discover try %d/%d failed, error %d\n", | |||
| name, retries, args->max_retries, errno); | |||
| if (*log_args.result && | |||
| !(*log_args.result & NVME_SC_DNR)) | |||
| continue; | |||
There was a problem hiding this comment.
continue in a do-while loop jumps to the while condition: while (genctr != le64_to_cpu(log->genctr) && ++retries < args->max_retries);. Is accessing the header valid valid if the command returned an error status? Presumably no data would have been transferred in that case.
There was a problem hiding this comment.
There were some nasty surprises with this series. I've reverted the whole series for now.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The ioctl to issue an NVMe command might complete successfully, but that does not indicate that the command itself was successful. The CQE (ie the 'result' parameter) might be set to indicate the the NVMe command returned with an error.
In these cases we should not return '0' from the ioctl, but rather set 'EPROTO' to indicate that somthing has failed.
This then can be used when reading the discovery log page to check if it's safe to re-read the log page or if one should abort.