PSARC 2007/587 Volo -- Low Latency Socket Framework

PSARC 2008/694 Volo Interfaces Amendment
6765829 Integration of project Volo PSARC/2007/587
6644935 mblk cred_t reference counting limits scalability
6693633 TCP receive does not scale because of heavy refcounting of cred structures
4764841 connect/accept is slow on Solaris when compared to Linux
5105708 socket creation retains hold on accessvp
4764836 setsockopt is slow on Solaris when compared to Linux
4772191 socket close(2) is slow on Solaris when compared to Linux

--HG--
rename : usr/src/uts/common/fs/sockfs/socksctp.c => usr/src/uts/common/inet/sockmods/socksctp.c
rename : usr/src/uts/common/fs/sockfs/socksctp.h => usr/src/uts/common/inet/sockmods/socksctp.h
rename : usr/src/uts/common/fs/sockfs/socksctpsubr.c => usr/src/uts/common/inet/sockmods/socksctpsubr.c
rename : usr/src/uts/common/fs/sockfs/socksdp.c => usr/src/uts/common/inet/sockmods/socksdp.c
rename : usr/src/uts/common/fs/sockfs/socksdp.h => usr/src/uts/common/inet/sockmods/socksdp.h

17 files changed, 371 insertions, 67 deletions

diff --git a/usr/src/uts/sparc/Makefile.sparc.shared b/usr/src/uts/sparc/Makefile.sparc.shared
index 80a188f75a..061befa7e3 100644
--- a/usr/src/uts/sparc/Makefile.sparc.shared
+++ b/usr/src/uts/sparc/Makefile.sparc.shared
@@ -385,6 +385,7 @@ MISC_KMODS	+= s1394
 MISC_KMODS	+= hpcsvc pcihp pciehpc pcishpc
 MISC_KMODS	+= rsmops
 MISC_KMODS	+= kcf
+MISC_KMODS	+= ksocket
 MISC_KMODS	+= ibcm
 MISC_KMODS	+= ibdm
 MISC_KMODS	+= ibmf
@@ -486,6 +487,12 @@ MAC_KMODS	+= mac_ib
 DEVNAME_KMODS	+= sdev_nsconfig_mod
 
 #
+# socketmod (kernel/socketmod)
+#
+SOCKET_KMODS	+= socksctp
+SOCKET_KMODS	+= socksdp
+
+#
 #	kiconv modules (/kernel/kiconv):
 #
 KICONV_KMODS	+= kiconv_emea kiconv_ja kiconv_ko kiconv_sc kiconv_tc
diff --git a/usr/src/uts/sparc/icmp/Makefile b/usr/src/uts/sparc/icmp/Makefile
index 5fd067b116..55c11a1ea0 100644
--- a/usr/src/uts/sparc/icmp/Makefile
+++ b/usr/src/uts/sparc/icmp/Makefile
@@ -20,11 +20,9 @@
 #
 #
 # uts/sparc/icmp/Makefile
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	This makefile drives the production of the icmp IP driver
 #
 #	sparc architecture dependent
