6595449 IP streams plumbing simpification

6604040 ASSERT fp->timer_mp == 0L panic in sctp_common.c, line: 1876
6606989 panic in ip_rput_forward for multicast router
6606990 assertion failed: th_trace->th_refcnt == 0
6608966 Backport to onnv: 6440004 Get rid of UDP's perimeter mechanism in favor of locks.

6 files changed, 107 insertions, 76 deletions

diff --git a/usr/src/uts/sparc/arp/arp.global-objs.debug64 b/usr/src/uts/sparc/arp/arp.global-objs.debug64
index ac7f04c356..c0e5d9e9da 100644
--- a/usr/src/uts/sparc/arp/arp.global-objs.debug64
+++ b/usr/src/uts/sparc/arp/arp.global-objs.debug64
@@ -26,17 +26,17 @@
 
 ar_cmd_tbl
 ar_m_tbl
-arp_netinfo
-arp_param_arr
+arp_mod_info
 arpinfo
+arprinit
+arpwinit
+arp_param_arr
+arp_netinfo
 cb_inet_devops
 fsw
 inet_dev_info
 inet_devops
-info
 modldrv
 modlinkage
 modlstrmod
 netdev_privs
-rinit
-winit
diff --git a/usr/src/uts/sparc/icmp/icmp.global-objs.debug64 b/usr/src/uts/sparc/icmp/icmp.global-objs.debug64
index e63dd0ec2e..ba041c7e17 100644
--- a/usr/src/uts/sparc/icmp/icmp.global-objs.debug64
+++ b/usr/src/uts/sparc/icmp/icmp.global-objs.debug64
@@ -24,24 +24,11 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 
-ICMP6_MAJ
 cb_inet_devops
 fsw
-icmp_g_t_info_ack
-icmp_max_optsize
-icmp_opt_arr
-icmp_opt_obj
-icmp_param_arr
-icmp_valid_levels_arr
-icmpinfo
 inet_dev_info
 inet_devops
-info
 modldrv
 modlinkage
 modlstrmod
 netdev_privs
-rinit
-sin6_null
-sin_null
-winit
diff --git a/usr/src/uts/sparc/ip/ip.global-objs.debug64 b/usr/src/uts/sparc/ip/ip.global-objs.debug64
index 1ad0df0982..f74a6e46b5 100644
--- a/usr/src/uts/sparc/ip/ip.global-objs.debug64
+++ b/usr/src/uts/sparc/ip/ip.global-objs.debug64
@@ -25,11 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 
 IP_MAJ
-SCTP6_MAJ
-SCTP_MAJ
-TCP6_MAJ
-TCP_MAJ
-UDP6_MAJ
 cb_inet_devops
 cl_inet_bind
 cl_inet_connect
@@ -52,6 +47,10 @@ do_tcp_direct_sockfs
 do_tcp_fusion
 do_tcpzcopy
 dohwcksum
+dummy_mod_info
+dummymodinfo
+dummyrmodinit
+dummywmodinit
 eventq_queue_in
 eventq_queue_nic
 eventq_queue_out
@@ -64,7 +63,19 @@ gcgrp6_hash
 gcgrp_hash_size
 gcgrp_lock
 icmp_frag_size_table
+icmp_g_t_info_ack
 icmp_ipha
+icmp_max_optsize
+icmp_mod_info
+icmp_opt_arr
+icmp_opt_obj
+icmp_param_arr
+icmp_valid_levels_arr
+icmpinfov4
+icmpinfov6
+icmprinitv4
+icmprinitv6
+icmpwinit
 ill_no_arena
 ill_null
 inet_dev_info
@@ -89,6 +100,7 @@ ip_aron_template
 ip_aru_template
 ip_cache_table_size
 ip_cgtp_filter_rev
+ip_conn_cache
 ip_debug
 ip_g_all_ones
 ip_input_proc
