PSARC/2009/331 IP Datapath Refactoring

PSARC/2008/522 EOF of 2001/070 IPsec HW Acceleration support
PSARC/2009/495 netstat -r flags for blackhole and reject routes
PSARC 2009/496 EOF of XRESOLV
PSARC/2009/494 IP_DONTFRAG socket option
PSARC/2009/515 fragmentation controls for ping and traceroute
6798716 ip_newroute delenda est
6798739 ARP and IP are too separate
6807265 IPv4 ip2mac() support
6756382 Please remove Venus IPsec HWACCEL code
6880632 sendto/sendmsg never returns EHOSTUNREACH in Solaris
6748582 sendmsg() return OK, but doesn't send message using IPv4-mapped x IPv6 addr
1119790 TCP and path mtu discovery
4637227 should support equal-cost multi-path (ECMP)
5078568 getsockopt() for IPV6_PATHMTU on a non-connected socket should not succeed
6419648 "AR* contract private note" should be removed as part of ATM SW EOL
6274715 Arp could keep the old entry in the cache while it waits for an arp response
6605615 Remove duplicated TCP/IP opt_set/opt_get code; use conn_t
6874677 IP_TTL can be used to send with ttl zero
4034090 arp should not let you delete your own entry
6882140 Implement IP_DONTFRAG socket option
6883858 Implement ping -D option; traceroute -F should work for IPv6 and shared-IP zones
1119792 TCP/IP black hole detection is broken on receiver
4078796 Directed broadcast forwarding code has problems
4104337 restrict the IPPROTO_IP and IPPROTO_IPV6 options based on the socket family
4203747 Source address selection for source routed packets
4230259 pmtu is increased every ip_ire_pathmtu_interval timer value.
4300533 When sticky option ipv6_pktinfo set to bogus address subsequent connect time out
4471035 ire_delete_cache_gw is called through ire_walk unnecessarily
4514572 SO_DONTROUTE socket option doesn't work with IPv6
4524980 tcp_lookup_ipv4() should compare the ifindex against tcpb->tcpb_bound_if
4532714 machine fails to switch quickly among failed default routes
4634219 IPv6 path mtu discovery is broken when using routing header
4691581 udp broadcast handling causes too many replicas
4708405 mcast is broken on machines when all interfaces are IFF_POINTOPOINT
4770457 netstat/route: source address of interface routes pretends to be gateway address
4786974 use routing table to determine routes/interface for multicast
4792619 An ip_fanout_udp_ipc_v6() routine might lead to some simpler code
4816115 Nuke ipsec_out_use_global_policy
4862844 ipsec offload corner case
4867533 tcp_rq and tcp_wq are redundant
4868589 NCEs should be shared across an IPMP group
4872093 unplumbing an improper virtual interface panics in ip_newroute_get_dst_ill()
4901671 FireEngine needs some cleanup
4907617 IPsec identity latching should be done before sending SYN-ACK
4941461 scopeid and IPV6_PKTINFO with UDP/ICMP connect() does not work properly
4944981 ip does nothing with IP6I_NEXTHOP
4963353 IPv4 and IPv6 proto fanout codes could be brought closer
4963360 consider passing zoneid using ip6i_t instead of ipsec_out_t in NDP
4963734 new ip6_asp locking is used incorrectly in ip_newroute_v6()
5008315 IPv6 code passes ip6i_t to IPsec code instead of ip6_t
5009636 memory leak in ip_fanout_proto_v6()
5092337 tcp/udp option handling can use some cleanup
5035841 Solaris can fail to create a valid broadcast ire
5043747 ar_query_xmit: Could not find the ace
5051574 tcp_check_policy is missing some checks
6305037 full hardware checksum is discarded when there're more than 2 mblks in the chain
6311149 ip.c needs to be put through a woodchipper
4708860 Unable to reassemble CGTP fragmented multicast packets
6224628 Large IPv6 packets with IPsec protection sometimes have length mismatch.
6213243 Solaris does not currently support Dead Gateway Detection
5029091 duplicate code in IP's input path for TCP/UDP/SCTP
4674643 through IPv6 CGTP routes, the very first packet is sent only after a while
6207318 Multiple default routes do not round robin connections to routers.
4823410 IP has an inconsistent view of link mtu
5105520 adding interface route to down interface causes ifconfig hang
5105707 advanced sockets API introduced some dead code
6318399 IP option handling for icmp and udp is too complicated
6321434 Every dropped packet in IP should use ip_drop_packet()
6341693 ifconfig mtu should operate on the physical interface, not individual ipif's
6352430 The credentials attached to an mblk are not particularly useful
6357894 uninitialised ipp_hoplimit needs to be cleaned up.
6363568 ip_xmit_v6() may be missing IRE releases in error cases
6364828 ip_rput_forward needs a makeover
6384416 System panics when running as multicast forwarder using multicast tunnels
6402382 TX: UDP v6 slowpath is not modified to handle mac_exempt conns
6418413 assertion failed ipha->ipha_ident == 0||ipha->ipha_ident == 0xFFFF
6420916 assertion failures in ipv6 wput path
6430851 use of b_prev to store ifindex is not 100% safe
6446106 IPv6 packets stored in nce->nce_qd_mp will be sent with incorrect tcp/udp checksums
6453711 SCTP OOTB sent as if genetated by global zone
6465212 ARP/IP merge should remove ire_freemblk.esballoc
6490163 ip_input() could misbehave if the first mblk's size is not big enough
6496664 missing ipif_refrele leads to reference leak and deferred crash in ip_wput_ipsec_out_v6
6504856 memory leak in ip_fanout_proto_v6() when using link local outer tunnel addresses
6507765 IRE cache hash function performs badly
6510186 IP_FORWARD_PROG bit is easily overlooked
6514727 cgtp ipv6 failure on snv54
6528286 MULTIRT (CGTP) should offload checksum to hardware
6533904 SCTP: doesn't support traffic class for IPv6
6539415 TX: ipif source selection is flawed for unlabeled gateways
6539851 plumbed unworking nic blocks sending broadcast packets
6564468 non-solaris SCTP stack over rawip socket: netstat command counts rawipInData not rawipOutDatagrams
6568511 ipIfStatsOutDiscards not bumped when discarding an ipsec packet on the wrong NIC
6584162 tcp_g_q_inactive() makes incorrect use of taskq_dispatch()
6603974 round-robin default with many interfaces causes infinite temporary IRE thrashing
6611750 ilm_lookup_ill_index_v4 was born an orphan
6618423 ip_wput_frag_mdt sends out packets that void pfhooks
6620964 IRE max bucket count calculations performed in ip_ire_init() are flawed
6626266 various _broadcasts seem redundant
6638182 IP_PKTINFO + SO_DONTROUTE + CIPSO IP option == panic
6647710 IPv6 possible DoS vulnerability
6657357 nce should be kmem_cache alloc'ed from an nce_cache.
6685131 ilg_add -> conn_ilg_alloc interacting with conn_ilg[] walkers can cause panic.
6730298 adding 0.0.0.0 key with mask != 0 causes  'route delete default' to fail
6730976 vni and ipv6 doesn't quite work.
6740956 assertion failed: mp->b_next == 0L && mp->b_prev == 0L in nce_queue_mp_common()
6748515 BUMP_MIB() is occasionally done on the wrong ill
6753250 ip_output_v6() `notv6' error path has an errant ill_refrele()
6756411 NULL-pointer dereference in ip_wput_local()
6769582 IP must forward packet returned from FW-HOOK
6781525 bogus usesrc usage leads directly to panic
6422839 System paniced in ip_multicast_loopback due to NULL pointer dereference
6785521 initial IPv6 DAD solicitation is dropped in ip_newroute_ipif_v6()
6787370 ipnet devices not seeing forwarded IP packets on outgoing interface
6791187 ip*dbg() calls in ip_output_options() claim to originate from ip_wput()
6794047 nce_fp_mp prevents sharing of NCEs across an IPMP group
6797926 many unnecessary ip0dbg() in ip_rput_data_v6
6846919 Packet queued for ND gets sent in the clear.
6856591 ping doesn't send packets with DF set
6861113 arp module has incorrect dependency path for hook module
6865664 IPV6_NEXTHOP does not work with TCP socket
6874681 No ICMP time exceeded when a router receives packet with ttl = 0
6880977 ip_wput_ire() uses over 1k of stack
6595433 IPsec performance could be significantly better when calling hw crypto provider synchronously
6848397 ifconfig down of an interface can hang.
6849602 IPV6_PATHMTU size issue for UDP
6885359 Add compile-time option for testing pure IPsec overhead
6889268 Odd loopback source address selection with IPMP
6895420 assertion failed: connp->conn_helper_info == NULL
6851189 Routing-related panic occurred during reboot on T2000 system running snv_117
6896174 Post-async-encryption, AH+ESP packets may have misinitialized ipha/ip6
6896687 iptun presents IPv6 with an MTU < 1280
6897006 assertion failed: ipif->ipif_id != 0 in ip_sioctl_slifzone_restart

1 files changed, 4 insertions, 661 deletions

diff --git a/usr/src/cmd/mdb/common/modules/arp/arp.c b/usr/src/cmd/mdb/common/modules/arp/arp.c
index f36a81170e..f97cdaab42 100644
--- a/usr/src/cmd/mdb/common/modules/arp/arp.c
+++ b/usr/src/cmd/mdb/common/modules/arp/arp.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stropts.h>
@@ -36,7 +34,6 @@
 #include <inet/common.h>
 #include <inet/mi.h>
 #include <inet/arp.h>
-#include <inet/arp_impl.h>
 #include <inet/ip.h>
 #include <netinet/arp.h>
 
@@ -50,541 +47,10 @@ typedef struct {
 } arp_cmd_tbl;
 
 /*
- * Table of ARP commands and structure types used for messages between ARP and
- * IP.
- */
-static const arp_cmd_tbl act_list[] = {
-	{ AR_ENTRY_ADD,		"AR_ENTRY_ADD",		"arp`area_t" },
-	{ AR_ENTRY_DELETE,	"AR_ENTRY_DELETE",	"arp`ared_t" },
-	{ AR_ENTRY_QUERY,	"AR_ENTRY_QUERY",	"arp`areq_t" },
-	{ AR_ENTRY_SQUERY,	"AR_ENTRY_SQUERY",	"arp`area_t" },
-	{ AR_MAPPING_ADD,	"AR_MAPPING_ADD",	"arp`arma_t" },
-	{ AR_CLIENT_NOTIFY,	"AR_CLIENT_NOTIFY",	"arp`arcn_t" },
-	{ AR_INTERFACE_UP,	"AR_INTERFACE_UP",	"arp`arc_t" },
-	{ AR_INTERFACE_DOWN,	"AR_INTERFACE_DOWN",	"arp`arc_t" },
-	{ AR_INTERFACE_ON,	"AR_INTERFACE_ON",	"arp`arc_t" },
-	{ AR_INTERFACE_OFF,	"AR_INTERFACE_OFF",	"arp`arc_t" },
-	{ AR_DLPIOP_DONE,	"AR_DLPIOP_DONE",	"arp`arc_t" },
-	{ AR_ARP_CLOSING,	"AR_ARP_CLOSING",	"arp`arc_t" },
-	{ AR_ARP_EXTEND,	"AR_ARP_EXTEND",	"arp`arc_t" },
-	{ 0,			"unknown command",	"arp`arc_t" }
-};
-
-/*
- * State information kept during walk over ACE hash table and unhashed mask
- * list.
- */
-typedef struct ace_walk_data {
-	ace_t *awd_hash_tbl[ARP_HASH_SIZE];
-	ace_t *awd_masks;
-	int awd_idx;
-} ace_walk_data_t;
-
-/*
- * Given the kernel address of an arl_t, return the stackid
+ * removed all the ace/arl related stuff. The only thing that remains
+ * is code for dealing with ioctls and printing out arp header that
+ * should probably be moved into the ip/mdb module.
  */
