diff options
Diffstat (limited to 'usr/src/uts/sparc')
| -rw-r--r-- | usr/src/uts/sparc/Makefile.sparc | 2 | ||||
| -rw-r--r-- | usr/src/uts/sparc/av1394/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/uts/sparc/hci1394/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/uts/sparc/hermon/Makefile | 6 | ||||
| -rw-r--r-- | usr/src/uts/sparc/ibmf/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/uts/sparc/krtld/kobj_reloc.c | 60 | ||||
| -rw-r--r-- | usr/src/uts/sparc/krtld/mapfile | 3 | ||||
| -rw-r--r-- | usr/src/uts/sparc/ml/modstubs.s | 40 | ||||
| -rw-r--r-- | usr/src/uts/sparc/os/syscall.c | 23 | ||||
| -rw-r--r-- | usr/src/uts/sparc/s1394/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/uts/sparc/tavor/Makefile | 6 | ||||
| -rw-r--r-- | usr/src/uts/sparc/tnf/Makefile | 90 |
12 files changed, 20 insertions, 220 deletions
diff --git a/usr/src/uts/sparc/Makefile.sparc b/usr/src/uts/sparc/Makefile.sparc index e0c41589da..b35e264e71 100644 --- a/usr/src/uts/sparc/Makefile.sparc +++ b/usr/src/uts/sparc/Makefile.sparc @@ -211,7 +211,7 @@ DRV_KMODS += log logindmux mm physmem pm poll pool DRV_KMODS += pseudo ptc ptm pts ptsl ramdisk random rsm rts sad DRV_KMODS += simnet softmac sppp sppptun sy sysevent sysmsg DRV_KMODS += spdsock -DRV_KMODS += tcp tcp6 timerfd tl tnf udp udp6 wc winlock zcons +DRV_KMODS += tcp tcp6 timerfd tl udp udp6 wc winlock zcons DRV_KMODS += ippctl DRV_KMODS += dld DRV_KMODS += ipd diff --git a/usr/src/uts/sparc/av1394/Makefile b/usr/src/uts/sparc/av1394/Makefile index 16a82b6a53..0ebd33419d 100644 --- a/usr/src/uts/sparc/av1394/Makefile +++ b/usr/src/uts/sparc/av1394/Makefile @@ -52,9 +52,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) -DEBUG_DEFS_DBG32 += -DTNF_DEBUG -DEBUG_DEFS_DBG64 += -DTNF_DEBUG - # # For now, disable these warnings; maintainers should endeavor # to investigate and remove these for maximum coverage. diff --git a/usr/src/uts/sparc/hci1394/Makefile b/usr/src/uts/sparc/hci1394/Makefile index 10f40d2a42..b99667787a 100644 --- a/usr/src/uts/sparc/hci1394/Makefile +++ b/usr/src/uts/sparc/hci1394/Makefile @@ -62,9 +62,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) -DEBUG_DEFS_DBG32 += -DTNF_DEBUG -DEBUG_DEFS_DBG64 += -DTNF_DEBUG - # # For now, disable these warnings; maintainers should endeavor # to investigate and remove these for maximum coverage. diff --git a/usr/src/uts/sparc/hermon/Makefile b/usr/src/uts/sparc/hermon/Makefile index d3c9803f39..9751078482 100644 --- a/usr/src/uts/sparc/hermon/Makefile +++ b/usr/src/uts/sparc/hermon/Makefile @@ -60,12 +60,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # # -# Build with no debug TNF probes enabled (by default) -# -#DEBUG_DEFS_DBG32 += -DTNF_DEBUG -#DEBUG_DEFS_DBG64 += -DTNF_DEBUG - -# # For now, disable these warnings; maintainers should endeavor # to investigate and remove these for maximum coverage. # Please do not carry these forward to new Makefiles. diff --git a/usr/src/uts/sparc/ibmf/Makefile b/usr/src/uts/sparc/ibmf/Makefile index e8c713b3ea..2922cd0d1f 100644 --- a/usr/src/uts/sparc/ibmf/Makefile +++ b/usr/src/uts/sparc/ibmf/Makefile @@ -57,7 +57,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # Overrides # -#DEBUG_DEFS_DBG64 += -DTNF_DEBUG ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) diff --git a/usr/src/uts/sparc/krtld/kobj_reloc.c b/usr/src/uts/sparc/krtld/kobj_reloc.c index 2fea631bd1..f8e5d88dea 100644 --- a/usr/src/uts/sparc/krtld/kobj_reloc.c +++ b/usr/src/uts/sparc/krtld/kobj_reloc.c @@ -38,49 +38,10 @@ #include <sys/elf.h> #include <sys/kobj.h> #include <sys/kobj_impl.h> -#include <sys/tnf.h> -#include <sys/tnf_probe.h> #include <sys/sdt.h> #include "krtld/reloc.h" - -/* - * Probe discovery support - */ -#define PROBE_MARKER_SYMBOL "__tnf_probe_version_1" -#define TAG_MARKER_SYMBOL "__tnf_tag_version_1" - -extern int tnf_splice_probes(int, tnf_probe_control_t *, tnf_tag_data_t *); - -/* - * The kernel run-time linker calls this to try to resolve a reference - * it can't otherwise resolve. We see if it's marking a probe control - * block or a probe tag block; if so, we do the resolution and return 0. - * If not, we return 1 to show that we can't resolve it, either. - */ -static int -tnf_reloc_resolve(char *symname, Addr *value_p, - Elf64_Sxword *addend_p, - long offset, - tnf_probe_control_t **probelist, - tnf_tag_data_t **taglist) -{ - if (strcmp(symname, PROBE_MARKER_SYMBOL) == 0) { - *addend_p = 0; - ((tnf_probe_control_t *)offset)->next = *probelist; - *probelist = (tnf_probe_control_t *)offset; - return (0); - } - if (strcmp(symname, TAG_MARKER_SYMBOL) == 0) { - *addend_p = 0; - *value_p = (Addr)*taglist; - *taglist = (tnf_tag_data_t *)offset; - return (0); - } - return (1); -} - #define SDT_RESTORE_MASK 0xc1f80000 #define SDT_RESTORE 0x81e80000 #define SDT_NOP 0x01000000 @@ -95,9 +56,8 @@ sdt_reloc_resolve(struct module *mp, char *symname, uint32_t *instr, long roff) sdt_probedesc_t *sdp; /* - * The "statically defined tracing" (SDT) provider for DTrace uses - * a mechanism similar to TNF, but somewhat simpler. (Surprise, - * surprise.) The SDT mechanism works by replacing calls to the + * The "statically defined tracing" (SDT) provider for DTrace. + * The SDT mechanism works by replacing calls to the * undefined routine __dtrace_probe_[name] with nop instructions. * The relocations are logged, and SDT itself will later patch the * running binary appropriately. @@ -156,8 +116,6 @@ do_relocate(struct module *mp, char *reltbl, int nreloc, int relocsize, Sym *symref; int symnum; int err = 0; - tnf_probe_control_t *probelist = NULL; - tnf_tag_data_t *taglist = NULL; reladdr = (uintptr_t)reltbl; rend = reladdr + nreloc * relocsize; @@ -255,9 +213,9 @@ do_relocate(struct module *mp, char *reltbl, int nreloc, int relocsize, } else { /* * It's global. Allow weak references. If - * the symbol is undefined, give TNF (the - * kernel probes facility) a chance to see - * if it's a probe site, and fix it up if so. + * the symbol is undefined, give dtrace + * a chance to see if it's a probe site, + * and fix it up if so. */ if (symref->st_shndx == SHN_UNDEF && sdt_reloc_resolve(mp, mp->strings + @@ -266,10 +224,7 @@ do_relocate(struct module *mp, char *reltbl, int nreloc, int relocsize, (uintptr_t)mp->text)) == 0) continue; - if (symref->st_shndx == SHN_UNDEF && - tnf_reloc_resolve(mp->strings + - symref->st_name, &symref->st_value, - &addend, off, &probelist, &taglist) != 0) { + if (symref->st_shndx == SHN_UNDEF) { if (ELF_ST_BIND(symref->st_info) != STB_WEAK) { _kobj_printf(ops, @@ -323,9 +278,6 @@ do_relocate(struct module *mp, char *reltbl, int nreloc, int relocsize, if (err) return (-1); - if (tnf_splice_probes(mp->flags & KOBJ_PRIM, probelist, taglist)) - mp->flags |= KOBJ_TNF_PROBE; - return (0); } diff --git a/usr/src/uts/sparc/krtld/mapfile b/usr/src/uts/sparc/krtld/mapfile index 23b7a3a40a..a7ca46e980 100644 --- a/usr/src/uts/sparc/krtld/mapfile +++ b/usr/src/uts/sparc/krtld/mapfile @@ -78,9 +78,6 @@ SYMBOL_SCOPE { kobj_zalloc; kobj_kdi; kobj_linkmaps; - __tnf_tag_list_head; - __tnf_probe_list_head; - tnf_changed_probe_list; boot_cpu_compatible_list; local: *; diff --git a/usr/src/uts/sparc/ml/modstubs.s b/usr/src/uts/sparc/ml/modstubs.s index 07aff93702..815ec5886f 100644 --- a/usr/src/uts/sparc/ml/modstubs.s +++ b/usr/src/uts/sparc/ml/modstubs.s @@ -142,14 +142,14 @@ fcnname/**/_info: \ .word retfcn; /* 1c */ \ .word weak /* 20 */ -/* +/* * The flag MODS_INSTALLED is stored in the stub data and is used to * indicate if a module is installed and initialized. This flag is used * instead of the mod_stub_info->mods_modinfo->mod_installed flag * to minimize the number of pointer de-references for each function * call (and also to avoid possible TLB misses which could be induced * by dereferencing these pointers.) - */ + */ #define STUB_COMMON(module, fcnname, install_fcn, retfcn, weak) \ ENTRY_NP(fcnname); \ @@ -266,7 +266,7 @@ fcnname/**/_info: \ restore SET_SIZE(stubs_common_code) -! this is just a marker for the area of text that contains stubs +! this is just a marker for the area of text that contains stubs .seg ".text" .global stubs_base stubs_base: @@ -274,11 +274,11 @@ stubs_base: /* * WARNING WARNING WARNING!!!!!! - * + * * On the MODULE macro you MUST NOT use any spaces!!! They are * significant to the preprocessor. With ansi c there is a way around this * but for some reason (yet to be investigated) ansi didn't work for other - * reasons! + * reasons! * * When zero is used as the return function, the system will call * panic if the stub can't be resolved. @@ -475,7 +475,7 @@ stubs_base: NO_UNLOAD_STUB(klmmod, lm_shutdown, nomod_zero); NO_UNLOAD_STUB(klmmod, lm_unexport, nomod_zero); NO_UNLOAD_STUB(klmmod, lm_cprresume, nomod_zero); - NO_UNLOAD_STUB(klmmod, lm_cprsuspend, nomod_zero); + NO_UNLOAD_STUB(klmmod, lm_cprsuspend, nomod_zero); NO_UNLOAD_STUB(klmmod, lm_safelock, nomod_zero); NO_UNLOAD_STUB(klmmod, lm_safemap, nomod_zero); NO_UNLOAD_STUB(klmmod, lm_has_sleep, nomod_zero); @@ -483,8 +483,8 @@ stubs_base: NO_UNLOAD_STUB(klmmod, lm_vp_active, nomod_zero); NO_UNLOAD_STUB(klmmod, lm_get_sysid, nomod_zero); NO_UNLOAD_STUB(klmmod, lm_rel_sysid, nomod_zero); - NO_UNLOAD_STUB(klmmod, lm_alloc_sysidt, nomod_minus_one); - NO_UNLOAD_STUB(klmmod, lm_free_sysidt, nomod_zero); + NO_UNLOAD_STUB(klmmod, lm_alloc_sysidt, nomod_minus_one); + NO_UNLOAD_STUB(klmmod, lm_free_sysidt, nomod_zero); NO_UNLOAD_STUB(klmmod, lm_sysidt, nomod_minus_one); END_MODULE(klmmod); #endif @@ -564,7 +564,7 @@ stubs_base: NO_UNLOAD_STUB(procfs, prgetcred, nomod_zero); NO_UNLOAD_STUB(procfs, prgetpriv, nomod_zero); NO_UNLOAD_STUB(procfs, prgetprivsize, nomod_zero); - NO_UNLOAD_STUB(procfs, prgetsecflags, nomod_zero); + NO_UNLOAD_STUB(procfs, prgetsecflags, nomod_zero); NO_UNLOAD_STUB(procfs, prgetstatus, nomod_zero); NO_UNLOAD_STUB(procfs, prgetlwpstatus, nomod_zero); NO_UNLOAD_STUB(procfs, prgetpsinfo, nomod_zero); @@ -699,7 +699,7 @@ stubs_base: WSTUB(FSS, fss_changeproj, nomod_zero); WSTUB(FSS, fss_changepset, nomod_zero); END_MODULE(FSS); -#endif +#endif /* * Stubs for fx_dptbl @@ -766,7 +766,7 @@ stubs_base: END_MODULE(zs); #endif -/* +/* * Stubs for accounting. */ #ifndef SYSACCT_MODULE @@ -961,20 +961,6 @@ stubs_base: #endif /* - * Stubs for kernel probes (tnf module). Not unloadable. - */ -#ifndef TNF_MODULE - MODULE(tnf,drv); - NO_UNLOAD_STUB(tnf, tnf_ref32_1, nomod_zero); - NO_UNLOAD_STUB(tnf, tnf_string_1, nomod_zero); - NO_UNLOAD_STUB(tnf, tnf_opaque_array_1, nomod_zero); - NO_UNLOAD_STUB(tnf, tnf_opaque32_array_1, nomod_zero); - NO_UNLOAD_STUB(tnf, tnf_struct_tag_1, nomod_zero); - NO_UNLOAD_STUB(tnf, tnf_allocate, nomod_zero); - END_MODULE(tnf); -#endif - -/* * Clustering: stubs for bootstrapping. */ #ifndef CL_BOOTSTRAP @@ -992,7 +978,7 @@ stubs_base: /* * Clustering: stubs for cluster infrastructure. - */ + */ #ifndef CL_COMM_MODULE MODULE(cl_comm,misc); NO_UNLOAD_STUB(cl_comm, cladmin, nomod_minus_one); @@ -1026,7 +1012,7 @@ stubs_base: WSTUB(pcihp, pcihp_uninit, nomod_minus_one); WSTUB(pcihp, pcihp_info, nomod_minus_one); WSTUB(pcihp, pcihp_get_cb_ops, nomod_zero); - END_MODULE(pcihp); + END_MODULE(pcihp); #endif /* diff --git a/usr/src/uts/sparc/os/syscall.c b/usr/src/uts/sparc/os/syscall.c index 07928e668c..7c48613b2b 100644 --- a/usr/src/uts/sparc/os/syscall.c +++ b/usr/src/uts/sparc/os/syscall.c @@ -52,8 +52,6 @@ #include <sys/modctl.h> #include <sys/aio_impl.h> #include <c2/audit.h> -#include <sys/tnf.h> -#include <sys/tnf_probe.h> #include <sys/machpcb.h> #include <sys/privregs.h> #include <sys/copyops.h> @@ -474,16 +472,6 @@ pre_syscall(int arg0) } } -#ifndef NPROBE - /* Kernel probe */ - if (tnf_tracing_active) { - TNF_PROBE_1(syscall_start, "syscall thread", /* CSTYLED */, - tnf_sysnum, sysnum, t->t_sysnum); - t->t_post_sys = 1; /* make sure post_syscall runs */ - repost = 1; - } -#endif /* NPROBE */ - #ifdef SYSCALLTRACE if (syscalltrace) { int i; @@ -795,17 +783,6 @@ sig_check: lwp->lwp_errno = 0; /* clear error for next time */ -#ifndef NPROBE - /* Kernel probe */ - if (tnf_tracing_active) { - TNF_PROBE_3(syscall_end, "syscall thread", /* CSTYLED */, - tnf_long, rval1, rval1, - tnf_long, rval2, rval2, - tnf_long, errno, (long)error); - repost = 1; - } -#endif /* NPROBE */ - /* * Set state to LWP_USER here so preempt won't give us a kernel * priority if it occurs after this point. Call CL_TRAPRET() to diff --git a/usr/src/uts/sparc/s1394/Makefile b/usr/src/uts/sparc/s1394/Makefile index e9c197f309..e3ff5c4b33 100644 --- a/usr/src/uts/sparc/s1394/Makefile +++ b/usr/src/uts/sparc/s1394/Makefile @@ -60,9 +60,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) -DEBUG_DEFS_DBG32 += -DTNF_DEBUG -DEBUG_DEFS_DBG64 += -DTNF_DEBUG - # # For now, disable these warnings; maintainers should endeavor # to investigate and remove these for maximum coverage. diff --git a/usr/src/uts/sparc/tavor/Makefile b/usr/src/uts/sparc/tavor/Makefile index b821925977..aae67ab96c 100644 --- a/usr/src/uts/sparc/tavor/Makefile +++ b/usr/src/uts/sparc/tavor/Makefile @@ -60,12 +60,6 @@ ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) # -# Build with no debug TNF probes enabled (by default) -# -#DEBUG_DEFS_DBG32 += -DTNF_DEBUG -#DEBUG_DEFS_DBG64 += -DTNF_DEBUG - -# # For now, disable these warnings; maintainers should endeavor # to investigate and remove these for maximum coverage. # Please do not carry these forward to new Makefiles. diff --git a/usr/src/uts/sparc/tnf/Makefile b/usr/src/uts/sparc/tnf/Makefile deleted file mode 100644 index 44de22b9e4..0000000000 --- a/usr/src/uts/sparc/tnf/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# -# 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 -# -# -# uts/sparc/tnf/Makefile -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# tnf (kernel trace driver) Makefile -# -# 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 = tnf -OBJECTS = $(TNF_OBJS:%=$(OBJS_DIR)/%) -ROOTMODULE = $(USR_DRV_DIR)/$(MODULE) -CONF_SRCDIR = $(UTSBASE)/common/tnf - -# -# Include common rules. -# -include $(UTSBASE)/sparc/Makefile.sparc - -# -# Define targets -# -ALL_TARGET = $(BINARY) $(SRC_CONFILE) -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) - -# -# Overrides. -# -CCMODE = -Xt -CFLAGS += $(CCVERBOSE) - -# -# For now, disable these warnings; maintainers should endeavor -# to investigate and remove these for maximum coverage. -# Please do not carry these forward to new Makefiles. -# - -CERRWARN += -_gcc=-Wno-parentheses -CERRWARN += $(CNOWARN_UNINIT) - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS) - -clobber: $(CLOBBER_DEPS) - -install: $(INSTALL_DEPS) - -# -# Include common targets. -# -include $(UTSBASE)/sparc/Makefile.targ |