illumos gate

Testing my changes shows that drvconfig is being called twice now with a smaller number of arguments:

15186/1:        execve("amd64/add_drv", 0xFFFFFC7FFFDFAF78, 0xFFFFFC7FFFDFAFA8)  argc = 5
15186/1:         argv: ./amd64/add_drv -u -i
15186/1:          "pci8086,2014,p" "pci8086,2016,p" "pci8086,2024,p" "pci8086,2040,p" "pci8086,2044,p" "pci8086,2048,p" "pci8086,2054,p" "pci8086,2055,p" "pci8086,2066,p" "pci8086,208e,p" "pci8086,2f1e,p" "pci8086,2f1f,p" "pci8086,2f28,p" "pci8086,2f60,p" "pci8086,2f68,p" "pci8086,2f6a,p" "pci8086,2f6b,p" "pci8086,2f6c,p" "pci8086,2f6d,p" "pci8086,2f71,p" "pci8086,2f79,p" "pci8086,2fa0,p" "pci8086,2fa8,p" "pci8086,2faa,p" "pci8086,2fab,p" "pci8086,2fac,p" "pci8086,2fad,p" "pci8086,2ffc,p" "pci8086,2ffd,p" "pci8086,3c71,p" "pci8086,3ca0,p" "pci8086,3ca8,p" "pci8086,3caa,p" "pci8086,3cab,p" "pci8086,3cac,p" "pci8086,3cad,p" "pci8086,3ce0,p" "pci8086,3ce3,p" "pci8086,3cf4,p" "pci8086,3cf5,p" "pci8086,3cf6,p" "pci8086,6f1e,p" "pci8086,6f1f,p" "pci8086,6f28,p" "pci8086,6f60,p" "pci8086,6f68,p" "pci8086,6f6a,p" "pci8086,6f6b,p" "pci8086,6f6c,p" "pci8086,6f6d,p" "pci8086,6f71,p" "pci8086,6f79,p" "pci8086,6fa0,p" "pci8086,6fa8,p" "pci8086,6faa,p" "pci8086,6fab,p" "pci8086,6fac,p" "pci8086,6fad,p" "pci8086,6ffc,p" "pci8086,6ffd,p" "pci
15186/1:          imcstub

