Use PT_GET_SC_ARGS and PT_GET_SC_RET in truss.

This removes all of the architecture-specific functions from truss.

A per-ABI structure is still needed to map syscall numbers to names
and FreeBSD errno values to ABI error values as well as hold syscall
counters.  However, the linker set of ABI structures is now replaced
with a simple table mapping ABI names to structures.  This approach
permits sharing the same ABI structure among separate names such as
i386 a.out and ELF binaries as well as ELF v1 vs ELF v2 for powerpc64.

A few differences are visible due to using PT_GET_SC_RET to fetch the
error value of a system call.  Note that ktrace/kdump have had the
"new" behaviors for a long time already:
- System calls that return with EJUSTRETURN or ERESTART will now be
  noticed and logged as such.  Previously sigreturn (which uses
  EJUSTRETURN) would report whatever random value was in the register
  holding errno from the previous system call for example.  Now it
  reports EJUSTRETURN.
- System calls that return errno as their error value such as
  posix_fallocate() and posix_fadvise() now report non-zero return
  values as errors instead of success with a non-zero return value.

Reviewed by:	kib
MFC after:	1 month
Sponsored by:	DARPA
Differential Revision:	https://reviews.freebsd.org/D20963
This commit is contained in:
John Baldwin
2019-07-16 22:59:15 +00:00
parent dc9df3a59d
commit caa449b635
24 changed files with 108 additions and 2337 deletions
+16 -12
View File
@@ -61,6 +61,8 @@ __FBSDID("$FreeBSD$");
#include <assert.h>
#include <ctype.h>
#include <err.h>
#define _WANT_KERNEL_ERRNO
#include <errno.h>
#include <fcntl.h>
#include <poll.h>
#include <sched.h>
@@ -1556,7 +1558,7 @@ print_cmsgs(FILE *fp, pid_t pid, bool receive, struct msghdr *msghdr)
* an array of all of the system call arguments.
*/
char *
print_arg(struct syscall_args *sc, unsigned long *args, long *retval,
print_arg(struct syscall_args *sc, unsigned long *args, register_t *retval,
struct trussinfo *trussinfo)
{
FILE *fp;
@@ -2277,7 +2279,7 @@ print_arg(struct syscall_args *sc, unsigned long *args, long *retval,
* Overwrite the first retval to signal a successful
* return as well.
*/
fprintf(fp, "{ %ld, %ld }", retval[0], retval[1]);
fprintf(fp, "{ %d, %d }", (int)retval[0], (int)retval[1]);
retval[0] = 0;
break;
case Utrace: {
@@ -2646,12 +2648,11 @@ print_syscall(struct trussinfo *trussinfo)
}
void
print_syscall_ret(struct trussinfo *trussinfo, int errorp, long *retval)
print_syscall_ret(struct trussinfo *trussinfo, int error, register_t *retval)
{
struct timespec timediff;
struct threadinfo *t;
struct syscall *sc;
int error;
t = trussinfo->curthread;
sc = t->cs.sc;
@@ -2659,7 +2660,7 @@ print_syscall_ret(struct trussinfo *trussinfo, int errorp, long *retval)
timespecsub(&t->after, &t->before, &timediff);
timespecadd(&sc->time, &timediff, &sc->time);
sc->ncalls++;
if (errorp)
if (error != 0)
sc->nerror++;
return;
}
@@ -2676,11 +2677,14 @@ print_syscall_ret(struct trussinfo *trussinfo, int errorp, long *retval)
return;
}
if (errorp) {
error = sysdecode_abi_to_freebsd_errno(t->proc->abi->abi,
retval[0]);
fprintf(trussinfo->outfile, " ERR#%ld '%s'\n", retval[0],
error == INT_MAX ? "Unknown error" : strerror(error));
if (error == ERESTART)
fprintf(trussinfo->outfile, " ERESTART\n");
else if (error == EJUSTRETURN)
fprintf(trussinfo->outfile, " EJUSTRETURN\n");
else if (error != 0) {
fprintf(trussinfo->outfile, " ERR#%d '%s'\n",
sysdecode_freebsd_to_abi_errno(t->proc->abi->abi, error),
strerror(error));
}
#ifndef __LP64__
else if (sc->ret_type == 2) {
@@ -2696,8 +2700,8 @@ print_syscall_ret(struct trussinfo *trussinfo, int errorp, long *retval)
}
#endif
else
fprintf(trussinfo->outfile, " = %ld (0x%lx)\n", retval[0],
retval[0]);
fprintf(trussinfo->outfile, " = %jd (0x%jx)\n",
(intmax_t)retval[0], (intmax_t)retval[0]);
}
void