From nobody Thu Jan 12 15:06:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nt7Dw5dZmz2r5hM; Thu, 12 Jan 2023 15:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nt7Dw57NMz3QSj; Thu, 12 Jan 2023 15:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673536016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h1rR3GDbAlpFkotuAe8IzfshL/pRCIE2s9E9UTaMEDg=; b=qb+0pzmh5Pk/Ou0eAuChoY72XR4b1W0tIF2IELjnECl/FkgJt+JwJWjyiDb1uH6TmQLRs/ 7oUq13NTmbLquTx+QEg+WOHyaYOVRlK4JLn4ydjD1RAoGfNW+QJM4uC8hx4cYvSbn2J3Ll AmRZ3W31SQljlHgsFFd+DvT/nUkPw7mhdQlR/rwf71ldU59opnfQ2bBkVZRZGLYbYQN+Bx GKQSobgfdSaVkV1bQ6yqccaorx7pk8tx7ECMnsf5qDhK0XRMNPwXx3RY+usvud1e8GW1EN AcFfwCSC92NSphka5EyCu5fwmAyD4q2ZQxCt4ihxrLp8EM/mlvRyyIGnRru4Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673536016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h1rR3GDbAlpFkotuAe8IzfshL/pRCIE2s9E9UTaMEDg=; b=YaQS/LKBLV42BZ7kzCZaeAE9qiRB6IsH2epUD+sud9x+dyv4zxO+mcYPRksn8mbKQzKkz0 Xf5HuHamqcs9TWwp3P4u+Tx6fJg32YPbw5GDyPyUSc5Wm9+J4IX4TbXyYZaKBBq0KjZtOT 9eV0y1Ueva9fhRwIImWoITyzQHWUR9el7cj1RH3y5d4A4jjmTjPnmM8uKpuJMeaEJwqXvU jco3aGsjGcjbq/zmko3ehB2pm8PdX7GxFKVSRuy9wWkq7gYToNGDIL+WeMurRUy+Fv8cve WDnYLNnjCm9dgRe11viaR/AYupi6aGjfJJ1xiZpY+vL1sii+fm/L3Y6Me9+3xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673536016; a=rsa-sha256; cv=none; b=v+g4iv1QlMfPaQv60qn7ZQvsz+timPP8MCXjk0yNg657RxqfEcnpsi66FykNkm/DmF747r /4ieZoz/Z1LATgJfq8OusF3+iOXqlACdPuR+FCmFFsyRq9gzIOtmYeqQoY6FAcYzzwxYkl vNV8nO9DmPXWS6DfQPAysqT1JdF+55P/u+uOTRas5b3D0ifvXFQNUvVuJNXuf78jvBdlFF fp/m5SWsc2rp+uvoi8D6ypayNiHhDnMzAO+4Mj2PJQzVQD00TME4BTv62LZ2lo3Y2s8GRn /qnIAg8GBPDLV3UddkEmSNralWjBcHn/p93AeRqMsUB1VNzip3pQTZl3NDZCog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nt7Dw4C0yzX4m; Thu, 12 Jan 2023 15:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30CF6uLr036609; Thu, 12 Jan 2023 15:06:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30CF6uBL036607; Thu, 12 Jan 2023 15:06:56 GMT (envelope-from git) Date: Thu, 12 Jan 2023 15:06:56 GMT Message-Id: <202301121506.30CF6uBL036607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 36a9ce874b59 - main - dtrace: correct the aframes value for fbt provider List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36a9ce874b5988dc8615a4b1b3fb41eb9e06051d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=36a9ce874b5988dc8615a4b1b3fb41eb9e06051d commit 36a9ce874b5988dc8615a4b1b3fb41eb9e06051d Author: Mitchell Horne AuthorDate: 2023-01-11 18:06:24 +0000 Commit: Mitchell Horne CommitDate: 2023-01-12 15:06:07 +0000 dtrace: correct the aframes value for fbt provider Set the number of artificial frames to 5: 1. cpu_exception_handler_supervisor() 2. do_trap_supervisor() 3. dtrace_invop_start() 4. dtrace_invop() 5. fbt_invop() Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37663 --- sys/cddl/dev/fbt/riscv/fbt_isa.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/cddl/dev/fbt/riscv/fbt_isa.c b/sys/cddl/dev/fbt/riscv/fbt_isa.c index a67e83811d9e..baf268028988 100644 --- a/sys/cddl/dev/fbt/riscv/fbt_isa.c +++ b/sys/cddl/dev/fbt/riscv/fbt_isa.c @@ -45,6 +45,7 @@ #define FBT_PATCHVAL MATCH_EBREAK #define FBT_ENTRY "entry" #define FBT_RETURN "return" +#define FBT_AFRAMES 5 int fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t rval) @@ -196,7 +197,7 @@ fbt_provide_module_function(linker_file_t lf, int symindx, fbt = malloc(sizeof (fbt_probe_t), M_FBT, M_WAITOK | M_ZERO); fbt->fbtp_name = name; fbt->fbtp_id = dtrace_probe_create(fbt_id, modname, - name, FBT_ENTRY, 3, fbt); + name, FBT_ENTRY, FBT_AFRAMES, fbt); fbt->fbtp_patchpoint = instr; fbt->fbtp_ctl = lf; fbt->fbtp_loadcnt = lf->loadcnt; @@ -239,7 +240,7 @@ again: fbt->fbtp_name = name; if (retfbt == NULL) { fbt->fbtp_id = dtrace_probe_create(fbt_id, modname, - name, FBT_RETURN, 3, fbt); + name, FBT_RETURN, FBT_AFRAMES, fbt); } else { retfbt->fbtp_probenext = fbt; fbt->fbtp_id = retfbt->fbtp_id;