aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bhyve/acpi.c8
-rw-r--r--usr.sbin/bhyve/ioapic.c4
-rwxr-xr-xusr.sbin/bsdconfig/examples/browse_packages.sh3
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh2
-rw-r--r--usr.sbin/pkg/config.c214
-rw-r--r--usr.sbin/pkg/elf_tables.h10
-rw-r--r--usr.sbin/setfib/setfib.117
-rw-r--r--usr.sbin/watch/watch.c3
8 files changed, 225 insertions, 36 deletions
diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
index ed0c545e5f8e..89c11bce3cbc 100644
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -241,8 +241,9 @@ basl_fwrite_madt(FILE *fp)
for (i = 0; i < basl_ncpu; i++) {
EFPRINTF(fp, "[0001]\t\tSubtable Type : 00\n");
EFPRINTF(fp, "[0001]\t\tLength : 08\n");
- EFPRINTF(fp, "[0001]\t\tProcessor ID : %02d\n", i);
- EFPRINTF(fp, "[0001]\t\tLocal Apic ID : %02d\n", i);
+ /* iasl expects hex values for the proc and apic id's */
+ EFPRINTF(fp, "[0001]\t\tProcessor ID : %02x\n", i);
+ EFPRINTF(fp, "[0001]\t\tLocal Apic ID : %02x\n", i);
EFPRINTF(fp, "[0004]\t\tFlags (decoded below) : 00000001\n");
EFPRINTF(fp, "\t\t\tProcessor Enabled : 1\n");
EFPRINTF(fp, "\n");
@@ -251,7 +252,8 @@ basl_fwrite_madt(FILE *fp)
/* Always a single IOAPIC entry, with ID ncpu+1 */
EFPRINTF(fp, "[0001]\t\tSubtable Type : 01\n");
EFPRINTF(fp, "[0001]\t\tLength : 0C\n");
- EFPRINTF(fp, "[0001]\t\tI/O Apic ID : %02d\n", basl_ncpu);
+ /* iasl expects a hex value for the i/o apic id */
+ EFPRINTF(fp, "[0001]\t\tI/O Apic ID : %02x\n", basl_ncpu);
EFPRINTF(fp, "[0001]\t\tReserved : 00\n");
EFPRINTF(fp, "[0004]\t\tAddress : fec00000\n");
EFPRINTF(fp, "[0004]\t\tInterrupt : 00000000\n");
diff --git a/usr.sbin/bhyve/ioapic.c b/usr.sbin/bhyve/ioapic.c
index c712692c9375..aeb008ea2c23 100644
--- a/usr.sbin/bhyve/ioapic.c
+++ b/usr.sbin/bhyve/ioapic.c
@@ -101,13 +101,13 @@ ioapic_set_pinstate(struct vmctx *ctx, int pin, bool newstate)
* XXX
* We only deal with:
* - edge triggered interrupts
- * - physical destination mode
* - fixed delivery mode
+ * Level-triggered sources will work so long as there is
+ * no sharing.
*/
low = ioapic->redtbl[pin];
high = ioapic->redtbl[pin] >> 32;
if ((low & IOART_INTMASK) == IOART_INTMCLR &&
- (low & IOART_TRGRMOD) == IOART_TRGREDG &&
(low & IOART_DESTMOD) == IOART_DESTPHY &&
(low & IOART_DELMOD) == IOART_DELFIXED) {
vector = low & IOART_INTVEC;
diff --git a/usr.sbin/bsdconfig/examples/browse_packages.sh b/usr.sbin/bsdconfig/examples/browse_packages.sh
index 6396f4677309..1deb562481e9 100755
--- a/usr.sbin/bsdconfig/examples/browse_packages.sh
+++ b/usr.sbin/bsdconfig/examples/browse_packages.sh
@@ -17,9 +17,8 @@ if [ ! -e "$TMPDIR/packages/INDEX" ]; then
# For older releases, use ftp://ftp-archive.freebsd.org
mediaSetFTP
mediaOpen
- f_show_info "Downloading packages/INDEX from %s" "$_ftpPath"
+ f_show_info "Downloading packages/INDEX from\n %s" "$_ftpPath"
f_device_get media packages/INDEX > $TMPDIR/packages/INDEX
- mediaClose
fi
_directoryPath=$TMPDIR
mediaSetDirectory
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 629d44fbd8ea..361cef9146fa 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -707,7 +707,7 @@ case "${RERUN}" in
# Build the mtree database in a temporary location.
case "${PRE_WORLD}" in
'') MTREENEW=`mktemp -t mergemaster.mtree`
- mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
+ mtree -nci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
;;
*) # We don't want to mess with the mtree database on a pre-world run or
# when re-scanning a previously-built tree.
diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c
index 142fd1bb7378..01eaa9f7f94c 100644
--- a/usr.sbin/pkg/config.c
+++ b/usr.sbin/pkg/config.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
#include <sys/elf_common.h>
#include <sys/endian.h>
+#include <assert.h>
#include <bsdyml.h>
#include <ctype.h>
#include <err.h>
@@ -100,6 +101,138 @@ elf_corres_to_string(struct _elf_corres *m, int e)
return ("unknown");
}
+static const char *
+aeabi_parse_arm_attributes(void *data, size_t length)
+{
+ uint32_t sect_len;
+ uint8_t *section = data;
+
+#define MOVE(len) do { \
+ assert(length >= (len)); \
+ section += (len); \
+ length -= (len); \
+} while (0)
+
+ if (length == 0 || *section != 'A')
+ return (NULL);
+
+ MOVE(1);
+
+ /* Read the section length */
+ if (length < sizeof(sect_len))
+ return (NULL);
+
+ memcpy(&sect_len, section, sizeof(sect_len));
+
+ /*
+ * The section length should be no longer than the section it is within
+ */
+ if (sect_len > length)
+ return (NULL);
+
+ MOVE(sizeof(sect_len));
+
+ /* Skip the vendor name */
+ while (length != 0) {
+ if (*section == '\0')
+ break;
+ MOVE(1);
+ }
+ if (length == 0)
+ return (NULL);
+ MOVE(1);
+
+ while (length != 0) {
+ uint32_t tag_length;
+
+ switch(*section) {
+ case 1: /* Tag_File */
+ MOVE(1);
+ if (length < sizeof(tag_length))
+ return (NULL);
+ memcpy(&tag_length, section, sizeof(tag_length));
+ break;
+ case 2: /* Tag_Section */
+ case 3: /* Tag_Symbol */
+ default:
+ return (NULL);
+ }
+ /* At least space for the tag and size */
+ if (tag_length <= 5)
+ return (NULL);
+ tag_length--;
+ /* Check the tag fits */
+ if (tag_length > length)
+ return (NULL);
+
+#define MOVE_TAG(len) do { \
+ assert(tag_length >= (len)); \
+ MOVE(len); \
+ tag_length -= (len); \
+} while(0)
+
+ MOVE(sizeof(tag_length));
+ tag_length -= sizeof(tag_length);
+
+ while (tag_length != 0) {
+ uint8_t tag;
+
+ assert(tag_length >= length);
+
+ tag = *section;
+ MOVE_TAG(1);
+
+ /*
+ * These tag values come from:
+ *
+ * Addenda to, and Errata in, the ABI for the
+ * ARM Architecture. Release 2.08, section 2.3.
+ */
+ if (tag == 6) { /* == Tag_CPU_arch */
+ uint8_t val;
+
+ val = *section;
+ /*
+ * We don't support values that require
+ * more than one byte.
+ */
+ if (val & (1 << 7))
+ return (NULL);
+
+ /* We have an ARMv4 or ARMv5 */
+ if (val <= 5)
+ return ("arm");
+ else /* We have an ARMv6+ */
+ return ("armv6");
+ } else if (tag == 4 || tag == 5 || tag == 32 ||
+ tag == 65 || tag == 67) {
+ while (*section != '\0' && length != 0)
+ MOVE_TAG(1);
+ if (tag_length == 0)
+ return (NULL);
+ /* Skip the last byte */
+ MOVE_TAG(1);
+ } else if ((tag >= 7 && tag <= 31) || tag == 34 ||
+ tag == 36 || tag == 38 || tag == 42 || tag == 44 ||
+ tag == 64 || tag == 66 || tag == 68 || tag == 70) {
+ /* Skip the uleb128 data */
+ while (*section & (1 << 7) && length != 0)
+ MOVE_TAG(1);
+ if (tag_length == 0)
+ return (NULL);
+ /* Skip the last byte */
+ MOVE_TAG(1);
+ } else
+ return (NULL);
+#undef MOVE_TAG
+ }
+
+ break;
+ }
+ return (NULL);
+#undef MOVE
+}
+
static int
pkg_get_myabi(char *dest, size_t sz)
{
@@ -108,7 +241,8 @@ pkg_get_myabi(char *dest, size_t sz)
Elf_Note note;
Elf_Scn *scn;
char *src, *osname;
- const char *abi, *fpu;
+ const char *arch, *abi, *fpu, *endian_corres_str;
+ const char *wordsize_corres_str;
GElf_Ehdr elfhdr;
GElf_Shdr shdr;
int fd, i, ret;
@@ -177,21 +311,72 @@ pkg_get_myabi(char *dest, size_t sz)
for (i = 0; osname[i] != '\0'; i++)
osname[i] = (char)tolower(osname[i]);
- snprintf(dest, sz, "%s:%d:%s:%s",
- osname, version / 100000,
- elf_corres_to_string(mach_corres, (int)elfhdr.e_machine),
- elf_corres_to_string(wordsize_corres,
- (int)elfhdr.e_ident[EI_CLASS]));
+ wordsize_corres_str = elf_corres_to_string(wordsize_corres,
+ (int)elfhdr.e_ident[EI_CLASS]);
+
+ arch = elf_corres_to_string(mach_corres, (int) elfhdr.e_machine);
+
+ snprintf(dest, sz, "%s:%d",
+ osname, version / 100000);
ret = 0;
switch (elfhdr.e_machine) {
case EM_ARM:
+ endian_corres_str = elf_corres_to_string(endian_corres,
+ (int)elfhdr.e_ident[EI_DATA]);
+
/* FreeBSD doesn't support the hard-float ABI yet */
fpu = "softfp";
if ((elfhdr.e_flags & 0xFF000000) != 0) {
+ const char *sh_name = NULL;
+ size_t shstrndx;
+
/* This is an EABI file, the conformance level is set */
abi = "eabi";
+ /* Find which TARGET_ARCH we are building for. */
+ elf_getshdrstrndx(elf, &shstrndx);
+ while ((scn = elf_nextscn(elf, scn)) != NULL) {
+ sh_name = NULL;
+ if (gelf_getshdr(scn, &shdr) != &shdr) {
+ scn = NULL;
+ break;
+ }
+
+ sh_name = elf_strptr(elf, shstrndx,
+ shdr.sh_name);
+ if (sh_name == NULL)
+ continue;
+ if (strcmp(".ARM.attributes", sh_name) == 0)
+ break;
+ }
+ if (scn != NULL && sh_name != NULL) {
+ data = elf_getdata(scn, NULL);
+ /*
+ * Prior to FreeBSD 10.0 libelf would return
+ * NULL from elf_getdata on the .ARM.attributes
+ * section. As this was the first release to
+ * get armv6 support assume a NULL value means
+ * arm.
+ *
+ * This assumption can be removed when 9.x
+ * is unsupported.
+ */
+ if (data != NULL) {
+ arch = aeabi_parse_arm_attributes(
+ data->d_buf, data->d_size);
+ if (arch == NULL) {
+ ret = 1;
+ warn("unknown ARM ARCH");
+ goto cleanup;
+ }
+ }
+ } else {
+ ret = 1;
+ warn("Unable to find the .ARM.attributes "
+ "section");
+ goto cleanup;
+ }
} else if (elfhdr.e_ident[EI_OSABI] != ELFOSABI_NONE) {
/*
* EABI executables all have this field set to
@@ -200,12 +385,12 @@ pkg_get_myabi(char *dest, size_t sz)
abi = "oabi";
} else {
ret = 1;
+ warn("unknown ARM ABI");
goto cleanup;
}
snprintf(dest + strlen(dest), sz - strlen(dest),
- ":%s:%s:%s", elf_corres_to_string(endian_corres,
- (int)elfhdr.e_ident[EI_DATA]),
- abi, fpu);
+ ":%s:%s:%s:%s:%s", arch, wordsize_corres_str,
+ endian_corres_str, abi, fpu);
break;
case EM_MIPS:
/*
@@ -230,10 +415,15 @@ pkg_get_myabi(char *dest, size_t sz)
abi = "n64";
break;
}
- snprintf(dest + strlen(dest), sz - strlen(dest),
- ":%s:%s", elf_corres_to_string(endian_corres,
- (int)elfhdr.e_ident[EI_DATA]), abi);
+ endian_corres_str = elf_corres_to_string(endian_corres,
+ (int)elfhdr.e_ident[EI_DATA]);
+
+ snprintf(dest + strlen(dest), sz - strlen(dest), ":%s:%s:%s:%s",
+ arch, wordsize_corres_str, endian_corres_str, abi);
break;
+ default:
+ snprintf(dest + strlen(dest), sz - strlen(dest), ":%s:%s",
+ arch, wordsize_corres_str);
}
cleanup:
diff --git a/usr.sbin/pkg/elf_tables.h b/usr.sbin/pkg/elf_tables.h
index d3d689a99dcd..0589ecf9425e 100644
--- a/usr.sbin/pkg/elf_tables.h
+++ b/usr.sbin/pkg/elf_tables.h
@@ -58,16 +58,12 @@ static struct _elf_corres endian_corres[] = {
{ -1, NULL}
};
-#define EF_MIPS_ABI 0x0000F000
+#ifndef EF_MIPS_ABI
+#define EF_MIPS_ABI 0x0000f000
+#endif
#define E_MIPS_ABI_O32 0x00001000
#define E_MIPS_ABI_N32 0x00000020
-#define EF_ARM_NEW_ABI 0x80
-#define EF_ARM_OLD_ABI 0x100
-
-#define EF_ARM_SOFT_FLOAT 0x200
-#define EF_ARM_VFP_FLOAT 0x400
-
#define NT_VERSION 1
#define NT_ARCH 2
diff --git a/usr.sbin/setfib/setfib.1 b/usr.sbin/setfib/setfib.1
index f0143db9340e..5c36748343fe 100644
--- a/usr.sbin/setfib/setfib.1
+++ b/usr.sbin/setfib/setfib.1
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 9, 2008
+.Dd October 20, 2008
.Dt SETFIB 1
.Os
.Sh NAME
@@ -39,11 +39,11 @@
.Sh DESCRIPTION
The
.Nm
-utility runs
+utility runs another
.Ar utility
-with an different routing table.
+with a different routing table.
The table number
-.Dq Ar fib
+.Ar fib
will be used by default for all sockets started by this
process or descendants.
.Sh ENVIRONMENT
@@ -69,8 +69,8 @@ An exit status of 127 indicates
.Ar utility
could not be found.
.Sh EXAMPLES
-Execute utility
-.Sq netstat
+Run
+.Xr netstat 1
to view the second routing table.
.Pp
.Dl "setfib -F 1 netstat -rn"
@@ -86,8 +86,9 @@ The
.Nm
utility is a
.Fx
-specific extension, however many
-.Ux
+specific extension.
+However, many
+.Ux Ns - Ns
like systems
have an equivalent function.
.Sh HISTORY
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index e69534de55c4..eecf0d32db2a 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -110,7 +110,6 @@ set_tty(void)
{
struct termios ntty;
- tcgetattr(std_in, &otty);
ntty = otty;
ntty.c_lflag &= ~ICANON; /* disable canonical operation */
ntty.c_lflag &= ~ECHO;
@@ -324,6 +323,8 @@ main(int ac, char *av[])
usage();
}
+ tcgetattr(std_in, &otty);
+
if (modfind("snp") == -1)
if (kldload("snp") == -1 || modfind("snp") == -1)
warn("snp module not available");
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 03:46:31 +0000