@@ -131,22 +143,22 @@ ip_thread_list
 ip_thread_rwlock
 ip_wput_frag_mdt_min
 ipcl_bind_fanout_size
-ipcl_conn_cache
 ipcl_conn_hash_maxsize
 ipcl_conn_hash_memfactor
 ipcl_conn_hash_size
 ipcl_debug_level
 ipcl_raw_fanout_size
-ipcl_tcpconn_cache
 ipcl_udp_fanout_size
 ipclassifier_version
 ipif_loopback_name
 ipif_nv_tbl
 ipif_zero
-ipinfo
+ipinfov4
+ipinfov6
 iplrinit
 iplwinit
-iprinit
+iprinitv4
+iprinitv6
 ipsec_action_cache
 ipsec_hdr_pullup_needed
 ipsec_info_cache
@@ -169,7 +181,8 @@ ipv6_loopback
 ipv6_solicited_node_mcast
 ipv6_unspecified_group
 ipv6info
-ipwinit
+ipwinitv4
+ipwinitv6
 ire_cache
 ire_gw_secattr_cache
 ire_idle_cutoff_interval
@@ -198,10 +211,10 @@ netmasks
 prov_update_handle
 radix_mask_cache
 radix_node_cache
+rawip_conn_cache
 recvq_call
 recvq_loop_cnt
 req_arr
-rinit_ipv6
 rn_mkfreelist
 rn_ones
 rn_zeros
@@ -210,6 +223,16 @@ rr_max_pkt_cnt_ratio
 rr_min_blank_ratio
 rr_min_pkt_cnt_ratio
 rt_entry_cache
+rts_conn_cache
+rts_g_t_info_ack
+rts_max_optsize
+rts_mod_info
+rts_opt_arr
+rts_opt_obj
+rts_valid_levels_arr
+rtsinfo
+rtsrinit
+rtswinit
 sctp_asconf_default_dispatch
 sctp_asconf_dispatch_tbl
 sctp_conn_cache
@@ -217,6 +240,7 @@ sctp_conn_hash_size
 sctp_kmem_faddr_cache
 sctp_kmem_ftsn_set_cache
 sctp_kmem_set_cache
+sctp_mod_info
 sctp_recvq_tq_task_max
 sctp_recvq_tq_task_min
 sctp_recvq_tq_thr_max
@@ -224,6 +248,9 @@ sctp_recvq_tq_thr_min
 sctp_sin6_null
 sctp_taskq
 sctpdebug
+sctpinfo
+sctprinit
+sctpwinit
 sendq_collision
 sendq_empty
 sendq_loop_cnt
@@ -247,6 +274,7 @@ squeue_writerdrain_ms
 squeue_writerdrain_ns
 tcp_acceptor_rinit
 tcp_acceptor_winit
+tcp_conn_cache
 tcp_conn_hash_size
 tcp_drop_ack_unsent_cnt
 tcp_free_list_max_cnt
@@ -261,8 +289,6 @@ tcp_loopback_rinit
 tcp_max_optsize
 tcp_mdt_chain
 tcp_mdt_smss_threshold
-tcp_mod_rinit
-tcp_mod_winit
 tcp_opt_arr
 tcp_opt_obj
 tcp_random_anon_port
@@ -274,7 +300,8 @@ tcp_random_state
 tcp_randtbl
 tcp_report_header
 tcp_rinfo
-tcp_rinit
+tcp_rinitv4
+tcp_rinitv6
 tcp_sack_info_cache
 tcp_sock_winit
 tcp_squeue_close
@@ -289,25 +316,26 @@ tcp_valid_levels_arr
 tcp_version
 tcp_winfo
 tcp_winit
-tcpinfo
+tcpinfov4
+tcpinfov6
 tsol_strict_error
 udp_bind_fanout_size
-udp_cache
-udp_count
+udp_conn_cache
 udp_g_t_info_ack_ipv4
 udp_g_t_info_ack_ipv6
