diff options
Diffstat (limited to 'usr/src/uts/sparc')
23 files changed, 260 insertions, 53 deletions
diff --git a/usr/src/uts/sparc/Makefile.sparc b/usr/src/uts/sparc/Makefile.sparc index c5e3581c46..e592b8a8ff 100644 --- a/usr/src/uts/sparc/Makefile.sparc +++ b/usr/src/uts/sparc/Makefile.sparc @@ -250,6 +250,7 @@ DRV_KMODS += nulldriver DRV_KMODS += bridge trill DRV_KMODS += bpf DRV_KMODS += dca +DRV_KMODS += inotify DRV_KMODS += eventfd DRV_KMODS += signalfd DRV_KMODS += ufm @@ -499,6 +500,7 @@ SOCKET_KMODS += socksctp SOCKET_KMODS += socksdp SOCKET_KMODS += sockrds SOCKET_KMODS += ksslf +SOCKET_KMODS += datafilt # # kiconv modules (/kernel/kiconv): diff --git a/usr/src/uts/sparc/bpf/Makefile b/usr/src/uts/sparc/bpf/Makefile index c1dda2a861..b1226d51cb 100644 --- a/usr/src/uts/sparc/bpf/Makefile +++ b/usr/src/uts/sparc/bpf/Makefile @@ -60,7 +60,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # # CFLAGS += $(CCVERBOSE) -LDFLAGS += -dy -Nmisc/mac -Nmisc/dls -Ndrv/ipnet -Nmisc/neti +LDFLAGS += -dy -Nmisc/mac -Nmisc/dls -Ndrv/ipnet -Nmisc/neti -Ndrv/ip INC_PATH += -I$(UTSBASE)/common/io/bpf # diff --git a/usr/src/uts/sparc/chxge/Makefile b/usr/src/uts/sparc/chxge/Makefile index 2a19c82e25..da43a14bee 100644 --- a/usr/src/uts/sparc/chxge/Makefile +++ b/usr/src/uts/sparc/chxge/Makefile @@ -21,6 +21,7 @@ # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2018 Joyent, Inc. # # @@ -69,9 +70,9 @@ CFLAGS += -DSUN_KSTATS -DHOST_PAUSE -DTX_CKSUM_FIX -DTX_THREAD_RECLAIM # CFLAGS += -DCH_DEBUG=1 -DPE_DBGOUT_ENABLED=1 # -# Driver depends on GLD & IP +# Driver depends on GLD, IP, and MAC # -LDFLAGS += -dy -N misc/gld -N drv/ip +LDFLAGS += -dy -N misc/gld -N drv/ip -N misc/mac # Lint flag # diff --git a/usr/src/uts/sparc/datafilt/Makefile b/usr/src/uts/sparc/datafilt/Makefile new file mode 100644 index 0000000000..80969500ef --- /dev/null +++ b/usr/src/uts/sparc/datafilt/Makefile @@ -0,0 +1,73 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2011, OmniTI Computer Consulting, Inc. All rights reserved. +# Copyright 2012, Nexenta Systems, Inc. All rights reserved. +# + +# +# Path to the base of the uts directory tree (usually /usr/src/uts). +# +UTSBASE = ../.. + +# +# Define the module and object file sets. +# +MODULE = datafilt +OBJECTS = $(DATAFILT_OBJS:%=$(OBJS_DIR)/%) +LINTS = $(DATAFILT_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/dld/Makefile b/usr/src/uts/sparc/dld/Makefile index e288e2e357..fe74eb13a5 100644 --- a/usr/src/uts/sparc/dld/Makefile +++ b/usr/src/uts/sparc/dld/Makefile @@ -57,7 +57,6 @@ CFLAGS += $(CCVERBOSE) $(RELEASE_BUILD)CFLAGS += -xinline=auto -xcrossfile $(RELEASE_BUILD)COPTIMIZE = -xO5 LDFLAGS += -dy -N misc/dls -N misc/mac -INC_PATH += -I$(UTSBASE)/common/io/bpf # # For now, disable these lint checks; maintainers should endeavor diff --git a/usr/src/uts/sparc/dls/Makefile b/usr/src/uts/sparc/dls/Makefile index b32db65dd0..6cdef15504 100644 --- a/usr/src/uts/sparc/dls/Makefile +++ b/usr/src/uts/sparc/dls/Makefile @@ -55,7 +55,6 @@ CFLAGS += $(CCVERBOSE) $(RELEASE_BUILD)CFLAGS += -xinline=auto -xcrossfile $(RELEASE_BUILD)COPTIMIZE = -xO5 LDFLAGS += -dy -N misc/mac -INC_PATH += -I$(UTSBASE)/common/io/bpf # # For now, disable these lint checks; maintainers should endeavor diff --git a/usr/src/uts/sparc/icmp/Makefile b/usr/src/uts/sparc/icmp/Makefile index 55c11a1ea0..a35e66abd6 100644 --- a/usr/src/uts/sparc/icmp/Makefile +++ b/usr/src/uts/sparc/icmp/Makefile @@ -22,6 +22,7 @@ # uts/sparc/icmp/Makefile # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2016 Joyent, Inc. # # This makefile drives the production of the icmp IP driver # @@ -62,6 +63,8 @@ ALL_TARGET = $(BINARY) $(SRC_CONFFILE) LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE) +INC_PATH += -I$(UTSBASE)/common/io/bpf + # # lint pass one enforcement # diff --git a/usr/src/uts/sparc/inotify/Makefile b/usr/src/uts/sparc/inotify/Makefile new file mode 100644 index 0000000000..ce2b956955 --- /dev/null +++ b/usr/src/uts/sparc/inotify/Makefile @@ -0,0 +1,70 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2014 Joyent, Inc. All rights reserved. +# + +# +# Path to the base of the uts directory tree (usually /usr/src/uts). +# +UTSBASE = ../.. + +# +# Define the module and object file sets. +# +MODULE = inotify +OBJECTS = $(INOTIFY_OBJS:%=$(OBJS_DIR)/%) +LINTS = $(INOTIFY_OBJS:%.o=$(LINTS_DIR)/%.ln) +ROOTMODULE = $(USR_DRV_DIR)/$(MODULE) +CONF_SRCDIR = $(UTSBASE)/common/io + +# +# Include common rules. +# +include $(UTSBASE)/sparc/Makefile.sparc + +LINTTAGS += -erroff=E_STRUCT_DERIVED_FROM_FLEX_MBR +CERRWARN += -_gcc=-Wno-parentheses +LDFLAGS += -dy -Nfs/specfs + +# +# Define targets +# +ALL_TARGET = $(BINARY) $(SRC_CONFILE) +LINT_TARGET = $(MODULE).lint +INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) + +# +# 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/ip/ip.global-objs.debug64 b/usr/src/uts/sparc/ip/ip.global-objs.debug64 index 6aa8cc87d3..691b7da537 100644 --- a/usr/src/uts/sparc/ip/ip.global-objs.debug64 +++ b/usr/src/uts/sparc/ip/ip.global-objs.debug64 @@ -145,7 +145,6 @@ ip_squeue_create_callback ip_squeue_enter ip_squeue_fanout ip_squeue_flag -ip_squeue_worker_wait ip_thread_data ip_thread_list ip_thread_rwlock @@ -257,8 +256,6 @@ squeue_drain_ms squeue_drain_ns squeue_drain_stack_needed squeue_drain_stack_toodeep -squeue_workerwait_ms -squeue_workerwait_tick tcp_acceptor_rinit tcp_acceptor_winit tcp_conn_cache diff --git a/usr/src/uts/sparc/ip/ip.global-objs.obj64 b/usr/src/uts/sparc/ip/ip.global-objs.obj64 index 7e7d1a2833..624f9984f0 100644 --- a/usr/src/uts/sparc/ip/ip.global-objs.obj64 +++ b/usr/src/uts/sparc/ip/ip.global-objs.obj64 @@ -145,7 +145,6 @@ ip_squeue_create_callback ip_squeue_enter ip_squeue_fanout ip_squeue_flag -ip_squeue_worker_wait ip_thread_data ip_thread_list ip_thread_rwlock @@ -254,8 +253,6 @@ squeue_drain_ms squeue_drain_ns squeue_drain_stack_needed squeue_drain_stack_toodeep -squeue_workerwait_ms -squeue_workerwait_tick tcp_acceptor_rinit tcp_acceptor_winit tcp_conn_cache diff --git a/usr/src/uts/sparc/ipf/Makefile b/usr/src/uts/sparc/ipf/Makefile index 5c9861ee7f..3250d51003 100644 --- a/usr/src/uts/sparc/ipf/Makefile +++ b/usr/src/uts/sparc/ipf/Makefile @@ -21,6 +21,7 @@ # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2018 Joyent, Inc. # # uts/sparc/ipf/Makefile # @@ -64,6 +65,7 @@ CFLAGS += $(CCVERBOSE) CPPFLAGS += -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP CPPFLAGS += -DSUNDDI -DSOLARIS2=$(RELEASE_MINOR) -DIRE_ILL_CN -DUSE_INET6 LDFLAGS += -dy -Ndrv/ip -Nmisc/md5 -Nmisc/neti -Nmisc/hook -Nmisc/kcf +LDFLAGS += -Nmisc/mac INC_PATH += -I$(UTSBASE)/common/inet/ipf diff --git a/usr/src/uts/sparc/ipf/ipf.global-objs.debug64 b/usr/src/uts/sparc/ipf/ipf.global-objs.debug64 index 663613cee3..b42dca618a 100644 --- a/usr/src/uts/sparc/ipf/ipf.global-objs.debug64 +++ b/usr/src/uts/sparc/ipf/ipf.global-objs.debug64 @@ -22,9 +22,25 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# Copyright 2013 Joyent, Inc. All rights reserved +# Copyright 2019 Joyent, Inc. # +cfw_evdrops +cfw_evreports +cfw_ring +cfw_ringcv +cfw_ringend +cfw_ringfull +cfw_ringlock +cfw_ringmask +cfw_ringsize +cfw_ringstart +cfw_timeout_tries +cfw_timeout_wait +hook4_vnd_in +hook4_vnd_out +hook6_vnd_in +hook6_vnd_out fr_availfuncs fr_features fr_objbytes @@ -56,6 +72,7 @@ icmptoicmp6unreach idletime_tab ip6exthdr ipf_cb_ops +ipf_cfwlog_enabled ipf_dev_info ipf_devfiles ipf_kstat_tmp diff --git a/usr/src/uts/sparc/iptun/Makefile b/usr/src/uts/sparc/iptun/Makefile index 3b5ad846bf..b01cdfd7b4 100644 --- a/usr/src/uts/sparc/iptun/Makefile +++ b/usr/src/uts/sparc/iptun/Makefile @@ -54,7 +54,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # CFLAGS += $(CCVERBOSE) LDFLAGS += -dy -Ndrv/dld -Nmisc/dls -Nmisc/mac -Ndrv/ip -INC_PATH += -I$(UTSBASE)/common/io/bpf LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW diff --git a/usr/src/uts/sparc/mac/Makefile b/usr/src/uts/sparc/mac/Makefile index c5fcd87bb7..227702c1c3 100644 --- a/usr/src/uts/sparc/mac/Makefile +++ b/usr/src/uts/sparc/mac/Makefile @@ -60,7 +60,6 @@ CFLAGS += $(CCVERBOSE) $(RELEASE_BUILD)CFLAGS += -xinline=auto -xcrossfile $(RELEASE_BUILD)COPTIMIZE = -xO5 LDFLAGS += -dy -INC_PATH += -I$(UTSBASE)/common/io/bpf LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN diff --git a/usr/src/uts/sparc/mac_ether/Makefile b/usr/src/uts/sparc/mac_ether/Makefile index 3ec066d4c6..b0acd20b30 100644 --- a/usr/src/uts/sparc/mac_ether/Makefile +++ b/usr/src/uts/sparc/mac_ether/Makefile @@ -56,7 +56,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # CFLAGS += $(CCVERBOSE) LDFLAGS += -dy -N misc/mac -INC_PATH += -I$(UTSBASE)/common/io/bpf # # Default build targets. diff --git a/usr/src/uts/sparc/mac_ib/Makefile b/usr/src/uts/sparc/mac_ib/Makefile index 339b88fb6b..7d4250d54f 100644 --- a/usr/src/uts/sparc/mac_ib/Makefile +++ b/usr/src/uts/sparc/mac_ib/Makefile @@ -56,7 +56,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # CFLAGS += $(CCVERBOSE) LDFLAGS += -dy -N misc/mac -INC_PATH += -I$(UTSBASE)/common/io/bpf # # Default build targets. diff --git a/usr/src/uts/sparc/mac_wifi/Makefile b/usr/src/uts/sparc/mac_wifi/Makefile index 66dcd3ac3f..0120e8404b 100644 --- a/usr/src/uts/sparc/mac_wifi/Makefile +++ b/usr/src/uts/sparc/mac_wifi/Makefile @@ -58,7 +58,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # CFLAGS += $(CCVERBOSE) LDFLAGS += -dy -Nmisc/mac -INC_PATH += -I$(UTSBASE)/common/io/bpf # # Default build targets. diff --git a/usr/src/uts/sparc/os/syscall.c b/usr/src/uts/sparc/os/syscall.c index 06e14ea513..d45b515aad 100644 --- a/usr/src/uts/sparc/os/syscall.c +++ b/usr/src/uts/sparc/os/syscall.c @@ -21,6 +21,7 @@ /* * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2019 Joyent, Inc. */ #include <sys/param.h> @@ -191,7 +192,7 @@ get_syscall32_args(klwp_t *lwp, int *argp, int *nargsp) #endif /* - * Save the system call arguments in a safe place. + * Save the system call arguments in a safe place. * lwp->lwp_ap normally points to the out regs in the reg structure. * If the user is going to change the out registers, g1, or the stack, * and might want to get the args (for /proc tracing), it must copy @@ -1004,7 +1005,7 @@ lock_syscall(struct sysent *table, uint_t code) /* * Loadable syscall support. * If needed, load the module, then reserve it by holding a read - * lock for the duration of the call. + * lock for the duration of the call. * Later, if the syscall is not unloadable, it could patch the vector. */ /*ARGSUSED*/ @@ -1026,7 +1027,6 @@ loadable_syscall( * Try to autoload the system call if necessary. */ module_lock = lock_syscall(se, code); - THREAD_KPRI_RELEASE(); /* drop priority given by rw_enter */ /* * we've locked either the loaded syscall or nosys @@ -1040,7 +1040,6 @@ loadable_syscall( rval = syscall_ap(); } - THREAD_KPRI_REQUEST(); /* regain priority from read lock */ rw_exit(module_lock); return (rval); } @@ -1070,7 +1069,7 @@ indir(int code, long a0, long a1, long a2, long a3, long a4) * Handle argument setup, unless already done in pre_syscall(). */ if (callp->sy_narg > 5) { - if (save_syscall_args()) /* move args to LWP array */ + if (save_syscall_args()) /* move args to LWP array */ return ((int64_t)set_errno(EFAULT)); } else if (!lwp->lwp_argsaved) { long *ap; diff --git a/usr/src/uts/sparc/sockpfp/Makefile b/usr/src/uts/sparc/sockpfp/Makefile index 59e17ddc64..21e526a81b 100644 --- a/usr/src/uts/sparc/sockpfp/Makefile +++ b/usr/src/uts/sparc/sockpfp/Makefile @@ -58,7 +58,7 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # CFLAGS += $(CCVERBOSE) -LDFLAGS += -dy -Nfs/sockfs -Nmisc/dls -Nmisc/mac -Ndrv/bpf -Ndrv/ip +LDFLAGS += -dy -Nfs/sockfs -Nmisc/dls -Nmisc/mac -Ndrv/ip INC_PATH += -I$(UTSBASE)/common/inet/sockmods -I$(UTSBASE)/common/io/bpf # diff --git a/usr/src/uts/sparc/spdsock/Makefile b/usr/src/uts/sparc/spdsock/Makefile index 1c0bbcb2d8..8bda6fa848 100644 --- a/usr/src/uts/sparc/spdsock/Makefile +++ b/usr/src/uts/sparc/spdsock/Makefile @@ -61,11 +61,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) LDFLAGS += -dy -Ndrv/ip # -# Overrides -# -INC_PATH += -I$(UTSBASE)/common/io/bpf - -# # lint pass one enforcement # CFLAGS += $(CCVERBOSE) diff --git a/usr/src/uts/sparc/syscall/getcontext.c b/usr/src/uts/sparc/syscall/getcontext.c index c9adb54b86..3c8dbf9190 100644 --- a/usr/src/uts/sparc/syscall/getcontext.c +++ b/usr/src/uts/sparc/syscall/getcontext.c @@ -20,6 +20,9 @@ */ /* + * Copyright 2015 Joyent, Inc. + */ +/* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -110,10 +113,15 @@ savecontext(ucontext_t *ucp, const k_sigset_t *mask) ucp->uc_flags &= ~UC_FPU; ucp->uc_mcontext.gwins = (gwindows_t *)NULL; - /* - * Save signal mask. - */ - sigktou(mask, &ucp->uc_sigmask); + if (mask != NULL) { + /* + * Save signal mask. + */ + sigktou(mask, &ucp->uc_sigmask); + } else { + ucp->uc_flags &= ~UC_SIGMASK; + bzero(&ucp->uc_sigmask, sizeof (ucp->uc_sigmask)); + } } @@ -412,11 +420,16 @@ savecontext32(ucontext32_t *ucp, const k_sigset_t *mask, struct fq32 *dfq) ucp->uc_flags &= ~UC_FPU; ucp->uc_mcontext.gwins = (caddr32_t)NULL; - /* - * Save signal mask (the 32- and 64-bit sigset_t structures are - * identical). - */ - sigktou(mask, (sigset_t *)&ucp->uc_sigmask); + if (mask != NULL) { + /* + * Save signal mask (the 32- and 64-bit sigset_t structures are + * identical). + */ + sigktou(mask, (sigset_t *)&ucp->uc_sigmask); + } else { + ucp->uc_flags &= ~UC_SIGMASK; + bzero(&ucp->uc_sigmask, sizeof (ucp->uc_sigmask)); + } } int diff --git a/usr/src/uts/sparc/v9/ml/lock_prim.s b/usr/src/uts/sparc/v9/ml/lock_prim.s index d1e78869c2..f0fe884ffc 100644 --- a/usr/src/uts/sparc/v9/ml/lock_prim.s +++ b/usr/src/uts/sparc/v9/ml/lock_prim.s @@ -21,10 +21,9 @@ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2019 Joyent, Inc. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #if defined(lint) #include <sys/types.h> #include <sys/thread.h> @@ -260,7 +259,7 @@ ulock_clear(lock_t *lp) /* * lock_set_spl(lp, new_pil, *old_pil_addr) - * Sets pil to new_pil, grabs lp, stores old pil in *old_pil_addr. + * Sets pil to new_pil, grabs lp, stores old pil in *old_pil_addr. */ #if defined(lint) @@ -337,7 +336,7 @@ lock_clear_splx(lock_t *lp, int s) /* * mutex_enter() and mutex_exit(). - * + * * These routines handle the simple cases of mutex_enter() (adaptive * lock, not held) and mutex_exit() (adaptive lock, held, no waiters). * If anything complicated is going on we punt to mutex_vector_enter(). @@ -477,7 +476,7 @@ mutex_owner_running_critical_start: ! If interrupted restart here /* * rw_enter() and rw_exit(). - * + * * These routines handle the simple cases of rw_enter (write-locking an unheld * lock or read-locking a lock that's neither write-locked nor write-wanted) * and rw_exit (no waiters or not the last reader). If anything complicated @@ -502,13 +501,10 @@ rw_exit(krwlock_t *lp) cmp %o1, RW_WRITER ! entering as writer? be,a,pn %icc, 2f ! if so, go do it ... or THREAD_REG, RW_WRITE_LOCKED, %o5 ! delay: %o5 = owner - ld [THREAD_REG + T_KPRI_REQ], %o3 ! begin THREAD_KPRI_REQUEST() ldn [%o0], %o4 ! %o4 = old lock value - inc %o3 ! bump kpri - st %o3, [THREAD_REG + T_KPRI_REQ] ! store new kpri 1: andcc %o4, RW_WRITE_CLAIMED, %g0 ! write-locked or write-wanted? - bz,pt %xcc, 3f ! if so, prepare to block + bz,pt %xcc, 3f ! if so, prepare to block add %o4, RW_READ_LOCK, %o5 ! delay: increment hold count sethi %hi(rw_enter_sleep), %o2 ! load up jump jmp %o2 + %lo(rw_enter_sleep) ! jmp to rw_enter_sleep @@ -552,15 +548,14 @@ rw_exit(krwlock_t *lp) bnz,pn %xcc, 2f ! single reader, no waiters? clr %o1 1: - ld [THREAD_REG + T_KPRI_REQ], %g1 ! begin THREAD_KPRI_RELEASE() srl %o4, RW_HOLD_COUNT_SHIFT, %o3 ! %o3 = hold count (lockstat) casx [%o0], %o4, %o5 ! try to drop lock cmp %o4, %o5 ! did we succeed? bne,pn %xcc, rw_exit_wakeup ! if not, go to C - dec %g1 ! delay: drop kpri + nop ! delay: do nothing .rw_read_exit_lockstat_patch_point: retl - st %g1, [THREAD_REG + T_KPRI_REQ] ! delay: store new kpri + nop ! delay: do nothing 2: andcc %o4, RW_WRITE_LOCKED, %g0 ! are we a writer? bnz,a,pt %xcc, 3f @@ -689,7 +684,7 @@ lockstat_hot_patch(void) * Does not keep statistics on the lock. * * Entry: %l6 - points to mutex - * %l7 - address of call (returns to %l7+8) + * %l7 - address of call (returns to %l7+8) * Uses: %l6, %l5 */ #ifndef lint @@ -700,7 +695,7 @@ lockstat_hot_patch(void) tst %l5 bnz 3f ! lock already held - go spin nop -2: +2: jmp %l7 + 8 ! return membar #LoadLoad ! @@ -716,7 +711,7 @@ lockstat_hot_patch(void) sethi %hi(panicstr) , %l5 ldn [%l5 + %lo(panicstr)], %l5 - tst %l5 + tst %l5 bnz 2b ! after panic, feign success nop b 4b @@ -732,7 +727,7 @@ lockstat_hot_patch(void) * running at high level already. * * Entry: %l6 - points to mutex - * %l7 - address of call (returns to %l7+8) + * %l7 - address of call (returns to %l7+8) * Uses: none */ #ifndef lint diff --git a/usr/src/uts/sparc/zfd/Makefile b/usr/src/uts/sparc/zfd/Makefile new file mode 100644 index 0000000000..ebdba686b4 --- /dev/null +++ b/usr/src/uts/sparc/zfd/Makefile @@ -0,0 +1,50 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2014 Joyent, Inc. All rights reserved. +# +# uts/intel/zfd/Makefile + +UTSBASE = ../.. + +MODULE = zfd +OBJECTS = $(ZFD_OBJS:%=$(OBJS_DIR)/%) +LINTS = $(ZFD_OBJS:%.o=$(LINTS_DIR)/%.ln) +ROOTMODULE = $(USR_DRV_DIR)/$(MODULE) + +include $(UTSBASE)/sparc/Makefile.sparc + +ALL_TARGET = $(BINARY) +LINT_TARGET = $(MODULE).lint +INSTALL_TARGET = $(BINARY) $(ROOTMODULE) + +CFLAGS += $(CCVERBOSE) + +.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 $(UTSBASE)/sparc/Makefile.targ |