Skip to content

Commit 0efa738

Browse files
ikegami-tikegami-t
committed
nvme: add performance characteristic feature output
Only added the stdout output at first. Signed-off-by: Tokunori Ikegami <[email protected]>
1 parent 0b82c0f commit 0efa738

4 files changed

Lines changed: 171 additions & 0 deletions

File tree

‎nvme-print-stdout.c‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4882,6 +4882,66 @@ static void stdout_plm_config(struct nvme_plm_config *plmcfg)
48824882
printf("\tDTWIN Time Threshold :%"PRIu64"\n", le64_to_cpu(plmcfg->dtwintt));
48834883
}
48844884

4885+
static void stdout_feat_perfc_std(struct nvme_std_perf_attr *data)
4886+
{
4887+
printf("random 4 kib average read latency (R4KARL): %s (0x%02x)\n",
4888+
nvme_feature_perfc_r4karl_to_string(data->r4karl), data->r4karl);
4889+
}
4890+
4891+
static void stdout_feat_perfc_id_list(struct nvme_perf_attr_id_list *data)
4892+
{
4893+
int i;
4894+
int attri_vs;
4895+
4896+
printf("attribute type (ATTRTYP): %s (0x%02x)\n",
4897+
nvme_feature_perfc_attrtyp_to_string(data->attrtyp), data->attrtyp);
4898+
printf("maximum saveable vendor specific performance attributes (MSVSPA): %d\n",
4899+
data->msvspa);
4900+
printf("unused saveable vendor specific performance attributes (USVSPA): %d\n",
4901+
data->usvspa);
4902+
4903+
printf("performance attribute identifier list\n");
4904+
for (i = 0; i < ARRAY_SIZE(data->id_list); i++) {
4905+
attri_vs = i + NVME_FEAT_PERFC_ATTRI_VS_MIN;
4906+
printf("performance attribute %02xh identifier (PA%02XHI): %s\n", attri_vs,
4907+
attri_vs, util_uuid_to_string(data->id_list[i].id));
4908+
}
4909+
}
4910+
4911+
static void stdout_feat_perfc_vs(struct nvme_vs_perf_attr *data)
4912+
{
4913+
printf("performance attribute identifier (PAID): %s\n", util_uuid_to_string(data->paid));
4914+
printf("attribute length (ATTRL): %u\n", data->attrl);
4915+
printf("vendor specific (VS):\n");
4916+
d((unsigned char *)data->vs, data->attrl, 16, 1);
4917+
}
4918+
4919+
static void stdout_feat_perfc(enum nvme_features_id fid, unsigned int result,
4920+
struct nvme_perf_characteristics *data)
4921+
{
4922+
__u8 attri;
4923+
bool rvspa;
4924+
4925+
nvme_feature_decode_perf_characteristics(result, &attri, &rvspa);
4926+
4927+
printf("attribute index (ATTRI): %s (0x%02x)\n", nvme_feature_perfc_attri_to_string(attri),
4928+
attri);
4929+
4930+
switch (attri) {
4931+
case NVME_FEAT_PERFC_ATTRI_STD:
4932+
stdout_feat_perfc_std(data->std_perf);
4933+
break;
4934+
case NVME_FEAT_PERFC_ATTRI_ID_LIST:
4935+
stdout_feat_perfc_id_list(data->id_list);
4936+
break;
4937+
case NVME_FEAT_PERFC_ATTRI_VS_MIN ... NVME_FEAT_PERFC_ATTRI_VS_MAX:
4938+
stdout_feat_perfc_vs(data->vs_perf);
4939+
break;
4940+
default:
4941+
break;
4942+
}
4943+
}
4944+
48854945
static void stdout_host_metadata(enum nvme_features_id fid,
48864946
struct nvme_host_metadata *data)
48874947
{
@@ -5111,6 +5171,9 @@ static void stdout_feature_show_fields(enum nvme_features_id fid,
51115171
printf("\tPower Loss Signaling Mode (PLSM): %s\n",
51125172
nvme_pls_mode_to_string(NVME_GET(result, FEAT_PLS_MODE)));
51135173
break;
5174+
case NVME_FEAT_FID_PERF_CHARACTERISTICS:
5175+
stdout_feat_perfc(fid, result, (struct nvme_perf_characteristics *)buf);
5176+
break;
51145177
case NVME_FEAT_FID_ENH_CTRL_METADATA:
51155178
case NVME_FEAT_FID_CTRL_METADATA:
51165179
case NVME_FEAT_FID_NS_METADATA:

‎nvme-print.c‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,6 +1096,96 @@ const char *nvme_feature_temp_sel_to_string(__u8 sel)
10961096
}
10971097
}
10981098

