Add handling for non-native error values to libsysdecode.

Add two new functions, sysdecode_abi_to_freebsd_errno() and
sysdecode_freebsd_to_abi_errno(), which convert errno values between
the native FreeBSD ABI and other supported ABIs. Note that the
mappings are not necessarily perfect meaning in some cases multiple
errors in one ABI might map to a single error in another ABI. In that
case, the reverse mapping will return one of the errors that maps, but
which error is non-deterministic.

Change truss to always report the raw error value to the user but
use libsysdecode to map it to a native errno value that can be used
with strerror() to generate a description. Previously truss reported
the "converted" error value. Now the user will always see the exact
error value that the application sees.

Change kdump to report the truly raw error value to the user. Previously
kdump would report the absolute value of the raw error value (so for
Linux binaries it didn't output the FreeBSD error value, but the positive
value of the Linux error). Now it reports the real (i.e. negative) error
value for Linux binaries. Also, use libsysdecode to convert the native
FreeBSD error reported in the ktrace record to the raw error used by the
ABI. This means that the Linux ABI can now be handled directly in
ktrsysret() and removes the need for linux_ktrsysret().

Reviewed by:	bdrewery, kib
Helpful notes:	wblock (manpage)
Differential Revision:	https://reviews.freebsd.org/D5314

8 files changed, 7 insertions, 215 deletions

diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
index b28098c802a8..7ba439283edc 100644
--- a/usr.bin/truss/Makefile
+++ b/usr.bin/truss/Makefile
@@ -2,7 +2,7 @@
 
 NO_WERROR=
 PROG=	truss
-SRCS=	cloudabi.c main.c setup.c syscalls.c
+SRCS=	main.c setup.c syscalls.c
 
 LIBADD=	sysdecode
 
diff --git a/usr.bin/truss/aarch64-cloudabi64.c b/usr.bin/truss/aarch64-cloudabi64.c
index f2891afe02a8..27906ea9204f 100644
--- a/usr.bin/truss/aarch64-cloudabi64.c
+++ b/usr.bin/truss/aarch64-cloudabi64.c
@@ -31,11 +31,9 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/armreg.h>
 
-#include <errno.h>
 #include <stdio.h>
 #include <sysdecode.h>
 
-#include "cloudabi.h"
 #include "truss.h"
 
 static int
@@ -74,8 +72,6 @@ aarch64_cloudabi64_fetch_retval(struct trussinfo *trussinfo, long *retval,
 	retval[0] = regs.x[0];
 	retval[1] = regs.x[1];
 	*errorp = (regs.spsr & PSR_C) != 0;
-	if (*errorp)
-		retval[0] = cloudabi_convert_errno(retval[0]);
 	return (0);
 }
 
diff --git a/usr.bin/truss/amd64-cloudabi64.c b/usr.bin/truss/amd64-cloudabi64.c
index ce8b18918fd8..f7d7c1aa1442 100644
--- a/usr.bin/truss/amd64-cloudabi64.c
+++ b/usr.bin/truss/amd64-cloudabi64.c
@@ -31,11 +31,9 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/psl.h>
 
-#include <errno.h>
 #include <stdio.h>
 #include <sysdecode.h>
 
-#include "cloudabi.h"
 #include "truss.h"
 
 static int
@@ -83,8 +81,6 @@ amd64_cloudabi64_fetch_retval(struct trussinfo *trussinfo, long *retval,
 	retval[0] = regs.r_rax;
 	retval[1] = regs.r_rdx;
 	*errorp = (regs.r_rflags & PSL_C) != 0;
-	if (*errorp)
-		retval[0] = cloudabi_convert_errno(retval[0]);
 	return (0);
 }
 
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index 873ef01ee386..279d2285b3b3 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -83,28 +83,12 @@ amd64_linux32_fetch_args(struct trussinfo *trussinfo, u_int narg)
 	return (0);
 }
 
