mlxcx + Robert's IPD 39 changes to support mlxcx

exception_lists/packaging.deps

@@ -27,11 +27,6 @@ pkg:/runtime/java/openjdk11
 pkg:/runtime/java/openjdk8
 pkg:/runtime/java/runtime64
 pkg:/runtime/perl
-pkg:/runtime/python-27
-pkg:/runtime/python-310
-pkg:/runtime/python-311
-pkg:/runtime/python-35
-pkg:/runtime/python-39
 pkg:/security/sudo
 pkg:/service/network/samba
 pkg:/shell/bash

usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/in.rdisc.c

@@ -43,15 +43,12 @@
 
 #include <fcntl.h>
 #include <strings.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <assert.h>
 
-#ifdef lint
-#define	ALIGN(ptr)	(ptr ? 0 : 0)
-#else
 #define	ALIGN(ptr)	(ptr)
-#endif
 
 #ifdef SYSV
 #define	signal(s, f)	sigset(s, (void (*)(int))f)
@@ -80,7 +77,7 @@ struct icmp_ra_addr {
 
 /* Router constants */
 #define	MAX_INITIAL_ADVERT_INTERVAL	16
-#define	MAX_INITIAL_ADVERTISEMENTS 	3
+#define	MAX_INITIAL_ADVERTISEMENTS	3
 #define	MAX_RESPONSE_DELAY		2	/* Not used */
 
 /* Host constants */
@@ -190,7 +187,10 @@ char		*pr_name(struct in_addr addr);
 char		*pr_type(int t);
 
 static void	initlog(void);
-void		logerr(), logtrace(), logdebug(), logperror();
+static void	logerr(char *, ...);
+static void	logtrace(char *, ...);
+static void	logdebug(char *, ...);
+static void	logperror(char *);
 
 /* Local variables */
 
@@ -231,7 +231,7 @@ ulong_t g_preference = 0;	/* Setable with -p option */
 /* Host variables */
 int max_solicitations = MAX_SOLICITATIONS;
 unsigned int solicitation_interval = SOLICITATION_INTERVAL;
-int best_preference = 1; 	/* Set to record only the router(s) with the */
+int best_preference = 1;	/* Set to record only the router(s) with the */
 				/* best preference in the kernel. Not set   */
 				/* puts all routes in the kernel.	    */
 
@@ -2233,42 +2233,54 @@ initlog(void)
 	openlog("in.rdisc", LOG_PID | LOG_CONS, LOG_DAEMON);
 }
 
-/* VARARGS1 */
-void
-logerr(fmt, a, b, c, d, e, f, g, h)
-	char *fmt;
+static void
+logimpl(int pri, char *fmt, va_list ap)
 {
+	FILE *log;
+
+	if (pri == LOG_ERR)
+		log = stderr;
+	else
+		log = stdout;
+
 	if (logging)
-		syslog(LOG_ERR, fmt, a, b, c, d, e, f, g, h);
+		vsyslog(pri, fmt, ap);
 	else
-		(void) fprintf(stderr, fmt, a, b, c, d, e, f, g, h);
+		(void) vfprintf(log, fmt, ap);
 }
 
-/* VARARGS1 */
-void
-logtrace(fmt, a, b, c, d, e, f, g, h)
-	char *fmt;
+static void
+logerr(char *fmt, ...)
 {
-	if (logging)
-		syslog(LOG_INFO, fmt, a, b, c, d, e, f, g, h);
-	else
-		(void) fprintf(stdout, fmt, a, b, c, d, e, f, g, h);
+	va_list ap;
+
+	va_start(ap, fmt);
+	logimpl(LOG_ERR, fmt, ap);
+	va_end(ap);
 }
 
-/* VARARGS1 */
-void
-logdebug(fmt, a, b, c, d, e, f, g, h)
-	char *fmt;
+static void
+logtrace(char *fmt, ...)
 {
-	if (logging)
-		syslog(LOG_DEBUG, fmt, a, b, c, d, e, f, g, h);
-	else
-		(void) fprintf(stdout, fmt, a, b, c, d, e, f, g, h);
+	va_list ap;
+
+	va_start(ap, fmt);
+	logimpl(LOG_INFO, fmt, ap);
+	va_end(ap);
+}
+
+static void
+logdebug(char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	logimpl(LOG_DEBUG, fmt, ap);
+	va_end(ap);
 }
 