@@ -42,7 +40,7 @@ MODULE		= icmp
 OBJECTS		= $(ICMP_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(ICMP_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-ROOTLINK	= $(ROOT_STRMOD_DIR)/$(MODULE)
+ROOTLINK	= $(ROOT_STRMOD_DIR)/$(MODULE) $(ROOT_SOCK_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/inet/ip
 
 #
@@ -70,9 +68,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
 CFLAGS		+= $(CCVERBOSE)
 
 #
-#	depends on ip
+#	depends on ip and sockfs
 #
-LDFLAGS		+= -dy -Ndrv/ip
+LDFLAGS		+= -dy -Ndrv/ip -Nfs/sockfs
 
 #
 # For now, disable these lint checks; maintainers should endeavor
@@ -104,7 +102,7 @@ clean.lint:	$(CLEAN_LINT_DEPS)
 
 install:	$(INSTALL_DEPS) $(SISCHECK_DEPS)
 
-$(ROOTLINK):	$(ROOT_STRMOD_DIR) $(ROOTMODULE)
+$(ROOTLINK):	$(ROOT_STRMOD_DIR) $(ROOT_SOCK_DIR) $(ROOTMODULE)
 	-$(RM) $@; ln $(ROOTMODULE) $@
 
 #
diff --git a/usr/src/uts/sparc/icmp/icmp.global-objs.debug64 b/usr/src/uts/sparc/icmp/icmp.global-objs.debug64
index ba041c7e17..eeeeedc77e 100644
--- a/usr/src/uts/sparc/icmp/icmp.global-objs.debug64
+++ b/usr/src/uts/sparc/icmp/icmp.global-objs.debug64
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 cb_inet_devops
 fsw
@@ -30,5 +29,8 @@ inet_dev_info
 inet_devops
 modldrv
 modlinkage
+modlsockmod
 modlstrmod
 netdev_privs
+smodpriv
+smodreg
diff --git a/usr/src/uts/sparc/idm/Makefile b/usr/src/uts/sparc/idm/Makefile
index 6b03fb56df..27535cf198 100644
--- a/usr/src/uts/sparc/idm/Makefile
+++ b/usr/src/uts/sparc/idm/Makefile
@@ -58,7 +58,7 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 #
 DEBUG_FLGS	=
 DEBUG_DEFS	+= $(DEBUG_FLGS)
-LDFLAGS		+= -dy -Nfs/sockfs
+LDFLAGS		+= -dy -Nfs/sockfs -Nmisc/ksocket
 
 #
 #	Default build targets.
diff --git a/usr/src/uts/sparc/ip/ip.global-objs.debug64 b/usr/src/uts/sparc/ip/ip.global-objs.debug64
index f4bcb8ab0c..fabffbc5f5 100644
--- a/usr/src/uts/sparc/ip/ip.global-objs.debug64
+++ b/usr/src/uts/sparc/ip/ip.global-objs.debug64
@@ -64,6 +64,7 @@ gcgrp4_hash
 gcgrp6_hash
 gcgrp_hash_size
 gcgrp_lock
+icmp_fallback_sock_winit
 icmp_frag_size_table
 icmp_g_t_info_ack
 icmp_ipha
@@ -104,6 +105,10 @@ ip_cgtp_filter_rev
 ip_conn_cache
 ip_debug
 ip_g_all_ones
+ip_helper_stream_cache
+ip_helper_stream_info
+ip_helper_stream_rinit
+ip_helper_stream_winit
 ip_ioctl_ftbl
 ip_ire_cleanup_cnt
 ip_ire_cpu_ratio
@@ -140,6 +145,7 @@ ip_squeue_worker_wait
 ip_thread_data
 ip_thread_list
 ip_thread_rwlock
+ip_use_helper_cache
 ip_wput_frag_mdt_min
 ipcl_bind_fanout_size
 ipcl_conn_hash_maxsize
@@ -251,6 +257,10 @@ sendq_loop_cnt
 sin6_null
 sin_null
 skip_sctp_cksum
+sock_rawip_downcalls
+sock_rts_downcalls
+sock_tcp_downcalls
+sock_udp_downcalls
 sqset_global_list
 sqset_global_size
 sqset_lock
@@ -264,6 +274,7 @@ tcp_acceptor_winit
 tcp_conn_cache
 tcp_conn_hash_size
 tcp_drop_ack_unsent_cnt
+tcp_fallback_sock_winit
 tcp_free_list_max_cnt
 tcp_fusion_rcv_unread_min
 tcp_g_kstat
@@ -303,10 +314,12 @@ tcp_winit
 tcp_outbound_squeue_switch
 tcpinfov4
 tcpinfov6
+tli_errs
 tsol_strict_error
 tun_spd_hashsize
 udp_bind_fanout_size
 udp_conn_cache
+udp_fallback_sock_winit
 udp_g_t_info_ack_ipv4
 udp_g_t_info_ack_ipv6
 udp_lrinit
diff --git a/usr/src/uts/sparc/ip/ip.global-objs.obj64 b/usr/src/uts/sparc/ip/ip.global-objs.obj64
index 3866432363..c7fb907f8c 100644
--- a/usr/src/uts/sparc/ip/ip.global-objs.obj64
+++ b/usr/src/uts/sparc/ip/ip.global-objs.obj64
@@ -64,6 +64,7 @@ gcgrp4_hash
 gcgrp6_hash
 gcgrp_hash_size
 gcgrp_lock
+icmp_fallback_sock_winit
 icmp_frag_size_table
 icmp_g_t_info_ack
 icmp_ipha
@@ -104,6 +105,10 @@ ip_cgtp_filter_rev
 ip_conn_cache
 ip_debug
 ip_g_all_ones
+ip_helper_stream_cache
+ip_helper_stream_info
+ip_helper_stream_rinit
+ip_helper_stream_winit
 ip_ioctl_ftbl
 ip_ire_cleanup_cnt
 ip_ire_cpu_ratio
@@ -140,6 +145,7 @@ ip_squeue_worker_wait
 ip_thread_data
 ip_thread_list
 ip_thread_rwlock
+ip_use_helper_cache
 ip_wput_frag_mdt_min
 ipcl_bind_fanout_size
 ipcl_conn_hash_maxsize
@@ -243,6 +249,10 @@ sctprinit
 sctpwinit
 sin6_null
 sin_null
+sock_rawip_downcalls
+sock_rts_downcalls
+sock_tcp_downcalls
+sock_udp_downcalls
 sqset_global_list
 sqset_global_size
 sqset_lock
@@ -256,6 +266,7 @@ tcp_acceptor_winit
 tcp_conn_cache
 tcp_conn_hash_size
 tcp_drop_ack_unsent_cnt
+tcp_fallback_sock_winit
 tcp_free_list_max_cnt
 tcp_fusion_rcv_unread_min
 tcp_g_kstat
@@ -295,10 +306,12 @@ tcp_winit
 tcp_outbound_squeue_switch
 tcpinfov4
 tcpinfov6
+tli_errs
 tsol_strict_error
 tun_spd_hashsize
 udp_bind_fanout_size
 udp_conn_cache
+udp_fallback_sock_winit
 udp_g_t_info_ack_ipv4
 udp_g_t_info_ack_ipv6
 udp_lrinit
diff --git a/usr/src/uts/sparc/iscsi/Makefile b/usr/src/uts/sparc/iscsi/Makefile
index 0e35ba9d0d..437d9b5838 100644
--- a/usr/src/uts/sparc/iscsi/Makefile
+++ b/usr/src/uts/sparc/iscsi/Makefile
@@ -61,7 +61,7 @@ INC_PATH	+= -I$(UTSBASE)/common/io/scsi/adapters/iscsi
 #
 # Note dependancy on misc/scsi.
 #
-LDFLAGS += -dy -N"misc/scsi" -N"fs/sockfs" -N"sys/doorfs" -N"misc/md5"
+LDFLAGS += -dy -N"misc/scsi" -N"fs/sockfs" -N"sys/doorfs" -N"misc/md5" -Nmisc/ksocket
 
 LINTFLAGS += -a -erroff=E_BAD_PTR_CAST_ALIGN -erroff=E_PTRDIFF_OVERFLOW
 LINTFLAGS64 += -a -erroff=E_BAD_PTR_CAST_ALIGN -erroff=E_PTRDIFF_OVERFLOW
diff --git a/usr/src/uts/sparc/iscsit/Makefile b/usr/src/uts/sparc/iscsit/Makefile
index 1df1235747..7ecd8be223 100644
--- a/usr/src/uts/sparc/iscsit/Makefile
+++ b/usr/src/uts/sparc/iscsit/Makefile
@@ -59,7 +59,7 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 #	Overrides and depends_on
 #
 MODSTUBS_DIR	 = $(OBJS_DIR)
-LDFLAGS		+= -dy -Ndrv/stmf -Nmisc/idm -Nfs/sockfs -Nmisc/md5
+LDFLAGS		+= -dy -Ndrv/stmf -Nmisc/idm -Nfs/sockfs -Nmisc/md5 -Nmisc/ksocket
 
 INC_PATH	+= -I$(UTSBASE)/common/io/comstar/port/iscsit
 
diff --git a/usr/src/uts/sparc/ksocket/Makefile b/usr/src/uts/sparc/ksocket/Makefile
new file mode 100644
index 0000000000..287a7cfda6
--- /dev/null
+++ b/usr/src/uts/sparc/ksocket/Makefile
@@ -0,0 +1,84 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
+#
+#	This makefile drives the production of the kernel socket module
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= ksocket
+OBJECTS		= $(KSOCKET_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(KSOCKET_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+
+#
+#	Overrides.
+#
+CFLAGS		+= $(CCVERBOSE)
+LDFLAGS		+= -dy -Nfs/sockfs
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/intel/Makefile.targ
diff --git a/usr/src/uts/sparc/ml/modstubs.s b/usr/src/uts/sparc/ml/modstubs.s
index e315c9857c..e3379799a7 100644
--- a/usr/src/uts/sparc/ml/modstubs.s
+++ b/usr/src/uts/sparc/ml/modstubs.s
@@ -385,7 +385,10 @@ stubs_base:
 	NO_UNLOAD_STUB(sockfs, snf_segmap,  	nomod_einval);
 	NO_UNLOAD_STUB(sockfs, sock_getfasync,  nomod_zero);
 	NO_UNLOAD_STUB(sockfs, nl7c_sendfilev,  nomod_zero);
-	NO_UNLOAD_STUB(sockfs, sostream_direct,	nomod_zero);
+	NO_UNLOAD_STUB(sockfs, sotpi_sototpi,  nomod_zero);
+	NO_UNLOAD_STUB(sockfs, socket_sendmblk,	nomod_zero);
+	NO_UNLOAD_STUB(sockfs, socket_setsockopt,	nomod_zero);
+	NO_UNLOAD_STUB(sockfs, sod_uioa_mblk_done,	nomod_zero);
 	END_MODULE(sockfs);
 #endif
 
@@ -1232,27 +1235,6 @@ stubs_base:
 	END_MODULE(softmac);
 #endif
 
-#ifndef SDPIB_MODULE
-	MODULE(sdpib,drv);
-	STUB(sdpib, sdp_create, nomod_zero);
-	STUB(sdpib, sdp_bind, nomod_einval);
-	STUB(sdpib, sdp_listen, nomod_einval);
-	STUB(sdpib, sdp_connect, nomod_einval);
-	STUB(sdpib, sdp_recv, nomod_einval);
-	STUB(sdpib, sdp_send, nomod_einval);
-	STUB(sdpib, sdp_getpeername, nomod_einval);
-	STUB(sdpib, sdp_getsockname, nomod_einval);
-	STUB(sdpib, sdp_disconnect, nomod_einval);
-	STUB(sdpib, sdp_shutdown, nomod_einval);
-	STUB(sdpib, sdp_get_opt, nomod_einval);
-	STUB(sdpib, sdp_set_opt, nomod_einval);
-	STUB(sdpib, sdp_close, nomod_void);
-	STUB(sdpib, sdp_polldata, nomod_zero);
-	STUB(sdpib, sdp_ioctl, nomod_einval);
-	END_MODULE(sdpib);
-#endif
-
-
 /*
  * Stubs for kssl, the kernel SSL proxy
  */
@@ -1294,6 +1276,35 @@ stubs_base:
 	END_MODULE(ipnet);
 #endif
 
+/*
+ * Stubs for kernel socket, for iscsi
+ */
+#ifndef KSOCKET_MODULE
+	MODULE(ksocket, misc);
+	NO_UNLOAD_STUB(ksocket, ksocket_setsockopt, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_getsockopt, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_getpeername, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_getsockname, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_socket, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_bind, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_listen, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_accept, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_connect, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_recv, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_recvfrom, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_recvmsg, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_send, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_sendto, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_sendmsg, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_ioctl, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_setcallbacks, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_hold, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_rele, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_shutdown, nomod_minus_one);
+	NO_UNLOAD_STUB(ksocket, ksocket_close, nomod_minus_one);
+	END_MODULE(ksocket);
+#endif
+
 ! this is just a marker for the area of text that contains stubs
 	.seg ".text"
 	.global stubs_end
diff --git a/usr/src/uts/sparc/rts/Makefile b/usr/src/uts/sparc/rts/Makefile
index ff635303bc..4078c24237 100644
--- a/usr/src/uts/sparc/rts/Makefile
+++ b/usr/src/uts/sparc/rts/Makefile
@@ -20,11 +20,9 @@
 #
 #
 # uts/sparc/rts/Makefile
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	This makefile drives the production of the rts IP driver
 #
 #	sparc architecture dependent
@@ -42,6 +40,7 @@ MODULE		= rts
 OBJECTS		= $(RTS_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(RTS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+ROOTLINK	= $(ROOT_SOCK_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/inet/ip
 
 #
@@ -69,9 +68,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
 CFLAGS		+= $(CCVERBOSE)
 
 #
-#	depends on tun
+#	depends on ip and sockfs
 #
-LDFLAGS		+= -dy -Ndrv/ip
+LDFLAGS		+= -dy -Ndrv/ip -Nfs/sockfs
 
 #
 # For now, disable these lint checks; maintainers should endeavor
@@ -103,7 +102,7 @@ clean.lint:	$(CLEAN_LINT_DEPS)
 
 install:	$(INSTALL_DEPS) $(SISCHECK_DEPS)
 
-$(ROOTLINK):	$(ROOT_STRMOD_DIR) $(ROOTMODULE)
+$(ROOTLINK):	$(ROOT_STRMOD_DIR) $(ROOT_SOCK_DIR) $(ROOTMODULE)
 	-$(RM) $@; ln $(ROOTMODULE) $@
 
 #
diff --git a/usr/src/uts/sparc/rts/rts.global-objs.debug64 b/usr/src/uts/sparc/rts/rts.global-objs.debug64
index 4c699f6410..75b422acf6 100644
--- a/usr/src/uts/sparc/rts/rts.global-objs.debug64
+++ b/usr/src/uts/sparc/rts/rts.global-objs.debug64
@@ -19,14 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 cb_inet_devops
 inet_dev_info
 inet_devops
 modldrv
 modlinkage
+modlsockmod
 netdev_privs
+smodreg
diff --git a/usr/src/uts/sparc/smbsrv/Makefile b/usr/src/uts/sparc/smbsrv/Makefile
index 71c4cc5398..023d1c1cd5 100644
--- a/usr/src/uts/sparc/smbsrv/Makefile
+++ b/usr/src/uts/sparc/smbsrv/Makefile
@@ -19,11 +19,8 @@
 # CDDL HEADER END
 #
 #
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 #
 #	This makefile drives the production of the cifs server file system
@@ -52,7 +49,8 @@ include $(UTSBASE)/sparc/Makefile.sparc
 #
 #	Module dependencies
 #
-LDFLAGS += -dy -Nfs/sockfs -Ndrv/ip -Nstrmod/rpcmod -Nsys/doorfs -Nmisc/kcf
+LDFLAGS += -dy -Nfs/sockfs -Nmisc/ksocket -Ndrv/ip -Nstrmod/rpcmod -Nsys/doorfs
+LDFLAGS += -Nmisc/kcf
 
 #
 #	Define targets
diff --git a/usr/src/uts/sparc/socksctp/Makefile b/usr/src/uts/sparc/socksctp/Makefile
new file mode 100644
index 0000000000..5acab4cfb1
--- /dev/null
+++ b/usr/src/uts/sparc/socksctp/Makefile
@@ -0,0 +1,96 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
+#
+#	This makefile drives the production of the nca driver 
+#	kernel module.
+#
+#	sparc architecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= socksctp
+OBJECTS		= $(SCTP_SOCK_MOD_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(SCTP_SOCK_MOD_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_SOCK_DIR)/$(MODULE)
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+
+#
+# lint pass one enforcement and OS version
+#
+CFLAGS += $(CCVERBOSE)
+
+LDFLAGS += -dy -Nfs/sockfs -Ndrv/ip
+
+#
+# For now, disable these lint checks; maintainers should endeavor
+# to investigate and remove these for maximum lint coverage.
+# Please do not carry these forward to new Makefiles.
+#
+LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS	+= -erroff=E_PTRDIFF_OVERFLOW
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/socksdp/Makefile b/usr/src/uts/sparc/socksdp/Makefile
new file mode 100644
index 0000000000..6970c44faf
--- /dev/null
+++ b/usr/src/uts/sparc/socksdp/Makefile
@@ -0,0 +1,88 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+
+#
+#	This makefile drives the production of the nca driver 
+#	kernel module.
+#
+#	sparc architecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= socksdp
+OBJECTS		= $(SDP_SOCK_MOD_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(SDP_SOCK_MOD_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_SOCK_DIR)/$(MODULE)
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/sparc/Makefile.sparc
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+
+#
+# lint pass one enforcement and OS version
+#
+CFLAGS += $(CCVERBOSE)
+
+LDFLAGS += -dy -Nfs/sockfs -Ndrv/ip
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sparc/Makefile.targ
diff --git a/usr/src/uts/sparc/tcp/Makefile b/usr/src/uts/sparc/tcp/Makefile
index 192fda758f..7276ecfaeb 100644
--- a/usr/src/uts/sparc/tcp/Makefile
+++ b/usr/src/uts/sparc/tcp/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -21,11 +20,9 @@
 #
 #
 # uts/sparc/tcp/Makefile
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	This makefile drives the production of the tcp driver kernel module.
 #
 #	sparc architecture dependent
@@ -43,7 +40,7 @@ MODULE		= tcp
 OBJECTS		= $(TCP_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(TCP_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-ROOTLINK	= $(ROOT_STRMOD_DIR)/$(MODULE)
+ROOTLINK	= $(ROOT_STRMOD_DIR)/$(MODULE) $(ROOT_SOCK_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/inet/tcp
 
 #
@@ -77,9 +74,9 @@ CFLAGS		+= $(CCVERBOSE)
 CFLAGS		+= -xinline=tcp_set_ws_value,tcp_fill_header
 
 #
-#	depends on ip and md5
+#	depends on ip, md5 and sockfs
 #
-LDFLAGS		+= -dy -Ndrv/ip -Ncrypto/md5
+LDFLAGS		+= -dy -Ndrv/ip -Ncrypto/md5 -Nfs/sockfs
 
 #
 #	Default build targets.
@@ -102,7 +99,7 @@ clean.lint:	$(CLEAN_LINT_DEPS)
 
 install:	$(INSTALL_DEPS)
 
-$(ROOTLINK):	$(ROOT_STRMOD_DIR) $(ROOTMODULE)
+$(ROOTLINK):	$(ROOT_STRMOD_DIR) $(ROOT_SOCK_DIR) $(ROOTMODULE)
 	-$(RM) $@; ln $(ROOTMODULE) $@
 
 #
diff --git a/usr/src/uts/sparc/udp/Makefile b/usr/src/uts/sparc/udp/Makefile
index c0deb87087..07a4435112 100644
--- a/usr/src/uts/sparc/udp/Makefile
+++ b/usr/src/uts/sparc/udp/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -21,11 +20,9 @@
 #
 #
 # uts/sparc/udp/Makefile
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 #	This makefile drives the production of the udp driver kernel module.
 #
 #	sparc architecture dependent
@@ -43,7 +40,7 @@ MODULE		= udp
 OBJECTS		= $(UDP_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(UDP_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
-ROOTLINK	= $(ROOT_STRMOD_DIR)/$(MODULE)
+ROOTLINK	= $(ROOT_STRMOD_DIR)/$(MODULE) $(ROOT_SOCK_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/inet/udp
 
 #
@@ -71,9 +68,9 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
 CFLAGS		+= $(CCVERBOSE)
 
 #
-#	depends on ip
+#	depends on ip and sockfs
 #
-LDFLAGS		+= -dy -Ndrv/ip
+LDFLAGS		+= -dy -Ndrv/ip -Nfs/sockfs
 
 #
 #	Default build targets.
@@ -96,7 +93,7 @@ clean.lint:	$(CLEAN_LINT_DEPS)
 
 install:	$(INSTALL_DEPS)
 
-$(ROOTLINK):	$(ROOT_STRMOD_DIR) $(ROOTMODULE)
+$(ROOTLINK):	$(ROOT_STRMOD_DIR) $(ROOT_SOCK_DIR) $(ROOTMODULE)
 	-$(RM) $@; ln $(ROOTMODULE) $@
 
 #