Skip to content

End grp evt #2866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igaw merged 2 commits into from
Jul 16, 2025
+12 −6
Merged

End grp evt #2866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f397c2
nvme-print: fix stdout_endurance_group_event_agg_log() parameter
ikegami-t Jul 15, 2025
4c91887
nvme-print-stdout: add get log verbose outputs
ikegami-t Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nvme-print-binary.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ static void binary_persistent_event_log(void *pevent_log_info,
}

static void binary_endurance_group_event_agg_log(
struct nvme_aggregate_predictable_lat_event *endurance_log,
struct nvme_aggregate_endurance_group_event *endurance_log,
__u64 log_entries, __u32 size, const char *devname)
{
d_raw((unsigned char *)endurance_log, size);
Expand Down
2 changes: 1 addition & 1 deletion nvme-print-json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1917,7 +1917,7 @@ static void json_persistent_event_log(void *pevent_log_info, __u8 action,
}

static void json_endurance_group_event_agg_log(
struct nvme_aggregate_predictable_lat_event *endurance_log,
struct nvme_aggregate_endurance_group_event *endurance_log,
__u64 log_entries, __u32 size, const char *devname)
{
struct json_object *r = json_create_object();
Expand Down
8 changes: 7 additions & 1 deletion nvme-print-stdout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ static void stdout_persistent_event_log(void *pevent_log_info, __u8 action, __u3
}

static void stdout_endurance_group_event_agg_log(
struct nvme_aggregate_predictable_lat_event *endurance_log,
struct nvme_aggregate_endurance_group_event *endurance_log,
__u64 log_entries, __u32 size, const char *devname)
{
printf("Endurance Group Event Aggregate Log for device: %s\n", devname);
Expand Down Expand Up @@ -6050,6 +6050,9 @@ static void stdout_relatives(nvme_root_t r, const char *name)

static void stdout_log(const char *devname, struct nvme_get_log_args *args)
{
struct nvme_aggregate_endurance_group_event *end = args->log;
struct nvme_supported_cap_config_list_log *cap = args->log;

switch (args->lid) {
case NVME_LOG_LID_SUPPORTED_LOG_PAGES:
break;
Expand Down Expand Up @@ -6100,10 +6103,13 @@ static void stdout_log(const char *devname, struct nvme_get_log_args *args)
stdout_lba_status_log((void *)args->log, args->len, devname);
break;
case NVME_LOG_LID_ENDURANCE_GRP_EVT:
stdout_endurance_group_event_agg_log(end, end->num_entries, args->len, devname);
break;
case NVME_LOG_LID_MEDIA_UNIT_STATUS:
stdout_media_unit_stat_log((struct nvme_media_unit_stat_log *)args->log);
break;
case NVME_LOG_LID_SUPPORTED_CAP_CONFIG_LIST:
stdout_supported_cap_config_log(cap);
break;
case NVME_LOG_LID_FID_SUPPORTED_EFFECTS:
break;
Expand Down
2 changes: 1 addition & 1 deletion nvme-print.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ void nvme_show_persistent_event_log(void *pevent_log_info,
}

void nvme_show_endurance_group_event_agg_log(
struct nvme_aggregate_predictable_lat_event *endurance_log,
struct nvme_aggregate_endurance_group_event *endurance_log,
__u64 log_entries, __u32 size, const char *devname,
nvme_print_flags_t flags)
{
Expand Down
4 changes: 2 additions & 2 deletions nvme-print.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
void (*directive)(__u8 type, __u8 oper, __u16 spec, __u32 nsid, __u32 result, void *buf, __u32 len);
void (*discovery_log)(struct nvmf_discovery_log *log, int numrec);
void (*effects_log_list)(struct list_head *list);
void (*endurance_group_event_agg_log)(struct nvme_aggregate_predictable_lat_event *endurance_log, __u64 log_entries, __u32 size, const char *devname);
void (*endurance_group_event_agg_log)(struct nvme_aggregate_endurance_group_event *endurance_log, __u64 log_entries, __u32 size, const char *devname);

Check failure on line 35 in nvme-print.h

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 158 exceeds 100 columns
void (*endurance_group_list)(struct nvme_id_endurance_group_list *endgrp_list);
void (*endurance_log)(struct nvme_endurance_group_log *endurance_group, __u16 group_id, const char *devname);
void (*error_log)(struct nvme_error_log_page *err_log, int entries, const char *devname);
Expand Down Expand Up @@ -201,7 +201,7 @@
__u8 action, __u32 size, const char *devname,
nvme_print_flags_t flags);
void nvme_show_endurance_group_event_agg_log(
struct nvme_aggregate_predictable_lat_event *endurance_log,
struct nvme_aggregate_endurance_group_event *endurance_log,
__u64 log_entries, __u32 size, const char *devname,
nvme_print_flags_t flags);
void nvme_show_lba_status_log(void *lba_status, __u32 size,
Expand Down