-void
-logperror(str)
-	char *str;
+static void
+logperror(char *str)
 {
 	if (logging)
 		syslog(LOG_ERR, "%s: %s\n", str, strerror(errno));

usr/src/cmd/mdb/common/kmdb/kmdb_kvm.c

@@ -23,6 +23,7 @@
  * Copyright (c) 2013 by Delphix. All rights reserved.
  *
  * Copyright 2019 Joyent, Inc.
+ * Copyright 2024 Oxide Computer Company
  */
 
 #include <kmdb/kmdb_kvm.h>
@@ -2447,7 +2448,8 @@ static const mdb_tgt_ops_t kmt_ops = {
 	kmt_getareg,				/* t_getareg */
 	kmt_putareg,				/* t_putareg */
 	(int (*)())(uintptr_t)mdb_tgt_nop,	/* XXX t_stack_iter */
-	(int (*)())(uintptr_t)mdb_tgt_notsup	/* t_auxv */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_auxv */
+	(int (*)())(uintptr_t)mdb_tgt_notsup	/* t_thread_name */
 };
 
 /*

usr/src/cmd/mdb/common/mdb/mdb_kproc.c

@@ -23,6 +23,7 @@
  * Use is subject to license terms.
  *
  * Copyright 2018 Joyent, Inc.
+ * Copyright 2024 Oxide Computer Company
  */
 
 /*
@@ -885,27 +886,27 @@ kp_auxv(mdb_tgt_t *t, const auxv_t **auxvp)
 }
 
 static const mdb_tgt_ops_t kproc_ops = {
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_setflags */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_setflags */
 	kp_setcontext,				/* t_setcontext */
 	kp_activate,				/* t_activate */
 	kp_deactivate,				/* t_deactivate */
-	(void (*)())(uintptr_t) mdb_tgt_nop,	/* t_periodic */
+	(void (*)())(uintptr_t)mdb_tgt_nop,	/* t_periodic */
 	kp_destroy,				/* t_destroy */
 	kp_name,				/* t_name */
 	kp_isa,					/* t_isa */
 	kp_platform,				/* t_platform */
 	kp_uname,				/* t_uname */
 	kp_dmodel,				/* t_dmodel */
-	(ssize_t (*)()) mdb_tgt_notsup,		/* t_aread */
-	(ssize_t (*)()) mdb_tgt_notsup,		/* t_awrite */
+	(ssize_t (*)())mdb_tgt_notsup,		/* t_aread */
+	(ssize_t (*)())mdb_tgt_notsup,		/* t_awrite */
 	kp_vread,				/* t_vread */
 	kp_vwrite,				/* t_vwrite */
-	(ssize_t (*)()) mdb_tgt_notsup,		/* t_pread */
-	(ssize_t (*)()) mdb_tgt_notsup,		/* t_pwrite */
-	(ssize_t (*)()) mdb_tgt_notsup,		/* t_fread */
-	(ssize_t (*)()) mdb_tgt_notsup,		/* t_fwrite */
-	(ssize_t (*)()) mdb_tgt_notsup,		/* t_ioread */
-	(ssize_t (*)()) mdb_tgt_notsup,		/* t_iowrite */
+	(ssize_t (*)())mdb_tgt_notsup,		/* t_pread */
+	(ssize_t (*)())mdb_tgt_notsup,		/* t_pwrite */
+	(ssize_t (*)())mdb_tgt_notsup,		/* t_fread */
+	(ssize_t (*)())mdb_tgt_notsup,		/* t_fwrite */
+	(ssize_t (*)())mdb_tgt_notsup,		/* t_ioread */
+	(ssize_t (*)())mdb_tgt_notsup,		/* t_iowrite */
 	kp_vtop,				/* t_vtop */
 	kp_lookup_by_name,			/* t_lookup_by_name */
 	kp_lookup_by_addr,			/* t_lookup_by_addr */
@@ -914,28 +915,29 @@ static const mdb_tgt_ops_t kproc_ops = {
 	kp_object_iter,				/* t_object_iter */
 	kp_addr_to_map,				/* t_addr_to_map */
 	kp_name_to_map,				/* t_name_to_map */
-	(struct ctf_file *(*)()) mdb_tgt_null,	/* t_addr_to_ctf */
-	(struct ctf_file *(*)()) mdb_tgt_null,	/* t_name_to_ctf */
+	(struct ctf_file *(*)())mdb_tgt_null,	/* t_addr_to_ctf */
+	(struct ctf_file *(*)())mdb_tgt_null,	/* t_name_to_ctf */
 	kp_status,				/* t_status */
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_run */
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_step */
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_step_out */
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_next */
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_cont */
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_signal */
-	(int (*)())(uintptr_t) mdb_tgt_null,	/* t_add_sbrkpt */
-	(int (*)())(uintptr_t) mdb_tgt_null,	/* t_add_vbrkpt */
-	(int (*)())(uintptr_t) mdb_tgt_null,	/* t_add_pwapt */
-	(int (*)())(uintptr_t) mdb_tgt_null,	/* t_add_vwapt */
-	(int (*)())(uintptr_t) mdb_tgt_null,	/* t_add_iowapt */
-	(int (*)())(uintptr_t) mdb_tgt_null,	/* t_add_sysenter */
-	(int (*)())(uintptr_t) mdb_tgt_null,	/* t_add_sysexit */
-	(int (*)())(uintptr_t) mdb_tgt_null,	/* t_add_signal */
-	(int (*)())(uintptr_t) mdb_tgt_null,	/* t_add_fault */
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_getareg XXX */
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_putareg XXX */
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_stack_iter XXX */
-	kp_auxv					/* t_auxv */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_run */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_step */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_step_out */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_next */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_cont */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_signal */
+	(int (*)())(uintptr_t)mdb_tgt_null,	/* t_add_sbrkpt */
+	(int (*)())(uintptr_t)mdb_tgt_null,	/* t_add_vbrkpt */
+	(int (*)())(uintptr_t)mdb_tgt_null,	/* t_add_pwapt */
+	(int (*)())(uintptr_t)mdb_tgt_null,	/* t_add_vwapt */
+	(int (*)())(uintptr_t)mdb_tgt_null,	/* t_add_iowapt */
+	(int (*)())(uintptr_t)mdb_tgt_null,	/* t_add_sysenter */
+	(int (*)())(uintptr_t)mdb_tgt_null,	/* t_add_sysexit */
+	(int (*)())(uintptr_t)mdb_tgt_null,	/* t_add_signal */
+	(int (*)())(uintptr_t)mdb_tgt_null,	/* t_add_fault */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_getareg XXX */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_putareg XXX */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_stack_iter XXX */
+	kp_auxv,				/* t_auxv */
+	(int (*)())(uintptr_t)mdb_tgt_notsup	/* t_thread_name */
 };
 
 int

usr/src/cmd/mdb/common/mdb/mdb_modapi.c

@@ -24,7 +24,7 @@
  * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright 2016 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2019 Joyent, Inc.
- * Copyright 2022 Oxide Computer Company
+ * Copyright 2024 Oxide Computer Company
  * Copyright 2023 RackTop Systems, Inc.
  * Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
  */
@@ -322,6 +322,12 @@ mdb_getareg(mdb_tid_t tid, const char *rname, mdb_reg_t *rp)
 	return (mdb_tgt_getareg(mdb.m_target, tid, rname, rp));
 }
 
