Page MenuHomeFreeBSD
Differential D44121

nvme: Firmware revisions in the firmware slot information log are ASCII strings
ClosedPublic
Actions

Authored by jhb on Feb 27 2024, 7:34 PM.
Tags
None
Referenced Files
F114413262: D44121.id135295.diff
Sat, Apr 12, 7:04 AM
Unknown Object (File)
Fri, Apr 4, 1:42 AM
Unknown Object (File)
Sun, Mar 23, 2:58 PM
Unknown Object (File)
Feb 22 2025, 2:37 PM
Unknown Object (File)
Feb 22 2025, 1:56 PM
Unknown Object (File)
Feb 22 2025, 1:54 PM
Unknown Object (File)
Feb 10 2025, 4:20 AM
Unknown Object (File)
Feb 10 2025, 4:19 AM
View All 59 Files
Subscribers
dab

Details

Reviewers
imp
chuck
Commits
rG4329e6ccfa4a: nvme: Firmware revisions in the firmware slot info logpage are ASCII strings
rG16089905240f: nvme: Firmware revisions in the firmware slot info logpage are ASCII strings
rG7485926e09a0: nvme: Firmware revisions in the firmware slot info logpage are ASCII strings
Summary

In particular, don't try to byteswap the values as 64-bit integers and
always print a non-empty version as a string.

Sponsored by: Chelsio Communications

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 56291
Build 53179: arc lint + arc unit

Event Timeline

jhb created this revision.Feb 27 2024, 7:34 PM
Herald added a subscriber: dab. · View Herald TranscriptFeb 27 2024, 7:34 PM
jhb requested review of this revision.Feb 27 2024, 7:34 PM
Harbormaster completed remote builds in B56291: Diff 135102.Feb 27 2024, 7:34 PM
jhb added inline comments.Feb 27 2024, 7:34 PM
sys/dev/nvme/nvme.h
2155

Not sure if you'd rather me just remove this now-empty function outright?

imp accepted this revision.Feb 27 2024, 11:18 PM

Delete it or not, I'm agnostic, so long as it compiles :)

sys/dev/nvme/nvme.h
2155

I'd delete it. This is a string, not a uint64_t...

This revision is now accepted and ready to land.Feb 27 2024, 11:18 PM
chuck accepted this revision.Feb 28 2024, 3:18 PM

LGTM

jhb marked an inline comment as done.Mar 1 2024, 10:11 PM
Closed by commit rG7485926e09a0: nvme: Firmware revisions in the firmware slot info logpage are ASCII strings (authored by jhb). · Explain WhyMar 1 2024, 10:20 PM
This revision was automatically updated to reflect the committed changes.
jhb added a commit: rG7485926e09a0: nvme: Firmware revisions in the firmware slot info logpage are ASCII strings.
jhb added a commit: rG16089905240f: nvme: Firmware revisions in the firmware slot info logpage are ASCII strings.Apr 8 2024, 7:06 PM
jhb added a commit: rG4329e6ccfa4a: nvme: Firmware revisions in the firmware slot info logpage are ASCII strings.Apr 8 2024, 8:26 PM

Revision Contents
Changeset List

PathSize
sbin/
nvmecontrol/
9 lines
sys/
dev/
nvme/
9 lines

Diff 135102

View Options

sbin/nvmecontrol/logpage.c