-static int
-arl_to_stackid(uintptr_t addr)
-{
-	arl_t arl;
-	queue_t rq;
-	ar_t ar;
-	arp_stack_t ass;
-	netstack_t nss;
-
-	if (mdb_vread(&arl, sizeof (arl), addr) == -1) {
-		mdb_warn("failed to read arl_t %p", addr);
-		return (0);
-	}
-
-	addr = (uintptr_t)arl.arl_rq;
-	if (mdb_vread(&rq, sizeof (rq), addr) == -1) {
-		mdb_warn("failed to read queue_t %p", addr);
-		return (0);
-	}
-
-	addr = (uintptr_t)rq.q_ptr;
-	if (mdb_vread(&ar, sizeof (ar), addr) == -1) {
-		mdb_warn("failed to read ar_t %p", addr);
-		return (0);
-	}
-
-	addr = (uintptr_t)ar.ar_as;
-	if (mdb_vread(&ass, sizeof (ass), addr) == -1) {
-		mdb_warn("failed to read arp_stack_t %p", addr);
-		return (0);
-	}
-	addr = (uintptr_t)ass.as_netstack;
-	if (mdb_vread(&nss, sizeof (nss), addr) == -1) {
-		mdb_warn("failed to read netstack_t %p", addr);
-		return (0);
-	}
-	return (nss.netstack_stackid);
-}
-
-static int
-arp_stacks_walk_init(mdb_walk_state_t *wsp)
-{
-	if (mdb_layered_walk("netstack", wsp) == -1) {
-		mdb_warn("can't walk 'netstack'");
-		return (WALK_ERR);
-	}
-	return (WALK_NEXT);
-}
-
-static int
-arp_stacks_walk_step(mdb_walk_state_t *wsp)
-{
-	uintptr_t addr;
-	netstack_t nss;
-
-	if (mdb_vread(&nss, sizeof (nss), wsp->walk_addr) == -1) {
-		mdb_warn("can't read netstack at %p", wsp->walk_addr);
-		return (WALK_ERR);
-	}
-	addr = (uintptr_t)nss.netstack_modules[NS_ARP];
-
-	return (wsp->walk_callback(addr, wsp->walk_layer, wsp->walk_cbdata));
-}
-
-static int
-arl_stack_walk_init(mdb_walk_state_t *wsp)
-{
-	uintptr_t addr;
-
-	if (wsp->walk_addr == NULL) {
-		mdb_warn("arl_stack supports only local walks\n");
-		return (WALK_ERR);
-	}
-
-	addr = wsp->walk_addr + OFFSETOF(arp_stack_t, as_arl_head);
-	if (mdb_vread(&wsp->walk_addr, sizeof (wsp->walk_addr),
-	    addr) == -1) {
-		mdb_warn("failed to read 'arl_g_head'");
-		return (WALK_ERR);
-	}
-	return (WALK_NEXT);
-}
-
-static int
-arl_stack_walk_step(mdb_walk_state_t *wsp)
-{
-	uintptr_t addr = wsp->walk_addr;
-	arl_t arl;
-
-	if (wsp->walk_addr == NULL)
-		return (WALK_DONE);
-
-	if (mdb_vread(&arl, sizeof (arl), addr) == -1) {
-		mdb_warn("failed to read arl_t at %p", addr);
-		return (WALK_ERR);
-	}
-
-	wsp->walk_addr = (uintptr_t)arl.arl_next;
-
-	return ((*wsp->walk_callback)(addr, &arl, wsp->walk_cbdata));
-}
-
-static int
-arl_walk_init(mdb_walk_state_t *wsp)
-{
-	if (mdb_layered_walk("arp_stacks", wsp) == -1) {
-		mdb_warn("can't walk 'arp_stacks'");
-		return (WALK_ERR);
-	}
-
-	return (WALK_NEXT);
-}
-
-static int
-arl_walk_step(mdb_walk_state_t *wsp)
-{
-	if (mdb_pwalk("arl_stack", wsp->walk_callback,
-		wsp->walk_cbdata, wsp->walk_addr) == -1) {
-		mdb_warn("couldn't walk 'arl_stack' at %p", wsp->walk_addr);
-		return (WALK_ERR);
-	}
-	return (WALK_NEXT);
-}
-
-/*
- * Called with walk_addr being the address of arp_stack_t
- */
-static int
-ace_stack_walk_init(mdb_walk_state_t *wsp)
-{
-	ace_walk_data_t *aw;
-	uintptr_t addr;
-
-	if (wsp->walk_addr == NULL) {
-		mdb_warn("ace_stack supports only local walks\n");
-		return (WALK_ERR);
-	}
-
-	aw = mdb_alloc(sizeof (ace_walk_data_t), UM_SLEEP);
-
-	addr = wsp->walk_addr + OFFSETOF(arp_stack_t, as_ce_hash_tbl);
-	if (mdb_vread(aw->awd_hash_tbl, sizeof (aw->awd_hash_tbl),
-	    addr) == -1) {
-		mdb_warn("failed to read 'as_ce_hash_tbl'");
-		mdb_free(aw, sizeof (ace_walk_data_t));
-		return (WALK_ERR);
-	}
-
-	addr = wsp->walk_addr + OFFSETOF(arp_stack_t, as_ce_mask_entries);
-	if (mdb_vread(&aw->awd_masks, sizeof (aw->awd_masks),
-	    addr) == -1) {
-		mdb_warn("failed to read 'as_ce_mask_entries'");
-		mdb_free(aw, sizeof (ace_walk_data_t));
-		return (WALK_ERR);
-	}
-
-	/* The step routine will start off by incrementing to index 0 */
-	aw->awd_idx = -1;
-	wsp->walk_addr = 0;
-	wsp->walk_data = aw;
-
-	return (WALK_NEXT);
-}
-
-static int
-ace_stack_walk_step(mdb_walk_state_t *wsp)
-{
-	uintptr_t addr;
-	ace_walk_data_t *aw = wsp->walk_data;
-	ace_t ace;
-
-	/*
-	 * If we're at the end of the previous list, then find the start of the
-	 * next list to process.
-	 */
-	while (wsp->walk_addr == NULL) {
-		if (aw->awd_idx == ARP_HASH_SIZE)
-			return (WALK_DONE);
-		if (++aw->awd_idx == ARP_HASH_SIZE) {
-			wsp->walk_addr = (uintptr_t)aw->awd_masks;
-		} else {
-			wsp->walk_addr =
-			    (uintptr_t)aw->awd_hash_tbl[aw->awd_idx];
-		}
-	}
-
-	addr = wsp->walk_addr;
-	if (mdb_vread(&ace, sizeof (ace), addr) == -1) {
-		mdb_warn("failed to read ace_t at %p", addr);
-		return (WALK_ERR);
-	}
-
-	wsp->walk_addr = (uintptr_t)ace.ace_next;
-
-	return (wsp->walk_callback(addr, &ace, wsp->walk_cbdata));
-}
-
-static void
-ace_stack_walk_fini(mdb_walk_state_t *wsp)
-{
-	mdb_free(wsp->walk_data, sizeof (ace_walk_data_t));
-}
-
-static int
-ace_walk_init(mdb_walk_state_t *wsp)
-{
-	if (mdb_layered_walk("arp_stacks", wsp) == -1) {
-		mdb_warn("can't walk 'arp_stacks'");
-		return (WALK_ERR);
-	}
-
-	return (WALK_NEXT);
-}
-
-static int
-ace_walk_step(mdb_walk_state_t *wsp)
-{
-	if (mdb_pwalk("ace_stack", wsp->walk_callback,
-		wsp->walk_cbdata, wsp->walk_addr) == -1) {
-		mdb_warn("couldn't walk 'ace_stack' at %p", wsp->walk_addr);
-		return (WALK_ERR);
-	}
-	return (WALK_NEXT);
-}
-
-
-/* Common routine to produce an 'ar' text description */
-static void
-ar_describe(const ar_t *ar, char *buf, size_t nbytes, boolean_t addmac)
-{
-	if (ar->ar_arl == NULL) {
-		queue_t wq, ipq;
-		ill_t ill;
-		char name[LIFNAMSIZ];
-		GElf_Sym sym;
-		boolean_t nextip;
-
-		if (mdb_vread(&wq, sizeof (wq), (uintptr_t)ar->ar_wq) == -1 ||
-		    mdb_vread(&ipq, sizeof (ipq), (uintptr_t)wq.q_next) == -1)
-			return;
-
-		nextip =
-		    (mdb_lookup_by_obj("ip", "ipwinit", &sym) == 0 &&
-		    (uintptr_t)sym.st_value == (uintptr_t)ipq.q_qinfo);
-
-		if (!ar->ar_on_ill_stream) {
-			(void) strcpy(buf, nextip ? "Client" : "Unknown");
-			return;
-		}
-
-		if (!nextip ||
-		    mdb_vread(&ill, sizeof (ill), (uintptr_t)ipq.q_ptr) == -1 ||
-		    mdb_readstr(name, sizeof (name),
-		    (uintptr_t)ill.ill_name) == -1) {
-			return;
-		}
-		(void) mdb_snprintf(buf, nbytes, "IP %s", name);
-	} else {
-		arl_t arl;
-		arlphy_t ap;
-		ssize_t retv;
-		uint32_t alen;
-		uchar_t macaddr[ARP_MAX_ADDR_LEN];
-
-		if (mdb_vread(&arl, sizeof (arl), (uintptr_t)ar->ar_arl) == -1)
-			return;
-		retv = mdb_snprintf(buf, nbytes, "ARP %s ", arl.arl_name);
-		if (retv >= nbytes || !addmac)
-			return;
-		if (mdb_vread(&ap, sizeof (ap), (uintptr_t)arl.arl_phy) == -1)
-			return;
-		alen = ap.ap_hw_addrlen;
-		if (ap.ap_hw_addr == NULL || alen == 0 ||
-		    alen > sizeof (macaddr))
-			return;
-		if (mdb_vread(macaddr, alen, (uintptr_t)ap.ap_hw_addr) == -1)
-			return;
-		mdb_mac_addr(macaddr, alen, buf + retv, nbytes - retv);
-	}
-}
-
-/* ARGSUSED2 */
-static int
-ar_cb(uintptr_t addr, const void *arptr, void *dummy)
-{
-	const ar_t *ar = arptr;
-	char ardesc[sizeof ("ARP  ") + LIFNAMSIZ];
-
-	ar_describe(ar, ardesc, sizeof (ardesc), B_FALSE);
-	mdb_printf("%?p %?p %?p %s\n", addr, ar->ar_wq, ar->ar_arl, ardesc);
-	return (WALK_NEXT);
-}
-
-/*
- * Print out ARP client structures.
- */
-/* ARGSUSED2 */
-static int
-ar_cmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
-{
-	ar_t ar;
-
-	if (DCMD_HDRSPEC(flags) && !(flags & DCMD_PIPE_OUT)) {
-		mdb_printf("%<u>%?s %?s %?s %s%</u>\n",
-		    "AR", "WQ", "ARL", "TYPE");
-	}
-
-	if (flags & DCMD_ADDRSPEC) {
-		if (mdb_vread(&ar, sizeof (ar), addr) == -1) {
-			mdb_warn("failed to read ar_t at %p", addr);
-			return (DCMD_ERR);
-		}
-		(void) ar_cb(addr, &ar, NULL);
-	} else {
-		if (mdb_walk("ar", ar_cb, NULL) == -1) {
-			mdb_warn("cannot walk ar_t structures");
-			return (DCMD_ERR);
-		}
-	}
-	return (DCMD_OK);
-}
-
-/* ARGSUSED2 */
-static int
-arl_cb(uintptr_t addr, const void *arlptr, void *dummy)
-{
-	const arl_t *arl = arlptr;
-	arlphy_t ap;
-	uchar_t macaddr[ARP_MAX_ADDR_LEN];
-	char macstr[ARP_MAX_ADDR_LEN*3];
-	char flags[4];
-	const char *primstr;
-
-	mdb_printf("%?p  ", addr);
-	if (arl->arl_dlpi_pending == DL_PRIM_INVAL)
-		mdb_printf("%16s", "--");
-	else if ((primstr = mdb_dlpi_prim(arl->arl_dlpi_pending)) != NULL)
-		mdb_printf("%16s", primstr);
-	else
-		mdb_printf("%16x", arl->arl_dlpi_pending);
-
-	if (mdb_vread(&ap, sizeof (ap), (uintptr_t)arl->arl_phy) == -1 ||
-	    ap.ap_hw_addrlen == 0 || ap.ap_hw_addrlen > sizeof (macaddr)) {
-		(void) strcpy(macstr, "--");
-	} else if (mdb_vread(macaddr, ap.ap_hw_addrlen,
-	    (uintptr_t)ap.ap_hw_addr) == -1) {
-		(void) strcpy(macstr, "?");
-	} else {
-		mdb_mac_addr(macaddr, ap.ap_hw_addrlen, macstr,
-		    sizeof (macstr));
-	}
-
-	/* Print both the link-layer state and the NOARP flag */
-	flags[0] = '\0';
-	if (arl->arl_flags & ARL_F_NOARP)
-		(void) strcat(flags, "N");
-	switch (arl->arl_state) {
-	case ARL_S_DOWN:
-		(void) strcat(flags, "d");
-		break;
-	case ARL_S_PENDING:
-		(void) strcat(flags, "P");
-		break;
-	case ARL_S_UP:
-		(void) strcat(flags, "U");
-		break;
-	default:
-		(void) strcat(flags, "?");
-		break;
-	}
-	mdb_printf("  %8d  %-3s  %-9s  %-17s %5d\n",
-	    mdb_mblk_count(arl->arl_dlpi_deferred), flags, arl->arl_name,
-	    macstr, arl_to_stackid((uintptr_t)addr));
-	return (WALK_NEXT);
-}
-
-/*
- * Print out ARP link-layer elements.
- */
-/* ARGSUSED2 */
-static int
-arl_cmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
-{
-	arl_t arl;
-
-	if (DCMD_HDRSPEC(flags) && !(flags & DCMD_PIPE_OUT)) {
-		mdb_printf("%<u>%?s  %16s  %8s  %3s  %9s  %-17s %5s%</u>\n",
-		    "ARL", "DLPI REQ", "DLPI CNT", "FLG", "INTERFACE",
-		    "HWADDR", "STACK");
-	}
-
-	if (flags & DCMD_ADDRSPEC) {
-		if (mdb_vread(&arl, sizeof (arl), addr) == -1) {
-			mdb_warn("failed to read arl_t at %p", addr);
-			return (DCMD_ERR);
-		}
-		(void) arl_cb(addr, &arl, NULL);
-	} else {
-		if (mdb_walk("arl", arl_cb, NULL) == -1) {
-			mdb_warn("cannot walk arl_t structures");
-			return (DCMD_ERR);
-		}
-	}
-	return (DCMD_OK);
-}
-
-/* ARGSUSED2 */
-static int
-ace_cb(uintptr_t addr, const void *aceptr, void *dummy)
-{
-	const ace_t *ace = aceptr;
-	uchar_t macaddr[ARP_MAX_ADDR_LEN];
-	char macstr[ARP_MAX_ADDR_LEN*3];
-	/* The %b format isn't compact enough for long listings */
-	static const char ace_flags[] = "SPDRMLdA ofya";
-	const char *cp;
-	char flags[sizeof (ace_flags)], *fp;
-	int flg;
-	in_addr_t inaddr, mask;
-	char addrstr[sizeof ("255.255.255.255/32")];
-
-	/* Walk the list of flags and produce a string */
-	cp = ace_flags;
-	fp = flags;
-	for (flg = 1; *cp != '\0'; flg <<= 1, cp++) {
-		if ((flg & ace->ace_flags) && *cp != ' ')
-			*fp++ = *cp;
-	}
-	*fp = '\0';
-
-	/* If it's not resolved, then it has no hardware address */
-	if (!(ace->ace_flags & ACE_F_RESOLVED) ||
-	    ace->ace_hw_addr_length == 0 ||
-	    ace->ace_hw_addr_length > sizeof (macaddr)) {
-		(void) strcpy(macstr, "--");
-	} else if (mdb_vread(macaddr, ace->ace_hw_addr_length,
-	    (uintptr_t)ace->ace_hw_addr) == -1) {
-		(void) strcpy(macstr, "?");
-	} else {
-		mdb_mac_addr(macaddr, ace->ace_hw_addr_length, macstr,
-		    sizeof (macstr));
-	}
-
-	/*
-	 * Nothing other than IP uses ARP these days, so we don't try very hard
-	 * here to switch out on ARP protocol type.  (Note that ARP protocol
-	 * types are roughly Ethertypes, but are allocated separately at IANA.)
-	 */
-	if (ace->ace_proto != IP_ARP_PROTO_TYPE) {
-		(void) mdb_snprintf(addrstr, sizeof (addrstr),
-		    "Unknown proto %x", ace->ace_proto);
-	} else if (mdb_vread(&inaddr, sizeof (inaddr),
-	    (uintptr_t)ace->ace_proto_addr) != -1 &&
-	    mdb_vread(&mask, sizeof (mask), (uintptr_t)ace->ace_proto_mask) !=
-	    -1) {
-		/*
-		 * If it's the standard host mask, then print it normally.
-		 * Otherwise, use "/n" notation.
-		 */
-		if (mask == (in_addr_t)~0) {
-			(void) mdb_snprintf(addrstr, sizeof (addrstr), "%I",
-			    inaddr);
-		} else {
-			(void) mdb_snprintf(addrstr, sizeof (addrstr), "%I/%d",
-			    inaddr, mask == 0 ? 0 : 33 - mdb_ffs(mask));
-		}
-	} else {
-		(void) strcpy(addrstr, "?");
-	}
-	mdb_printf("%?p  %-18s  %-8s  %-17s %5d\n", addr, addrstr, flags,
-	    macstr, arl_to_stackid((uintptr_t)ace->ace_arl));
-	return (WALK_NEXT);
-}
-
-/*
- * Print out ARP cache entry (ace_t) elements.
- */
-/* ARGSUSED2 */
-static int
-ace_cmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
-{
-	ace_t ace;
-
-	if (DCMD_HDRSPEC(flags) && !(flags & DCMD_PIPE_OUT)) {
-		mdb_printf("%<u>%?s  %-18s  %-8s  %-17s %5s%</u>\n",
-		    "ACE", "PROTOADDR", "FLAGS", "HWADDR", "STACK");
-	}
-
-	if (flags & DCMD_ADDRSPEC) {
-		if (mdb_vread(&ace, sizeof (ace), addr) == -1) {
-			mdb_warn("failed to read ace_t at %p", addr);
-			return (DCMD_ERR);
-		}
-		(void) ace_cb(addr, &ace, NULL);
-	} else {
-		if (mdb_walk("ace", ace_cb, NULL) == -1) {
-			mdb_warn("cannot walk ace_t structures");
-			return (DCMD_ERR);
-		}
-	}
-	return (DCMD_OK);
-}
 
 /*
  * Print an ARP hardware and protocol address pair; used when printing an ARP
@@ -696,148 +162,25 @@ arphdr_cmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	return (DCMD_OK);
 }
 
-/*
- * Print out an arp command formatted in a reasonable manner.  This implements
- * the type switch used by ARP.
- *
- * It could also dump the data that follows the header (using offset and length
- * in the various structures), but it currently does not.
- */
-/* ARGSUSED2 */
-static int
-arpcmd_cmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
-{
-	arc_t arc;
-	const arp_cmd_tbl *tp;
-	mdb_arg_t subargv;
-
-	if (!(flags & DCMD_ADDRSPEC)) {
-		mdb_warn("address required to print ARP command\n");
-		return (DCMD_ERR);
-	}
-	if (mdb_vread(&arc, sizeof (arc), addr) == -1) {
-		mdb_warn("unable to read arc_t at %p", addr);
-		return (DCMD_ERR);
-	}
-	for (tp = act_list; tp->act_cmd != 0; tp++)
-		if (tp->act_cmd == arc.arc_cmd)
-			break;
-	mdb_printf("%p %s (%s) = ", addr, tp->act_name, tp->act_type);
-	subargv.a_type = MDB_TYPE_STRING;
-	subargv.a_un.a_str = tp->act_type;
-	if (mdb_call_dcmd("print", addr, DCMD_ADDRSPEC, 1, &subargv) == -1)
-		return (DCMD_ERR);
-	else
-		return (DCMD_OK);
-}
-
-static size_t
-mi_osize(const queue_t *q)
-{
-	/*
-	 * The code in common/inet/mi.c allocates an extra word to store the
-	 * size of the allocation.  An mi_o_s is thus a size_t plus an mi_o_s.
-	 */
-	struct mi_block {
-		size_t mi_nbytes;
-		struct mi_o_s mi_o;
-	} m;
-
-	if (mdb_vread(&m, sizeof (m), (uintptr_t)q->q_ptr - sizeof (m)) != -1)
-		return (m.mi_nbytes - sizeof (m));
-
-	return (0);
-}
-
-/*
- * This is called when ::stream is used and an ARP module is seen on the
- * stream.  Determine what sort of ARP usage is involved and show an
- * appropriate message.
- */
-static void
-arp_qinfo(const queue_t *qp, char *buf, size_t nbytes)
-{
-	size_t size = mi_osize(qp);
-	ar_t ar;
-
-	if (size != sizeof (ar_t))
-		return;
-	if (mdb_vread(&ar, sizeof (ar), (uintptr_t)qp->q_ptr) == -1)
-		return;
-	ar_describe(&ar, buf, nbytes, B_TRUE);
-}
-
-static uintptr_t
-arp_rnext(const queue_t *q)
-{
-	size_t size = mi_osize(q);
-	ar_t ar;
-
-	if (size == sizeof (ar_t) && mdb_vread(&ar, sizeof (ar),
-	    (uintptr_t)q->q_ptr) != -1)
-		return ((uintptr_t)ar.ar_rq);
-
-	return (NULL);
-}
-
-static uintptr_t
-arp_wnext(const queue_t *q)
-{
-	size_t size = mi_osize(q);
-	ar_t ar;
-
-	if (size == sizeof (ar_t) && mdb_vread(&ar, sizeof (ar),
-	    (uintptr_t)q->q_ptr) != -1)
-		return ((uintptr_t)ar.ar_wq);
-
-	return (NULL);
-}
-
 static const mdb_dcmd_t dcmds[] = {
-	{ "ar", "?", "display ARP client streams for all stacks",
-	    ar_cmd, NULL },
-	{ "arl", "?", "display ARP link layers for all stacks", arl_cmd, NULL },
-	{ "ace", "?", "display ARP cache entries for all stacks",
-	    ace_cmd, NULL },
 	{ "arphdr", ":", "display an ARP header", arphdr_cmd, NULL },
-	{ "arpcmd", ":", "display an ARP command", arpcmd_cmd, NULL },
 	{ NULL }
 };
 
 /* Note: ar_t walker is in genunix.c and net.c; generic MI walker */
 static const mdb_walker_t walkers[] = {
-	{ "arl", "walk list of arl_t links for all stacks",
-	    arl_walk_init, arl_walk_step, NULL },
-	{ "arl_stack", "walk list of arl_t links",
-	    arl_stack_walk_init, arl_stack_walk_step, NULL },
-	{ "ace", "walk list of ace_t entries for all stacks",
-	    ace_walk_init, ace_walk_step, NULL },
-	{ "ace_stack", "walk list of ace_t entries",
-	    ace_stack_walk_init, ace_stack_walk_step, ace_stack_walk_fini },
-	{ "arp_stacks", "walk all the arp_stack_t",
-	    arp_stacks_walk_init, arp_stacks_walk_step, NULL },
 	{ NULL }
 };
 
-static const mdb_qops_t arp_qops = { arp_qinfo, arp_rnext, arp_wnext };
 static const mdb_modinfo_t modinfo = { MDB_API_VERSION, dcmds, walkers };
 
 const mdb_modinfo_t *
 _mdb_init(void)
 {
-	GElf_Sym sym;
-
-	if (mdb_lookup_by_obj("arp", "winit", &sym) == 0)
-		mdb_qops_install(&arp_qops, (uintptr_t)sym.st_value);
-
 	return (&modinfo);
 }
 
 void
 _mdb_fini(void)
 {
-	GElf_Sym sym;
-
-	if (mdb_lookup_by_obj("arp", "winit", &sym) == 0)
-		mdb_qops_remove(&arp_qops, (uintptr_t)sym.st_value);
 }