+int
+mdb_thread_name(mdb_tid_t tid, char *buf, size_t bufsize)
+{
+	return (mdb_tgt_thread_name(mdb.m_target, tid, buf, bufsize));
+}
+
 static u_longlong_t
 mdb_strtoull_int(const char *s, int radix)
 {

usr/src/cmd/mdb/common/mdb/mdb_modapi.h

@@ -25,6 +25,7 @@
  * Copyright 2019 Joyent, Inc.
  * Copyright 2023 RackTop Systems, Inc.
  * Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
+ * Copyright 2024 Oxide Computer Company
  */
 
 #ifndef	_MDB_MODAPI_H
@@ -246,6 +247,7 @@ typedef uintptr_t mdb_tid_t;
 typedef uint64_t mdb_reg_t;
 
 extern int mdb_getareg(mdb_tid_t, const char *, mdb_reg_t *);
+extern int mdb_thread_name(mdb_tid_t, char *, size_t);
 
 #define	MDB_OPT_SETBITS	1			/* Set specified flag bits */
 #define	MDB_OPT_CLRBITS	2			/* Clear specified flag bits */

usr/src/cmd/mdb/common/mdb/mdb_nv.c

@@ -25,6 +25,7 @@
  */
 /*
  * Copyright (c) 2013 Josef 'Jeff' Sipek <[email protected]>
+ * Copyright 2024 Oxide Computer Company
  */
 
 #include <mdb/mdb_debug.h>
@@ -65,7 +66,7 @@ nv_hashstring(const char *key)
 
 static mdb_var_t *
 nv_var_alloc(const char *name, const mdb_nv_disc_t *disc,
-	uintmax_t value, uint_t flags, uint_t um_flags, mdb_var_t *next)
+    uintmax_t value, uint_t flags, uint_t um_flags, mdb_var_t *next)
 {
 	size_t nbytes;
 	mdb_var_t *v;
@@ -154,7 +155,7 @@ mdb_nv_destroy(mdb_nv_t *nv)
 		}
 	}
 