Show First 20 Lines • Show All 354 Lines • ▼ Show 20 Lines if (ndp->ni_startdir != NULL) {
rights = *ndp->ni_rightsneeded; rights = *ndp->ni_rightsneeded;
cap_rights_set_one(&rights, CAP_LOOKUP); cap_rights_set_one(&rights, CAP_LOOKUP);
if (cnp->cn_flags & AUDITVNODE1) if (cnp->cn_flags & AUDITVNODE1)
AUDIT_ARG_ATFD1(ndp->ni_dirfd); AUDIT_ARG_ATFD1(ndp->ni_dirfd);
if (cnp->cn_flags & AUDITVNODE2) if (cnp->cn_flags & AUDITVNODE2)
AUDIT_ARG_ATFD2(ndp->ni_dirfd); AUDIT_ARG_ATFD2(ndp->ni_dirfd);
/* /*
* Effectively inlined fgetvp_rights, because we need to * Effectively inlined fgetvp_rights, because
* inspect the file as well as grabbing the vnode. * we need to inspect the file as well as
* grabbing the vnode. No check for O_PATH,
* files to implement its semantic.
*/ */
error = fget_cap(td, ndp->ni_dirfd, &rights, error = fget_cap(td, ndp->ni_dirfd, &rights,
&dfp, &ndp->ni_filecaps); &dfp, &ndp->ni_filecaps);
if (error != 0) { if (error != 0) {
/* /*
* Preserve the error; it should either be EBADF * Preserve the error; it should either be EBADF
* or capability-related, both of which can be * or capability-related, both of which can be
* safely returned to the caller. * safely returned to the caller.
*/ */
} else { } else {
if (dfp->f_ops == &badfileops) { if (dfp->f_ops == &badfileops) {
error = EBADF; error = EBADF;
} else if (dfp->f_vnode == NULL) { } else if (dfp->f_vnode == NULL) {
error = ENOTDIR; error = ENOTDIR;
} else { } else {
*dpp = dfp->f_vnode; *dpp = dfp->f_vnode;
vrefact(*dpp); vref(*dpp);
if ((dfp->f_flag & FSEARCH) != 0) if ((dfp->f_flag & FSEARCH) != 0)
cnp->cn_flags |= NOEXECCHECK; cnp->cn_flags |= NOEXECCHECK;
} }
fdrop(dfp, td); fdrop(dfp, td);
} }
#ifdef CAPABILITIES #ifdef CAPABILITIES
/* /*
▲ Show 20 Lines • Show All 1,326 Lines • Show Last 20 Lines
View Options

sys/dev/nvme/nvme.h

Show First 20 Lines • Show All 354 Lines • ▼ Show 20 Lines if (ndp->ni_startdir != NULL) {
rights = *ndp->ni_rightsneeded; rights = *ndp->ni_rightsneeded;
cap_rights_set_one(&rights, CAP_LOOKUP); cap_rights_set_one(&rights, CAP_LOOKUP);
if (cnp->cn_flags & AUDITVNODE1) if (cnp->cn_flags & AUDITVNODE1)
AUDIT_ARG_ATFD1(ndp->ni_dirfd); AUDIT_ARG_ATFD1(ndp->ni_dirfd);
if (cnp->cn_flags & AUDITVNODE2) if (cnp->cn_flags & AUDITVNODE2)
AUDIT_ARG_ATFD2(ndp->ni_dirfd); AUDIT_ARG_ATFD2(ndp->ni_dirfd);
/* /*
* Effectively inlined fgetvp_rights, because we need to * Effectively inlined fgetvp_rights, because
* inspect the file as well as grabbing the vnode. * we need to inspect the file as well as
* grabbing the vnode. No check for O_PATH,
* files to implement its semantic.
*/ */
error = fget_cap(td, ndp->ni_dirfd, &rights, error = fget_cap(td, ndp->ni_dirfd, &rights,
&dfp, &ndp->ni_filecaps); &dfp, &ndp->ni_filecaps);
if (error != 0) { if (error != 0) {
/* /*
* Preserve the error; it should either be EBADF * Preserve the error; it should either be EBADF
* or capability-related, both of which can be * or capability-related, both of which can be
* safely returned to the caller. * safely returned to the caller.
*/ */
} else { } else {
if (dfp->f_ops == &badfileops) { if (dfp->f_ops == &badfileops) {
error = EBADF; error = EBADF;
} else if (dfp->f_vnode == NULL) { } else if (dfp->f_vnode == NULL) {
error = ENOTDIR; error = ENOTDIR;
} else { } else {
*dpp = dfp->f_vnode; *dpp = dfp->f_vnode;
vrefact(*dpp); vref(*dpp);
if ((dfp->f_flag & FSEARCH) != 0) if ((dfp->f_flag & FSEARCH) != 0)
cnp->cn_flags |= NOEXECCHECK; cnp->cn_flags |= NOEXECCHECK;
} }
fdrop(dfp, td); fdrop(dfp, td);
} }
#ifdef CAPABILITIES #ifdef CAPABILITIES
/* /*
▲ Show 20 Lines • Show All 1,326 Lines • Show Last 20 Lines