-udp_info
+udp_lrinit
+udp_lwinit
 udp_max_optsize
+udp_mod_info
 udp_opt_arr
 udp_opt_obj
 udp_param_arr
 udp_random_anon_port
-udp_rinit
-udp_snmp_rinit
-udp_snmp_winit
+udp_rinitv4
+udp_rinitv6
 udp_valid_levels_arr
 udp_version
 udp_winit
-udpinfo
-winit_ipv6
+udpinfov4
+udpinfov6
 zero_info
diff --git a/usr/src/uts/sparc/ip/ip.global-objs.obj64 b/usr/src/uts/sparc/ip/ip.global-objs.obj64
index 172ad0f370..1ff919b3bd 100644
--- a/usr/src/uts/sparc/ip/ip.global-objs.obj64
+++ b/usr/src/uts/sparc/ip/ip.global-objs.obj64
@@ -25,11 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 
 IP_MAJ
-SCTP6_MAJ
-SCTP_MAJ
-TCP6_MAJ
-TCP_MAJ
-UDP6_MAJ
 cb_inet_devops
 cl_inet_bind
 cl_inet_connect
@@ -52,6 +47,10 @@ do_tcp_direct_sockfs
 do_tcp_fusion
 do_tcpzcopy
 dohwcksum
+dummy_mod_info
+dummymodinfo
+dummyrmodinit
+dummywmodinit
 eventq_queue_in
 eventq_queue_nic
 eventq_queue_out
@@ -64,7 +63,19 @@ gcgrp6_hash
 gcgrp_hash_size
 gcgrp_lock
 icmp_frag_size_table
+icmp_g_t_info_ack
 icmp_ipha
+icmp_max_optsize
+icmp_mod_info
+icmp_opt_arr
+icmp_opt_obj
+icmp_param_arr
+icmp_valid_levels_arr
+icmpinfov4
+icmpinfov6
+icmprinitv4
+icmprinitv6
+icmpwinit
 ill_no_arena
 ill_null
 inet_dev_info
@@ -89,6 +100,7 @@ ip_aron_template
 ip_aru_template
 ip_cache_table_size
 ip_cgtp_filter_rev
+ip_conn_cache
 ip_debug
 ip_g_all_ones
 ip_input_proc
@@ -131,21 +143,21 @@ ip_thread_list
 ip_thread_rwlock
 ip_wput_frag_mdt_min
 ipcl_bind_fanout_size
-ipcl_conn_cache
 ipcl_conn_hash_maxsize
 ipcl_conn_hash_memfactor
 ipcl_conn_hash_size
 ipcl_raw_fanout_size
-ipcl_tcpconn_cache
 ipcl_udp_fanout_size
 ipclassifier_version
 ipif_loopback_name
 ipif_nv_tbl
 ipif_zero
-ipinfo
+ipinfov4
+ipinfov6
 iplrinit
 iplwinit
-iprinit
+iprinitv4
+iprinitv6
 ipsec_action_cache
 ipsec_hdr_pullup_needed
 ipsec_info_cache
@@ -167,7 +179,8 @@ ipv6_loopback
 ipv6_solicited_node_mcast
 ipv6_unspecified_group
 ipv6info
-ipwinit
+ipwinitv4
+ipwinitv6
 ire_cache
 ire_gw_secattr_cache
 ire_idle_cutoff_interval
@@ -196,8 +209,8 @@ netmasks
 prov_update_handle
 radix_mask_cache
 radix_node_cache
+rawip_conn_cache
 req_arr
-rinit_ipv6
 rn_mkfreelist
 rn_ones
 rn_zeros
@@ -206,6 +219,16 @@ rr_max_pkt_cnt_ratio
 rr_min_blank_ratio
 rr_min_pkt_cnt_ratio
 rt_entry_cache