-	mdb_free(nv->nv_hash, sizeof (mdb_var_t *) * NV_HASHSZ);
+	mdb_free(nv->nv_hash, sizeof (mdb_var_t *) * nv->nv_hashsz);
 }
 
 mdb_var_t *
@@ -208,19 +209,68 @@ nv_var_overload(mdb_var_t *v, mdb_var_t *w)
 	return (w);
 }
 
+static void
+nv_resize(mdb_nv_t *nv)
+{
+	size_t i, bucket, new_hashsz = (nv->nv_hashsz << 1) - 1;
+	mdb_var_t *v, *w, **new_hash =
+	    mdb_zalloc(sizeof (mdb_var_t *) * new_hashsz, nv->nv_um_flags);
+
+	if (new_hash == NULL) {
+		/*
+		 * If this fails (possible only if UM_NOSLEEP was set in our
+		 * flags), we will simply return -- and will presumably attempt
+		 * to rehash again on a subsequent insert.
+		 */
+		ASSERT(nv->nv_um_flags & UM_NOSLEEP);
+		return;
+	}
+
+	/*
+	 * This is a point of no return:  we are going to iterate over our
+	 * hash table, rehashing everything.  Note that the ordering within
+	 * hash chains is not preserved:  if every element of a bucket were
+	 * to rehash to the same bucket in the larger table, the ordering
+	 * will be flipped.
+	 */
+	for (i = 0; i < nv->nv_hashsz; i++) {
+		for (v = nv->nv_hash[i]; v != NULL; v = w) {
+			w = v->v_next;
+
+			bucket = nv_hashstring(NV_NAME(v)) % new_hashsz;
+			v->v_next = new_hash[bucket];
+			new_hash[bucket] = v;
+		}
+	}
+
+	/*
+	 * Everything has been rehashed; free our old hash table and point
+	 * ourselves to the new one.
+	 */
+	mdb_free(nv->nv_hash, sizeof (mdb_var_t *) * nv->nv_hashsz);
+	nv->nv_hash = new_hash;
+	nv->nv_hashsz = new_hashsz;
+}
+
 /*
  * Can return NULL only if the nv's memory allocation flags include UM_NOSLEEP
  */
 mdb_var_t *
 mdb_nv_insert(mdb_nv_t *nv, const char *name, const mdb_nv_disc_t *disc,
     uintmax_t value, uint_t flags)
 {
-	size_t i = nv_hashstring(name) % nv->nv_hashsz;
+	size_t i;
 	mdb_var_t *v;
 
 	ASSERT(!(flags & MDB_NV_EXTNAME) || !(flags & MDB_NV_OVERLOAD));
 	ASSERT(!(flags & MDB_NV_RDONLY) || !(flags & MDB_NV_OVERLOAD));
 
+	if (nv->nv_nelems > nv->nv_hashsz && nv->nv_iter_elt == NULL) {
+		nv_resize(nv);
+	}
+
+	i = nv_hashstring(name) % nv->nv_hashsz;
+
 	/*
 	 * If the specified name is already hashed,
 	 * and MDB_NV_OVERLOAD is set:	insert new var into overload chain