Page MenuHomeFreeBSD
Differential D45555

ktrace(1): add more xrefs
ClosedPublic
Actions

Authored by emaste on Jun 11 2024, 12:33 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 3:45 AM
Unknown Object (File)
Wed, Apr 9, 2:10 AM
Unknown Object (File)
Tue, Apr 8, 9:57 PM
Unknown Object (File)
Mar 1 2025, 2:06 PM
Unknown Object (File)
Feb 27 2025, 1:50 AM
Unknown Object (File)
Feb 27 2025, 12:56 AM
Unknown Object (File)
Feb 26 2025, 10:11 PM
Unknown Object (File)
Feb 22 2025, 1:29 AM
View All 54 Files
Subscribers
arrowd

Details

Reviewers
kib
imp
Commits
rG0e678b79d7b0: ktrace(1): add more xrefs
rG7110def1b1db: ktrace(1): add more xrefs
rG0277c0c6f72a: ktrace(1): add more xrefs
Summary

After a87651e2ff18 kib@ suggested cross-referencing intro(2) and sigaction(2).

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

emaste requested review of this revision.Jun 11 2024, 12:33 AM
emaste created this revision.

Renders as:

The kernel operations that are traced include system calls (see intro(2)),
namei(9) translations, signal processing (sigaction(2)), and I/O.
kib added inline comments.Jun 11 2024, 12:40 AM
usr.bin/ktrace/ktrace.1
50–51

Might be convert namei reference in the similar way:

file system path lookups
.Pq Xr namei 9 ,

emaste updated this revision to Diff 139708.Jun 11 2024, 1:20 AM

Update with @kib's suggestion.

emaste added a comment.Jun 11 2024, 1:21 AM
The ktrace utility enables kernel trace logging for the specified
processes.  Kernel trace data is logged to the file ktrace.out.  The
kernel operations that are traced include system calls (see intro(2)),
file system path lookups (namei(9)), signal processing (sigaction(2)),
and I/O.
kib accepted this revision.Jun 11 2024, 1:42 AM
This revision is now accepted and ready to land.Jun 11 2024, 1:42 AM
emaste updated this revision to Diff 139725.Jun 11 2024, 2:05 PM
emaste mentioned this in D45546: ktrace(1): add xref to namei(9).
emaste added a subscriber: arrowd.

add a namei xref in the option section, suggested by @arrowd

This revision now requires review to proceed.Jun 11 2024, 2:07 PM
This revision was not accepted when it landed; it landed in state Needs Review.Jun 11 2024, 3:02 PM
Closed by commit rG0277c0c6f72a: ktrace(1): add more xrefs (authored by emaste). · Explain Why
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rG0277c0c6f72a: ktrace(1): add more xrefs.
emaste added a commit: rG7110def1b1db: ktrace(1): add more xrefs.Aug 1 2024, 3:00 PM
emaste added a commit: rG0e678b79d7b0: ktrace(1): add more xrefs.Aug 1 2024, 3:12 PM

Revision Contents
Changeset List

PathSize
usr.bin/
ktrace/
16 lines

Diff 139726

View Options

usr.bin/ktrace/ktrace.1

