Skip to content

logging: add nvme_mi_submit entry and exit functions #2807

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 1 commit into from
May 14, 2025
Merged

logging: add nvme_mi_submit entry and exit functions #2807

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
111 changes: 111 additions & 0 deletions util/logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,21 @@
#include <linux/types.h>

#include <libnvme.h>
#include <libnvme-mi.h>

#include <ccan/endian/endian.h>

#include "logging.h"
#include "sighdl.h"

struct submit_data {
struct timeval start;
struct timeval end;
};

int log_level;
static bool dry_run;
static struct submit_data sb;

int map_log_level(int verbose, bool quiet)
{
Expand Down Expand Up @@ -167,3 +176,105 @@ int nvme_submit_passthru64(int fd, unsigned long ioctl_cmd,

return err;
}

static void nvme_show_req_admin(const struct nvme_mi_admin_req_hdr *hdr, size_t hdr_len,
const void *data, size_t data_len)
{
struct nvme_passthru_cmd cmd = {
.opcode = hdr->opcode,
.flags = hdr->flags,
.nsid = le32_to_cpu(hdr->cdw1),
.cdw2 = le32_to_cpu(hdr->cdw2),
.cdw3 = le32_to_cpu(hdr->cdw3),
.addr = (uint64_t)(uintptr_t)data,
.data_len = data_len,
.cdw10 = le32_to_cpu(hdr->cdw10),
.cdw11 = le32_to_cpu(hdr->cdw11),
.cdw12 = le32_to_cpu(hdr->cdw12),
.cdw13 = le32_to_cpu(hdr->cdw13),
.cdw14 = le32_to_cpu(hdr->cdw14),
.cdw15 = le32_to_cpu(hdr->cdw15),
};

nvme_show_common(&cmd);
Copy link
Collaborator

@jk-ozlabs jk-ozlabs May 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we would want include the dofst / dlen here too, otherwise the data may not make much sense.

Copy link
Contributor Author

@ikegami-t ikegami-t May 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just added the doff and dlen mentioned and also fix to use le32_to_cpu() for the cdw0 result output.

printf("doff : %08x\n", le32_to_cpu(hdr->doff));
printf("dlen : %08x\n", le32_to_cpu(hdr->dlen));
}

static void nvme_show_req(__u8 type, const struct nvme_mi_msg_hdr *hdr, size_t hdr_len,
const void *data, size_t data_len)
{
if (type != NVME_MI_MSGTYPE_NVME)
return;

switch (hdr->nmp >> 3 & 0xf) {
case NVME_MI_MT_CONTROL:
break;
case NVME_MI_MT_MI:
break;
case NVME_MI_MT_ADMIN:
nvme_show_req_admin((struct nvme_mi_admin_req_hdr *)hdr, hdr_len, data, data_len);
break;
case NVME_MI_MT_PCIE:
break;
case NVME_MI_MT_AE:
break;
default:
break;
}
}

void *nvme_mi_submit_entry(__u8 type, const struct nvme_mi_msg_hdr *hdr, size_t hdr_len,
const void *data, size_t data_len)
{
memset(&sb, 0, sizeof(sb));

if (log_level >= LOG_DEBUG) {
nvme_show_req(type, hdr, hdr_len, data, data_len);
gettimeofday(&sb.start, NULL);
}

return &sb;
}

static void nvme_show_resp_admin(const struct nvme_mi_admin_resp_hdr *hdr, size_t hdr_len,
const void *data, size_t data_len)
{
printf("result : %08x\n", le32_to_cpu(hdr->cdw0));
printf("err : %d\n", hdr->status);
Copy link
Collaborator

@jk-ozlabs jk-ozlabs May 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume we don't want the data here?

Copy link
Contributor Author

@ikegami-t ikegami-t May 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently nvme_submit_passthru() for PCIe does not print the data so at this moment not required as same but later possible to be added the data output also I think.

}

static void nvme_show_resp(__u8 type, const struct nvme_mi_msg_hdr *hdr, size_t hdr_len,
const void *data, size_t data_len)
{
if (type != NVME_MI_MSGTYPE_NVME)
return;

switch (hdr->nmp >> 3 & 0xf) {
case NVME_MI_MT_CONTROL:
break;
case NVME_MI_MT_MI:
break;
case NVME_MI_MT_ADMIN:
nvme_show_resp_admin((struct nvme_mi_admin_resp_hdr *)hdr, hdr_len, data, data_len);
break;
case NVME_MI_MT_PCIE:
break;
case NVME_MI_MT_AE:
break;
default:
break;
}
}

void nvme_mi_submit_exit(__u8 type, const struct nvme_mi_msg_hdr *hdr, size_t hdr_len,
const void *data, size_t data_len, void *user_data)
{
struct submit_data *sb = user_data;

if (log_level >= LOG_DEBUG) {
gettimeofday(&sb->end, NULL);
nvme_show_resp(type, hdr, hdr_len, data, data_len);
nvme_show_latency(sb->start, sb->end);
}
}