15187/1:        execve("/usr/sbin/drvconfig", 0xFFFFFC7FFFDF9DE0, 0xFFFFFC7FFFDFAFA8)  argc = 253
15187/1:         argv: drvconfig -b -i imcstub -m 273 -x -a "pci8086,2014,p" -a
15187/1:          "pci8086,2016,p" -a "pci8086,2024,p" -a "pci8086,2040,p" -a
15187/1:          "pci8086,2044,p" -a "pci8086,2048,p" -a "pci8086,2054,p" -a
15187/1:          "pci8086,2055,p" -a "pci8086,2066,p" -a "pci8086,208e,p" -a
15187/1:          "pci8086,2f1e,p" -a "pci8086,2f1f,p" -a "pci8086,2f28,p" -a
15187/1:          "pci8086,2f60,p" -a "pci8086,2f68,p" -a "pci8086,2f6a,p" -a
15187/1:          "pci8086,2f6b,p" -a "pci8086,2f6c,p" -a "pci8086,2f6d,p" -a
15187/1:          "pci8086,2f71,p" -a "pci8086,2f79,p" -a "pci8086,2fa0,p" -a
15187/1:          "pci8086,2fa8,p" -a "pci8086,2faa,p" -a "pci8086,2fab,p" -a
15187/1:          "pci8086,2fac,p" -a "pci8086,2fad,p" -a "pci8086,2ffc,p" -a
15187/1:          "pci8086,2ffd,p" -a "pci8086,3c71,p" -a "pci8086,3ca0,p" -a
15187/1:          "pci8086,3ca8,p" -a "pci8086,3caa,p" -a "pci8086,3cab,p" -a
15187/1:          "pci8086,3cac,p" -a "pci8086,3cad,p" -a "pci8086,3ce0,p" -a
15187/1:          "pci8086,3ce3,p" -a "pci8086,3cf4,p" -a "pci8086,3cf5,p" -a
15187/1:          "pci8086,3cf6,p" -a "pci8086,6f1e,p" -a "pci8086,6f1f,p" -a
15187/1:          "pci8086,6f28,p" -a "pci8086,6f60,p" -a "pci8086,6f68,p" -a
15187/1:          "pci8086,6f6a,p" -a "pci8086,6f6b,p" -a "pci8086,6f6c,p" -a
15187/1:          "pci8086,6f6d,p" -a "pci8086,6f71,p" -a "pci8086,6f79,p" -a
15187/1:          "pci8086,6fa0,p" -a "pci8086,6fa8,p" -a "pci8086,6faa,p" -a
15187/1:          "pci8086,6fab,p" -a "pci8086,6fac,p" -a "pci8086,6fad,p" -a
15187/1:          "pci8086,6ffc,p" -a "pci8086,6ffd,p" -a "pci8086,e1e,p" -a
15187/1:          "pci8086,e1f,p" -a "pci8086,e60,p" -a "pci8086,e68,p" -a
15187/1:          "pci8086,e6a,p" -a "pci8086,e6b,p" -a "pci8086,e6c,p" -a
15187/1:          "pci8086,e6d,p" -a "pci8086,e71,p" -a "pci8086,e79,p" -a
15187/1:          "pci8086,ea0,p" -a "pci8086,ea8,p" -a "pci8086,eaa,p" -a
15187/1:          "pci8086,eab,p" -a "pci8086,eac,p" -a "pci8086,ead,p" -a
15187/1:          "pci8086,ec8,p" -a "pci8086,ec9,p" -a "pci8086,eca,p" -a
15187/1:          "pciex8086,2014" -a "pciex8086,2016" -a "pciex8086,2024" -a
15187/1:          "pciex8086,2040" -a "pciex8086,2044" -a "pciex8086,2048" -a
15187/1:          "pciex8086,2054" -a "pciex8086,2055" -a "pciex8086,2066" -a
15187/1:          "pciex8086,208e" -a "pciex8086,2f1e" -a "pciex8086,2f1f" -a
15187/1:          "pciex8086,2f28" -a "pciex8086,2f60" -a "pciex8086,2f68" -a
15187/1:          "pciex8086,2f6a" -a "pciex8086,2f6b" -a "pciex8086,2f6c" -a
15187/1:          "pciex8086,2f6d" -a "pciex8086,2f71" -a "pciex8086,2f79" -a
15187/1:          "pciex8086,2fa0" -a "pciex8086,2fa8" -a "pciex8086,2faa" -a
15187/1:          "pciex8086,2fab" -a "pciex8086,2fac" -a "pciex8086,2fad" -a
15187/1:          "pciex8086,2ffc" -a "pciex8086,2ffd" -a "pciex8086,3c71" -a
15187/1:          "pciex8086,3ca0" -a "pciex8086,3ca8" -a "pciex8086,3caa" -a
15187/1:          "pciex8086,3cab" -a "pciex8086,3cac" -a "pciex8086,3cad" -a
15187/1:          "pciex8086,3ce0" -a "pciex8086,3ce3" -a "pciex8086,3cf4" -a
15187/1:          "pciex8086,3cf5" -a "pciex8086,3cf6" -a "pciex8086,6f1e" -a
15187/1:          "pciex8086,6f1f" -a "pciex8086,6f28" 

