From owner-svn-src-head@freebsd.org Tue Apr 24 01:06:21 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 047D2FB02E2; Tue, 24 Apr 2018 01:06:21 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9F6CF7C226; Tue, 24 Apr 2018 01:06:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98AC2413F; Tue, 24 Apr 2018 01:06:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3O16K3X046621; Tue, 24 Apr 2018 01:06:20 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3O16KY3046619; Tue, 24 Apr 2018 01:06:20 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201804240106.w3O16KY3046619@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 24 Apr 2018 01:06:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332901 - in head/sys: cddl/dev/dtmalloc kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: cddl/dev/dtmalloc kern X-SVN-Commit-Revision: 332901 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Apr 2018 01:06:21 -0000 Author: mjg Date: Tue Apr 24 01:06:20 2018 New Revision: 332901 URL: https://svnweb.freebsd.org/changeset/base/332901 Log: dtrace: depessimize dtmalloc when dtrace is active Each malloc/free was testing dtrace_malloc_enabled and forcing extra reads from the malloc type struct to see if perhaps a dtmalloc probe was on. Treat it like lockstat and sdt: have a global bolean. Modified: head/sys/cddl/dev/dtmalloc/dtmalloc.c head/sys/kern/kern_malloc.c Modified: head/sys/cddl/dev/dtmalloc/dtmalloc.c ============================================================================== --- head/sys/cddl/dev/dtmalloc/dtmalloc.c Tue Apr 24 01:04:10 2018 (r332900) +++ head/sys/cddl/dev/dtmalloc/dtmalloc.c Tue Apr 24 01:06:20 2018 (r332901) @@ -36,6 +36,9 @@ #include #include +extern bool dtrace_malloc_enabled; +static uint32_t dtrace_malloc_enabled_count; + static d_open_t dtmalloc_open; static int dtmalloc_unload(void); static void dtmalloc_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *); @@ -152,6 +155,9 @@ dtmalloc_enable(void *arg, dtrace_id_t id, void *parg) { uint32_t *p = parg; *p = id; + dtrace_malloc_enabled_count++; + if (dtrace_malloc_enabled_count == 1) + dtrace_malloc_enabled = true; } static void @@ -159,6 +165,9 @@ dtmalloc_disable(void *arg, dtrace_id_t id, void *parg { uint32_t *p = parg; *p = 0; + dtrace_malloc_enabled_count--; + if (dtrace_malloc_enabled_count == 0) + dtrace_malloc_enabled = false; } static void Modified: head/sys/kern/kern_malloc.c ============================================================================== --- head/sys/kern/kern_malloc.c Tue Apr 24 01:04:10 2018 (r332900) +++ head/sys/kern/kern_malloc.c Tue Apr 24 01:06:20 2018 (r332901) @@ -93,7 +93,8 @@ __FBSDID("$FreeBSD$"); #ifdef KDTRACE_HOOKS #include -dtrace_malloc_probe_func_t dtrace_malloc_probe; +bool __read_frequently dtrace_malloc_enabled; +dtrace_malloc_probe_func_t __read_mostly dtrace_malloc_probe; #endif #if defined(INVARIANTS) || defined(MALLOC_MAKE_FAILURES) || \ @@ -376,7 +377,7 @@ malloc_type_zone_allocated(struct malloc_type *mtp, un mtsp->mts_size |= 1 << zindx; #ifdef KDTRACE_HOOKS - if (dtrace_malloc_probe != NULL) { + if (__predict_false(dtrace_malloc_enabled)) { uint32_t probe_id = mtip->mti_probes[DTMALLOC_PROBE_MALLOC]; if (probe_id != 0) (dtrace_malloc_probe)(probe_id, @@ -415,7 +416,7 @@ malloc_type_freed(struct malloc_type *mtp, unsigned lo mtsp->mts_numfrees++; #ifdef KDTRACE_HOOKS - if (dtrace_malloc_probe != NULL) { + if (__predict_false(dtrace_malloc_enabled)) { uint32_t probe_id = mtip->mti_probes[DTMALLOC_PROBE_FREE]; if (probe_id != 0) (dtrace_malloc_probe)(probe_id,