1099+
const char *nvme_feature_perfc_attri_to_string(__u8 attri)
1100+
{
1101+
switch (attri) {
1102+
case NVME_FEAT_PERFC_ATTRI_STD:
1103+
return "standard performance attribute";
1104+
case NVME_FEAT_PERFC_ATTRI_ID_LIST:
1105+
return "performance attribute identifier list";
1106+
case NVME_FEAT_PERFC_ATTRI_VS_MIN ... NVME_FEAT_PERFC_ATTRI_VS_MAX:
1107+
return "vendor specific performance attribute";
1108+
default:
1109+
break;
1110+
}
1111+
1112+
return "reserved";
1113+
}
1114+
1115+
const char *nvme_feature_perfc_r4karl_to_string(__u8 r4karl)
1116+
{
1117+
switch (r4karl) {
1118+
case NVME_FEAT_PERFC_R4KARL_NO_REPORT:
1119+
return "not reported";
1120+
case NVME_FEAT_PERFC_R4KARL_GE_100_SEC:
1121+
return "greater than or equal to 100 seconds";
1122+
case NVME_FEAT_PERFC_R4KARL_GE_50_SEC:
1123+
return "greater than or equal to 50 seconds and less than 100 seconds";
1124+
case NVME_FEAT_PERFC_R4KARL_GE_10_SEC:
1125+
return "greater than or equal to 10 seconds and less than 50 seconds";
1126+
case NVME_FEAT_PERFC_R4KARL_GE_5_SEC:
1127+
return "greater than or equal to 5 seconds and less than 10 seconds";
1128+
case NVME_FEAT_PERFC_R4KARL_GE_1_SEC:
1129+
return "greater than or equal to 1 second and less than 5 seconds";
1130+
case NVME_FEAT_PERFC_R4KARL_GE_500_MS:
1131+
return "greater than or equal to 500 milliseconds and less than 1 second";
1132+
case NVME_FEAT_PERFC_R4KARL_GE_100_MS:
1133+
return "greater than or equal to 100 milliseconds and less than 500 milliseconds";
1134+
case NVME_FEAT_PERFC_R4KARL_GE_50_MS:
1135+
return "greater than or equal to 50 milliseconds and less than 100 milliseconds";
1136+
case NVME_FEAT_PERFC_R4KARL_GE_10_MS:
1137+
return "greater than or equal to 10 milliseconds and less than 50 milliseconds";
1138+
case NVME_FEAT_PERFC_R4KARL_GE_5_MS:
1139+
return "greater than or equal to 5 milliseconds and less than 10 milliseconds";
1140+
case NVME_FEAT_PERFC_R4KARL_GE_1_MS:
1141+
return "greater than or equal to 1 millisecond and less than 5 milliseconds";
1142+
case NVME_FEAT_PERFC_R4KARL_GE_500_US:
1143+
return "greater than or equal to 500 microseconds and less than 1 millisecond";
1144+
case NVME_FEAT_PERFC_R4KARL_GE_100_US:
1145+
return "greater than or equal to 100 microseconds and less than 500 microseconds";
1146+
case NVME_FEAT_PERFC_R4KARL_GE_50_US:
1147+
return "greater than or equal to 50 microseconds and less than 100 microseconds";
1148+
case NVME_FEAT_PERFC_R4KARL_GE_10_US:
1149+
return "greater than or equal to 10 microseconds and less than 50 microseconds";
1150+
case NVME_FEAT_PERFC_R4KARL_GE_5_US:
1151+
return "greater than or equal to 5 microseconds and less than 10 microseconds";
1152+
case NVME_FEAT_PERFC_R4KARL_GE_1_US:
1153+
return "greater than or equal to 1 microsecond and less than 5 microseconds";
1154+
case NVME_FEAT_PERFC_R4KARL_GE_500_NS:
1155+
return "greater than or equal to 500 nanoseconds and less than 1 microsecond";
1156+
case NVME_FEAT_PERFC_R4KARL_GE_100_NS:
1157+
return "greater than or equal to 100 nanoseconds and less than 500 nanoseconds";
1158+
case NVME_FEAT_PERFC_R4KARL_GE_50_NS:
1159+
return "greater than or equal to 50 nanoseconds and less than 100 nanoseconds";
1160+
case NVME_FEAT_PERFC_R4KARL_GE_10_NS:
1161+
return "greater than or equal to 10 nanoseconds and less than 50 nanoseconds";
1162+
case NVME_FEAT_PERFC_R4KARL_GE_5_NS:
1163+
return "greater than or equal to 5 nanoseconds and less than 10 nanoseconds";
1164+
case NVME_FEAT_PERFC_R4KARL_GE_1_NS:
1165+
return "greater than or equal to 1 nanosecond and less than 5 nanoseconds";
1166+
default:
1167+
break;
1168+
}
1169+
1170+
return "reserved";
1171+
}
1172+
1173+
const char *nvme_feature_perfc_attrtyp_to_string(__u8 attrtyp)
1174+
{
1175+
switch (attrtyp) {
1176+
case NVME_GET_FEATURES_SEL_CURRENT:
1177+
return "current attribute";
1178+
case NVME_GET_FEATURES_SEL_DEFAULT:
1179+
return "default attribute";
1180+
case NVME_GET_FEATURES_SEL_SAVED:
1181+
return "saved attribute";
1182+
default:
1183+
break;
1184+
}
1185+
1186+
return "reserved";
1187+
}
1188+
10991189
const char *nvme_ns_wp_cfg_to_string(enum nvme_ns_write_protect_cfg state)
11001190
{
11011191
switch (state) {

‎nvme-print.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,9 @@ const char *nvme_feature_temp_sel_to_string(__u8 sel);
300300
const char *nvme_feature_temp_type_to_string(__u8 type);
301301
const char *nvme_feature_to_string(enum nvme_features_id feature);
302302
const char *nvme_feature_wl_hints_to_string(__u8 wh);
303+
const char *nvme_feature_perfc_attri_to_string(__u8 attri);
304+
const char *nvme_feature_perfc_r4karl_to_string(__u8 r4karl);
305+
const char *nvme_feature_perfc_attrtyp_to_string(__u8 attrtyp);
303306
const char *nvme_host_metadata_type_to_string(enum nvme_features_id fid, __u8 type);
304307
const char *nvme_log_to_string(__u8 lid);
305308
const char *nvme_nss_hw_error_to_string(__u16 error_code);

‎nvme.c‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4772,6 +4772,18 @@ static void get_feature_id_print(struct feat_cfg cfg, int err, __u32 result,
47724772
}
47734773
}
47744774

4775+
static bool is_get_feature_result_set(enum nvme_features_id feature_id)
4776+
{
4777+
switch (feature_id) {
4778+
case NVME_FEAT_FID_PERF_CHARACTERISTICS:
4779+
return false;
4780+
default:
4781+
break;
4782+
}
4783+
4784+
return true;
4785+
}
4786+
47754787
static int get_feature_id_changed(struct nvme_dev *dev, struct feat_cfg cfg,
47764788
nvme_print_flags_t flags)
47774789
{
@@ -4792,6 +4804,9 @@ static int get_feature_id_changed(struct nvme_dev *dev, struct feat_cfg cfg,
47924804
err_def = get_feature_id(dev, &cfg, &buf_def, &result_def);
47934805
}
47944806

4807+
if (!err && !is_get_feature_result_set(cfg.feature_id))
4808+
result = cfg.cdw11;
4809+
47954810
if (err || !cfg.changed || err_def || result != result_def ||
47964811
(buf && buf_def && !strcmp(buf, buf_def)))
47974812
get_feature_id_print(cfg, err, result, buf, flags);

0 commit comments

Comments
 (0)