diff options
Diffstat (limited to 'usr/src/uts/intel')
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel | 1 | ||||
| -rw-r--r-- | usr/src/uts/intel/amd64/krtld/kobj_reloc.c | 63 | ||||
| -rw-r--r-- | usr/src/uts/intel/av1394/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/uts/intel/hci1394/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/uts/intel/hermon/Makefile | 7 | ||||
| -rw-r--r-- | usr/src/uts/intel/ibmf/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/uts/intel/ml/modstubs.s | 13 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/syscall.c | 23 | ||||
| -rw-r--r-- | usr/src/uts/intel/s1394/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/uts/intel/tavor/Makefile | 6 | ||||
| -rw-r--r-- | usr/src/uts/intel/tnf/Makefile | 89 |
11 files changed, 7 insertions, 206 deletions
diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel index cb668e8a4b..6b6093d555 100644 --- a/usr/src/uts/intel/Makefile.intel +++ b/usr/src/uts/intel/Makefile.intel @@ -340,7 +340,6 @@ DRV_KMODS += tcp DRV_KMODS += tcp6 DRV_KMODS += timerfd DRV_KMODS += tl -DRV_KMODS += tnf DRV_KMODS += tpm DRV_KMODS += trill DRV_KMODS += udp diff --git a/usr/src/uts/intel/amd64/krtld/kobj_reloc.c b/usr/src/uts/intel/amd64/krtld/kobj_reloc.c index 7995c9cf6e..69e0342768 100644 --- a/usr/src/uts/intel/amd64/krtld/kobj_reloc.c +++ b/usr/src/uts/intel/amd64/krtld/kobj_reloc.c @@ -43,49 +43,9 @@ #include <sys/elf.h> #include <sys/kobj.h> #include <sys/kobj_impl.h> -#include <sys/tnf.h> -#include <sys/tnf_probe.h> #include "reloc.h" - -/* - * Probe Discovery - */ - -#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; 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_NOP 0x90 #define SDT_NOPS 5 @@ -96,9 +56,8 @@ sdt_reloc_resolve(struct module *mp, char *symname, uint8_t *instr) int i; /* - * 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. @@ -178,15 +137,13 @@ do_relocate(struct module *mp, char *reltbl, int nreloc, int relocsize, Addr baseaddr) { unsigned long stndx; - unsigned long off; /* can't be register for tnf_reloc_resolve() */ + unsigned long off; register unsigned long reladdr, rend; register unsigned int rtype; unsigned long value; Elf64_Sxword addend; Sym *symref = NULL; int err = 0; - tnf_probe_control_t *probelist = NULL; - tnf_tag_data_t *taglist = NULL; int symnum; reladdr = (unsigned long)reltbl; rend = reladdr + nreloc * relocsize; @@ -265,9 +222,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 + @@ -279,10 +236,7 @@ do_relocate(struct module *mp, char *reltbl, int nreloc, int relocsize, symref->st_name, (uint8_t *)off) == 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, @@ -328,9 +282,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/intel/av1394/Makefile b/usr/src/uts/intel/av1394/Makefile index 347ae0b81a..c2c1050cbe 100644 --- a/usr/src/uts/intel/av1394/Makefile +++ b/usr/src/uts/intel/av1394/Makefile @@ -50,9 +50,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # # Overrides # -DEBUG_DEFS_DBG32 += -DTNF_DEBUG - - # # For now, disable these warnings; maintainers should endeavor diff --git a/usr/src/uts/intel/hci1394/Makefile b/usr/src/uts/intel/hci1394/Makefile index 333f6693eb..c2acfc8125 100644 --- a/usr/src/uts/intel/hci1394/Makefile +++ b/usr/src/uts/intel/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/intel/hermon/Makefile b/usr/src/uts/intel/hermon/Makefile index 58bb4e4d0f..945b6f892b 100644 --- a/usr/src/uts/intel/hermon/Makefile +++ b/usr/src/uts/intel/hermon/Makefile @@ -55,13 +55,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/intel/ibmf/Makefile b/usr/src/uts/intel/ibmf/Makefile index 025b2f656b..494f2940b0 100644 --- a/usr/src/uts/intel/ibmf/Makefile +++ b/usr/src/uts/intel/ibmf/Makefile @@ -52,8 +52,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # Overrides # -#DEBUG_DEFS_DBG32 += -DTNF_DEBUG - # # For now, disable these warnings; maintainers should endeavor # to investigate and remove these for maximum coverage. diff --git a/usr/src/uts/intel/ml/modstubs.s b/usr/src/uts/intel/ml/modstubs.s index 911798d5ef..0994573bd7 100644 --- a/usr/src/uts/intel/ml/modstubs.s +++ b/usr/src/uts/intel/ml/modstubs.s @@ -937,19 +937,6 @@ fcnname/**/_info: \ #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_struct_tag_1, nomod_zero); - NO_UNLOAD_STUB(tnf, tnf_allocate, nomod_zero); - END_MODULE(tnf); -#endif - -/* * Stubs for i86hvm bootstraping */ #ifndef HVM_BOOTSTRAP diff --git a/usr/src/uts/intel/os/syscall.c b/usr/src/uts/intel/os/syscall.c index 1fc429661c..4af0a00e4e 100644 --- a/usr/src/uts/intel/os/syscall.c +++ b/usr/src/uts/intel/os/syscall.c @@ -54,8 +54,6 @@ #include <c2/audit.h> #include <sys/modctl.h> #include <sys/aio_impl.h> -#include <sys/tnf.h> -#include <sys/tnf_probe.h> #include <sys/copyops.h> #include <sys/priv.h> #include <sys/msacct.h> @@ -369,16 +367,6 @@ pre_syscall() } } -#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; @@ -700,17 +688,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/intel/s1394/Makefile b/usr/src/uts/intel/s1394/Makefile index 6368cd6b7b..fcc567d0bf 100644 --- a/usr/src/uts/intel/s1394/Makefile +++ b/usr/src/uts/intel/s1394/Makefile @@ -61,9 +61,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/intel/tavor/Makefile b/usr/src/uts/intel/tavor/Makefile index 73f9d65557..3c71a584de 100644 --- a/usr/src/uts/intel/tavor/Makefile +++ b/usr/src/uts/intel/tavor/Makefile @@ -55,12 +55,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/intel/tnf/Makefile b/usr/src/uts/intel/tnf/Makefile deleted file mode 100644 index fcc0fe5dbc..0000000000 --- a/usr/src/uts/intel/tnf/Makefile +++ /dev/null @@ -1,89 +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/intel/tnf/Makefile -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# Copyright (c) 2018, Joyent, Inc. - -# -# tnf (kernel trace driver) Makefile -# -# intel 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)/intel/Makefile.intel - -# -# Define targets -# -ALL_TARGET = $(BINARY) $(SRC_CONFILE) -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) - -# -# 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) - -# needs work -$(OBJS_DIR)/tnf_writer.o := SMOFF += all_func_returns - -# -# 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)/intel/Makefile.targ |