15189/1:        execve("/usr/sbin/drvconfig", 0xFFFFFC7FFFDF9DE0, 0xFFFFFC7FFFDFAFA8)  argc = 77
15189/1:         argv: drvconfig -b -i imcstub -m 273 -x -a "pciex8086,6f60" -a
15189/1:          "pciex8086,6f68" -a "pciex8086,6f6a" -a "pciex8086,6f6b" -a
15189/1:          "pciex8086,6f6c" -a "pciex8086,6f6d" -a "pciex8086,6f71" -a
15189/1:          "pciex8086,6f79" -a "pciex8086,6fa0" -a "pciex8086,6fa8" -a
15189/1:          "pciex8086,6faa" -a "pciex8086,6fab" -a "pciex8086,6fac" -a
15189/1:          "pciex8086,6fad" -a "pciex8086,6ffc" -a "pciex8086,6ffd" -a
15189/1:          "pciex8086,e1e" -a "pciex8086,e1f" -a "pciex8086,e60" -a
15189/1:          "pciex8086,e68" -a "pciex8086,e6a" -a "pciex8086,e6b" -a
15189/1:          "pciex8086,e6c" -a "pciex8086,e6d" -a "pciex8086,e71" -a
15189/1:          "pciex8086,e79" -a "pciex8086,ea0" -a "pciex8086,ea8" -a
15189/1:          "pciex8086,eaa" -a "pciex8086,eab" -a "pciex8086,eac" -a
15189/1:          "pciex8086,ead" -a "pciex8086,ec8" -a "pciex8086,ec9" -a
15189/1:          "pciex8086,eca" 

Also checked for leaks in this code path - there were several before.

bloody:illumos:master# LD_PRELOAD=/usr/lib/amd64/libumem.so UMEM_DEBUG=default /usr/bin/amd64/mdb ./amd64/add_drv
> ::bp exit
> ::run  -u -i '"pci8086,2014,p" "pci8086,2016,p" "pci8086,2024,p" "pci8086,2040,p" "pci8086,2044,p" "pci8086,2048,p" "pci8086,2054,p" "pci8086,2055,p" "pci8086,2066,p" "pci8086,208e,p" "pci8086,2f1e,p" "pci8086,2f1f,p" "pci8086,2f28,p" "pci8086,2f60,p" "pci8086,2f68,p" "pci8086,2f6a,p" "pci8086,2f6b,p" "pci8086,2f6c,p" "pci8086,2f6d,p" "pci8086,2f71,p" "pci8086,2f79,p" "pci8086,2fa0,p" "pci8086,2fa8,p" "pci8086,2faa,p" "pci8086,2fab,p" "pci8086,2fac,p" "pci8086,2fad,p" "pci8086,2ffc,p" "pci8086,2ffd,p" "pci8086,3c71,p" "pci8086,3ca0,p" "pci8086,3ca8,p" "pci8086,3caa,p" "pci8086,3cab,p" "pci8086,3cac,p" "pci8086,3cad,p" "pci8086,3ce0,p" "pci8086,3ce3,p" "pci8086,3cf4,p" "pci8086,3cf5,p" "pci8086,3cf6,p" "pci8086,6f1e,p" "pci8086,6f1f,p" "pci8086,6f28,p" "pci8086,6f60,p" "pci8086,6f68,p" "pci8086,6f6a,p" "pci8086,6f6b,p" "pci8086,6f6c,p" "pci8086,6f6d,p" "pci8086,6f71,p" "pci8086,6f79,p" "pci8086,6fa0,p" "pci8086,6fa8,p" "pci8086,6faa,p" "pci8086,6fab,p" "pci8086,6fac,p" "pci8086,6fad,p"' imcstub
mdb: forksys detected: follow (p)arent or (c)hild? p
mdb: target forked child process 15098 (debugger following parent)
ld.so.1: drvconfig: fatal: /usr/lib/amd64/libumem.so: wrong ELF class: ELFCLASS64
System updated but imcstub driver not yet configured.
mdb: stop at exit
mdb: target stopped at:
libc.so.1`exit: pushq  %rbp
mdb: You've got symbols!
Loading modules: [ ld.so.1 libumem.so.1 libc.so.1 ]
> ::umem_status
Status:         ready and active
Concurrency:    32
Logs:           (inactive)
Message buffer:

> ::findleaks
findleaks: no memory leaks detected

Also that the right number of entries ends up in driver aliases

# grep -c imcstub /etc/driver_aliases
158

Review posted at https://code.illumos.org/c/illumos-gate/+/603

ptribble pointed out on IRC that the e1000g driver has even more aliases.
I tested uninstalling and re-installing it and it exhibited the same problem.

This has not been seen before, however, since e1000g is part of the base system for both OmniOS and OpenIndiana and is installed initially in an alternate root, without add_drv being called (thanks toasterson for the hint there).