+rts_conn_cache
+rts_g_t_info_ack
+rts_max_optsize
+rts_mod_info
+rts_opt_arr
+rts_opt_obj
+rts_valid_levels_arr
+rtsinfo
+rtsrinit
+rtswinit
 sctp_asconf_default_dispatch
 sctp_asconf_dispatch_tbl
 sctp_conn_cache
@@ -213,6 +236,7 @@ sctp_conn_hash_size
 sctp_kmem_faddr_cache
 sctp_kmem_ftsn_set_cache
 sctp_kmem_set_cache
+sctp_mod_info
 sctp_recvq_tq_task_max
 sctp_recvq_tq_task_min
 sctp_recvq_tq_thr_max
@@ -220,6 +244,9 @@ sctp_recvq_tq_thr_min
 sctp_sin6_null
 sctp_taskq
 sctpdebug
+sctpinfo
+sctprinit
+sctpwinit
 sin6_null
 sin_null
 sqset_global_list
@@ -236,6 +263,7 @@ squeue_writerdrain_ms
 squeue_writerdrain_ns
 tcp_acceptor_rinit
 tcp_acceptor_winit
+tcp_conn_cache
 tcp_conn_hash_size
 tcp_drop_ack_unsent_cnt
 tcp_free_list_max_cnt
@@ -250,8 +278,6 @@ tcp_loopback_rinit
 tcp_max_optsize
 tcp_mdt_chain
 tcp_mdt_smss_threshold
-tcp_mod_rinit
-tcp_mod_winit
 tcp_opt_arr
 tcp_opt_obj
 tcp_random_anon_port
@@ -263,7 +289,8 @@ tcp_random_state
 tcp_randtbl
 tcp_report_header
 tcp_rinfo
-tcp_rinit
+tcp_rinitv4
+tcp_rinitv6
 tcp_sack_info_cache
 tcp_sock_winit
 tcp_squeue_close
@@ -278,24 +305,26 @@ tcp_valid_levels_arr
 tcp_version
 tcp_winfo
 tcp_winit
-tcpinfo
+tcpinfov4
+tcpinfov6
 tsol_strict_error
 udp_bind_fanout_size
-udp_cache
+udp_conn_cache
 udp_g_t_info_ack_ipv4
 udp_g_t_info_ack_ipv6
-udp_info
+udp_lrinit
+udp_lwinit
 udp_max_optsize
+udp_mod_info
 udp_opt_arr
 udp_opt_obj
 udp_param_arr
 udp_random_anon_port
-udp_rinit
-udp_snmp_rinit
-udp_snmp_winit
+udp_rinitv4
+udp_rinitv6
 udp_valid_levels_arr
 udp_version
 udp_winit
-udpinfo
-winit_ipv6
+udpinfov4
+udpinfov6
 zero_info
diff --git a/usr/src/uts/sparc/rts/Makefile b/usr/src/uts/sparc/rts/Makefile
index 93e6447847..ff635303bc 100644
--- a/usr/src/uts/sparc/rts/Makefile
+++ b/usr/src/uts/sparc/rts/Makefile
@@ -42,7 +42,6 @@ MODULE		= rts
 OBJECTS		= $(RTS_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(RTS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-ROOTLINK	= $(ROOT_STRMOD_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/inet/ip
 
 #
diff --git a/usr/src/uts/sparc/rts/rts.global-objs.debug64 b/usr/src/uts/sparc/rts/rts.global-objs.debug64
index f6d7f5a6ad..4c699f6410 100644
--- a/usr/src/uts/sparc/rts/rts.global-objs.debug64
+++ b/usr/src/uts/sparc/rts/rts.global-objs.debug64
@@ -25,20 +25,8 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 
 cb_inet_devops
-fsw
 inet_dev_info
 inet_devops
-info
-lcl_param_arr
 modldrv
 modlinkage
-modlstrmod
 netdev_privs
-rinit
-rts_g_t_info_ack
-rts_max_optsize
-rts_opt_arr
-rts_opt_obj
-rts_valid_levels_arr
-rtsinfo
-winit