Show First 20 Lines • Show All 231 Lines • ▼ Show 20 Lines
static int static int
parse_pnp_list(const char *desc, char **new_desc, pnp_list *list) parse_pnp_list(const char *desc, char **new_desc, pnp_list *list)
{ {
const char *walker, *ep; const char *walker, *ep;
const char *colon, *semi; const char *colon, *semi;
struct pnp_elt *elt; struct pnp_elt *elt;
char *nd; char *nd;
char type[8], key[32]; char type[8], key[32];
char buf[1024];
size_t ndspace;
int off; int off;
walker = desc; walker = desc;
ep = desc + strlen(desc); ep = desc + strlen(desc);
off = 0; off = 0;
nd = *new_desc = malloc(strlen(desc) + 1); nd = buf;
ndspace = sizeof(buf);
nd[0] = '\0';
if (verbose > 1) if (verbose > 1)
printf("Converting %s into a list\n", desc); printf("Converting %s into a list\n", desc);
while (walker < ep) { while (walker < ep) {
colon = strchr(walker, ':'); colon = strchr(walker, ':');
semi = strchr(walker, ';'); semi = strchr(walker, ';');
if (semi != NULL && semi < colon) if (semi != NULL && semi < colon)
goto err; goto err;
if (colon - walker > sizeof(type)) if (colon - walker > sizeof(type))
▲ Show 20 Lines • Show All 77 Lines • ▼ Show 20 Lines while (walker < ep) {
} else if (elt->pe_kind == TYPE_T) { } else if (elt->pe_kind == TYPE_T) {
/* doesn't actually consume space in the table */ /* doesn't actually consume space in the table */
off = elt->pe_offset; off = elt->pe_offset;
} else { } else {
elt->pe_offset = roundup2(elt->pe_offset, sizeof(void *)); elt->pe_offset = roundup2(elt->pe_offset, sizeof(void *));
off = elt->pe_offset + sizeof(void *); off = elt->pe_offset + sizeof(void *);
} }
if (elt->pe_kind & TYPE_PAIRED) { if (elt->pe_kind & TYPE_PAIRED) {
char *word, *ctx; char *word, *ctx, type;
int n;
for (word = strtok_r(key, "/", &ctx); for (word = strtok_r(key, "/", &ctx);
word; word = strtok_r(NULL, "/", &ctx)) { word; word = strtok_r(NULL, "/", &ctx)) {
sprintf(nd, "%c:%s;", elt->pe_kind & TYPE_FLAGGED ? 'J' : 'I', type = elt->pe_kind & TYPE_FLAGGED ? 'J' : 'I';
word); n = snprintf(nd, ndspace, "%c:%s;", type, word);
nd += strlen(nd); if (n >= ndspace)
errx(1, "Exhausted space converting "
"description %s", desc);
nd += n;
ndspace -= n;
} }
} }
else { else {
char type;
int n;
if (elt->pe_kind & TYPE_FLAGGED) if (elt->pe_kind & TYPE_FLAGGED)
*nd++ = 'J'; type = 'J';
else if (elt->pe_kind & TYPE_GE) else if (elt->pe_kind & TYPE_GE)
*nd++ = 'G'; type = 'G';
else if (elt->pe_kind & TYPE_LE) else if (elt->pe_kind & TYPE_LE)
*nd++ = 'L'; type = 'L';
else if (elt->pe_kind & TYPE_MASK) else if (elt->pe_kind & TYPE_MASK)
*nd++ = 'M'; type = 'M';
else if (elt->pe_kind & TYPE_INT) else if (elt->pe_kind & TYPE_INT)
*nd++ = 'I'; type = 'I';
else if (elt->pe_kind == TYPE_D) else if (elt->pe_kind == TYPE_D)
*nd++ = 'D'; type = 'D';
else if (elt->pe_kind == TYPE_Z || elt->pe_kind == TYPE_E) else if (elt->pe_kind == TYPE_Z || elt->pe_kind == TYPE_E)
*nd++ = 'Z'; type = 'Z';
else if (elt->pe_kind == TYPE_T) else if (elt->pe_kind == TYPE_T)
*nd++ = 'T'; type = 'T';
else else
errx(1, "Impossible type %x\n", elt->pe_kind); errx(1, "Impossible type %x\n", elt->pe_kind);
*nd++ = ':'; n = snprintf(nd, ndspace, "%c:%s;", type, key);
strcpy(nd, key); if (n >= ndspace)
nd += strlen(nd); errx(1, "Exhausted space converting "
*nd++ = ';'; "description %s", desc);
impUnsubmitted
Not Done
Inline Actions

It would be better to just ignore this module in this case.

imp: It would be better to just ignore this module in this case.
kibUnsubmitted
Not Done
Inline Actions

I think a vitally important data to print for user is the kld name that is causing troubles. At least, the file can be removed and kldxref re-run.

kib: I think a vitally important data to print for user is the kld name that is causing troubles.
jrtc27AuthorUnsubmitted
Done
Inline Actions

I think a vitally important data to print for user is the kld name that is causing troubles. At least, the file can be removed and kldxref re-run.

The same is true for all the other errors in this function and others like record_buf and record_string, as well as everything that calls check. Ideally the error reporting would be overhauled, but the file name is not currently available here so that change would be more invasive (and would only fix one of the many problems). Plus if you get one of these cryptic errors you can run it with -v to see what file it choked on.

jrtc27: > I think a vitally important data to print for user is the kld name that is causing troubles.
jrtc27AuthorUnsubmitted
Done
Inline Actions

Well, check itself is a bit dodgy (a hidden break on error) but not inherently problematic, except that parse_entry's return value is never consulted. Lots of issues here if you want good error reporting.

jrtc27: Well, `check` itself is a bit dodgy (a hidden `break` on error) but not inherently problematic…
nd += n;
ndspace -= n;
} }
} }
*nd++ = '\0'; *new_desc = strdup(buf);
return (0); return (0);
err: err:
errx(1, "Parse error of description string %s", desc); errx(1, "Parse error of description string %s", desc);
} }
static int static int
parse_entry(struct mod_metadata *md, const char *cval, parse_entry(struct mod_metadata *md, const char *cval,
struct elf_file *ef, const char *kldname) struct elf_file *ef, const char *kldname)
▲ Show 20 Lines • Show All 381 Lines • Show Last 20 Lines