-/*
- * Linux syscalls return negative errno's, we do positive and map them
- */
-static const int bsd_to_linux_errno[] = {
-	-0,  -1,  -2,  -3,  -4,  -5,  -6,  -7,  -8,  -9,
-	-10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
-	-20, -21, -22, -23, -24, -25, -26, -27, -28, -29,
-	-30, -31, -32, -33, -34, -11,-115,-114, -88, -89,
-	-90, -91, -92, -93, -94, -95, -96, -97, -98, -99,
-	-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
-	-110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
-	-116, -66,  -6,  -6,  -6,  -6,  -6, -37, -38,  -9,
-	-6,
-};
-
 static int
 amd64_linux32_fetch_retval(struct trussinfo *trussinfo, long *retval,
     int *errorp)
 {
 	struct reg regs;
 	lwpid_t tid;
-	size_t i;
 
 	tid = trussinfo->curthread->tid;
 	if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
@@ -117,17 +101,6 @@ amd64_linux32_fetch_retval(struct trussinfo *trussinfo, long *retval,
 	*errorp = !!(regs.r_rflags & PSL_C);
 	if (*errorp)
 		retval[0] = (int)retval[0];
-
-	if (*errorp) {
-		for (i = 0; i < nitems(bsd_to_linux_errno); i++) {
-			if (retval[0] == bsd_to_linux_errno[i]) {
-				retval[0] = i;
-				return (0);
-			}
-		}
-
-		/* XXX: How to handle unknown errors? */
-	}
 	return (0);
 }
 
diff --git a/usr.bin/truss/cloudabi.c b/usr.bin/truss/cloudabi.c
deleted file mode 100644
index d4265002739d..000000000000
--- a/usr.bin/truss/cloudabi.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 2015 Nuxi, https://nuxi.nl/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-
-#include <errno.h>
-
-#include <compat/cloudabi/cloudabi_syscalldefs.h>
-
-#include "cloudabi.h"
-
-long
-cloudabi_convert_errno(long error)
-{
-	static const int table[] = {
-		[CLOUDABI_E2BIG]		= E2BIG,
-		[CLOUDABI_EACCES]		= EACCES,
-		[CLOUDABI_EADDRINUSE]		= EADDRINUSE,
-		[CLOUDABI_EADDRNOTAVAIL]	= EADDRNOTAVAIL,
-		[CLOUDABI_EAFNOSUPPORT]		= EAFNOSUPPORT,
-		[CLOUDABI_EAGAIN]		= EAGAIN,
-		[CLOUDABI_EALREADY]		= EALREADY,
-		[CLOUDABI_EBADF]		= EBADF,
-		[CLOUDABI_EBADMSG]		= EBADMSG,
-		[CLOUDABI_EBUSY]		= EBUSY,
-		[CLOUDABI_ECANCELED]		= ECANCELED,
-		[CLOUDABI_ECHILD]		= ECHILD,
-		[CLOUDABI_ECONNABORTED]		= ECONNABORTED,
-		[CLOUDABI_ECONNREFUSED]		= ECONNREFUSED,
-		[CLOUDABI_ECONNRESET]		= ECONNRESET,
-		[CLOUDABI_EDEADLK]		= EDEADLK,
-		[CLOUDABI_EDESTADDRREQ]		= EDESTADDRREQ,
-		[CLOUDABI_EDOM]			= EDOM,
-		[CLOUDABI_EDQUOT]		= EDQUOT,
-		[CLOUDABI_EEXIST]		= EEXIST,
-		[CLOUDABI_EFAULT]		= EFAULT,
-		[CLOUDABI_EFBIG]		= EFBIG,
-		[CLOUDABI_EHOSTUNREACH]		= EHOSTUNREACH,
-		[CLOUDABI_EIDRM]		= EIDRM,
-		[CLOUDABI_EILSEQ]		= EILSEQ,
-		[CLOUDABI_EINPROGRESS]		= EINPROGRESS,
-		[CLOUDABI_EINTR]		= EINTR,
-		[CLOUDABI_EINVAL]		= EINVAL,
-		[CLOUDABI_EIO]			= EIO,
-		[CLOUDABI_EISCONN]		= EISCONN,
-		[CLOUDABI_EISDIR]		= EISDIR,
-		[CLOUDABI_ELOOP]		= ELOOP,
-		[CLOUDABI_EMFILE]		= EMFILE,
-		[CLOUDABI_EMLINK]		= EMLINK,
-		[CLOUDABI_EMSGSIZE]		= EMSGSIZE,
-		[CLOUDABI_EMULTIHOP]		= EMULTIHOP,
-		[CLOUDABI_ENAMETOOLONG]		= ENAMETOOLONG,
-		[CLOUDABI_ENETDOWN]		= ENETDOWN,
-		[CLOUDABI_ENETRESET]		= ENETRESET,
-		[CLOUDABI_ENETUNREACH]		= ENETUNREACH,
-		[CLOUDABI_ENFILE]		= ENFILE,
-		[CLOUDABI_ENOBUFS]		= ENOBUFS,
-		[CLOUDABI_ENODEV]		= ENODEV,
-		[CLOUDABI_ENOENT]		= ENOENT,
-		[CLOUDABI_ENOEXEC]		= ENOEXEC,
-		[CLOUDABI_ENOLCK]		= ENOLCK,
-		[CLOUDABI_ENOLINK]		= ENOLINK,
-		[CLOUDABI_ENOMEM]		= ENOMEM,
-		[CLOUDABI_ENOMSG]		= ENOMSG,
-		[CLOUDABI_ENOPROTOOPT]		= ENOPROTOOPT,
-		[CLOUDABI_ENOSPC]		= ENOSPC,
-		[CLOUDABI_ENOSYS]		= ENOSYS,
-		[CLOUDABI_ENOTCONN]		= ENOTCONN,
-		[CLOUDABI_ENOTDIR]		= ENOTDIR,
-		[CLOUDABI_ENOTEMPTY]		= ENOTEMPTY,
-		[CLOUDABI_ENOTRECOVERABLE]	= ENOTRECOVERABLE,
-		[CLOUDABI_ENOTSOCK]		= ENOTSOCK,
-		[CLOUDABI_ENOTSUP]		= ENOTSUP,
-		[CLOUDABI_ENOTTY]		= ENOTTY,
-		[CLOUDABI_ENXIO]		= ENXIO,
-		[CLOUDABI_EOVERFLOW]		= EOVERFLOW,
-		[CLOUDABI_EOWNERDEAD]		= EOWNERDEAD,
-		[CLOUDABI_EPERM]		= EPERM,
-		[CLOUDABI_EPIPE]		= EPIPE,
-		[CLOUDABI_EPROTO]		= EPROTO,
-		[CLOUDABI_EPROTONOSUPPORT]	= EPROTONOSUPPORT,
-		[CLOUDABI_EPROTOTYPE]		= EPROTOTYPE,
-		[CLOUDABI_ERANGE]		= ERANGE,
-		[CLOUDABI_EROFS]		= EROFS,
-		[CLOUDABI_ESPIPE]		= ESPIPE,
-		[CLOUDABI_ESRCH]		= ESRCH,
-		[CLOUDABI_ESTALE]		= ESTALE,
-		[CLOUDABI_ETIMEDOUT]		= ETIMEDOUT,
-		[CLOUDABI_ETXTBSY]		= ETXTBSY,
-		[CLOUDABI_EXDEV]		= EXDEV,
-		[CLOUDABI_ENOTCAPABLE]		= ENOTCAPABLE,
-	};
-
-	if (error < 0 || error >= nitems(table) || table[error] == 0)
-		return (error);
-	return (table[error]);
-}
diff --git a/usr.bin/truss/cloudabi.h b/usr.bin/truss/cloudabi.h
deleted file mode 100644
index abc8c0cd65a1..000000000000
--- a/usr.bin/truss/cloudabi.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-
- * Copyright (c) 2015 Nuxi, https://nuxi.nl/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-long	cloudabi_convert_errno(long);
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index c5f625d7303b..52232b41d450 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -83,27 +83,11 @@ i386_linux_fetch_args(struct trussinfo *trussinfo, u_int narg)
 	return (0);
 }
 
-/*
- * Linux syscalls return negative errno's, we do positive and map them
- */
-static const int bsd_to_linux_errno[] = {
-	-0,  -1,  -2,  -3,  -4,  -5,  -6,  -7,  -8,  -9,
-	-10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
-	-20, -21, -22, -23, -24, -25, -26, -27, -28, -29,
-	-30, -31, -32, -33, -34, -11,-115,-114, -88, -89,
-	-90, -91, -92, -93, -94, -95, -96, -97, -98, -99,
-	-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,
-	-110,-111, -40, -36,-112,-113, -39, -11, -87,-122,
-	-116, -66,  -6,  -6,  -6,  -6,  -6, -37, -38,  -9,
-	-6,
-};
-
 static int
 i386_linux_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp)
 {
 	struct reg regs;
 	lwpid_t tid;
-	size_t i;
 
 	tid = trussinfo->curthread->tid;
 	if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
@@ -114,17 +98,6 @@ i386_linux_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp)
 	retval[0] = regs.r_eax;
 	retval[1] = regs.r_edx;
 	*errorp = !!(regs.r_eflags & PSL_C);
-
-	if (*errorp) {
-		for (i = 0; i < nitems(bsd_to_linux_errno); i++) {
-			if (retval[0] == bsd_to_linux_errno[i]) {
-				retval[0] = i;
-				return (0);
-			}
-		}
-
-		/* XXX: How to handle unknown errors? */
-	}
 	return (0);
 }
 
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 97723211c7aa..b3a4c423f7b7 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -2039,6 +2039,7 @@ print_syscall_ret(struct trussinfo *trussinfo, int errorp, long *retval)
 	struct timespec timediff;
 	struct threadinfo *t;
 	struct syscall *sc;
+	int error;
 
 	t = trussinfo->curthread;
 	sc = t->cs.sc;
@@ -2053,9 +2054,12 @@ print_syscall_ret(struct trussinfo *trussinfo, int errorp, long *retval)
 
 	print_syscall(trussinfo);
 	fflush(trussinfo->outfile);
-	if (errorp)
+	if (errorp) {
+		error = sysdecode_abi_to_freebsd_errno(t->proc->abi->abi,
+		    retval[0]);
 		fprintf(trussinfo->outfile, " ERR#%ld '%s'\n", retval[0],
-		    strerror(retval[0]));
+		    error == INT_MAX ? "Unknown error" : strerror(error));
+	}
 #ifndef __LP64__
 	else if (sc->ret_type == 2) {
 		off_t off;