From nobody Mon Jan 23 16:45:20 2023 X-Original-To: dev-commits-src-branches@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 4P0wvN3DtNz30w9C; Mon, 23 Jan 2023 16:45:20 +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 4P0wvN2ffxz3xBZ; Mon, 23 Jan 2023 16:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674492320; 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=J3TYYGCEFmyrhTqHDfjPVCFaxrhxTtpgDYopdM8BXGE=; b=eRaWOLQHFS+ItF5ICtGJnSMcpywSTao2mIc6bdpHPxMFb4TvXeWBfCJnx8WqgoLQKKXGiP UTRQi6C3Amc7tevU/JdeTeMRT+pUqH7SStReXTGY2JyoV+KgjwlUK7oDkOhsJXfRdzSowt pmZLD7fCRqsWa+pRvqgoIVEDLQdif/vmeuanUftW0GlFnkx6ER6P+Ye0zvffF/AqlhCmO6 /Q5FXNjf8Q5ZlH/cPj20FdMwbdx+zAEJk00rZILbzCvIzoH0egvvHRnJHo/2RsvsCQwbr9 HnV3KVajYPNj0ZYv7mon8oktlyRd7YCTwzmubQOGtoQ9CdSwnxdRZV0uPFRHYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674492320; 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=J3TYYGCEFmyrhTqHDfjPVCFaxrhxTtpgDYopdM8BXGE=; b=HGIC7S5Y5gyLUxIbWgfvdZl4EqjUD9IabSERHPTDt4WKTALwEtt7KQzSm3GoxH+4J6WK1L VqHJT7Zbu3qKM7LvU7pncA569ImKX6uP6KoUJgx9O2yFJBApCkqJSTxQSa77j/SyT2+zvb 0izzSZKGKg3bfY/QKjUwy0lAbkKfVuAlkv9n9LLvGOpo8FIsw67TvLFnzXC0uY0UxdH+tP CpBJhWppS5uxwH7cfZaTskrQguyJbMw3APlROucejojwf7nQnRrA+zLSpVfVOhLsoRyvSM J61TLFOcrjlx9Qzis7UGd+HJ0QOk8OxvBLkFuCc5U8ibgYmnt8/NJosnK8Udbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674492320; a=rsa-sha256; cv=none; b=tZOHckYA1nN1n+Wm3Wn7+24vEtEsYQewwd1PWy3u3HzeMRie6SAfNi/zG/Kxu5ZdA7vly6 8aj/ULZOV3BPBeK0+I83BctbOX6GF5lI3gnpo3VXZryhvDnC0khFTVnBEYl3Zc8v1q+0Fp ekY9lTd2vf+aneaZKZhdPb3rsMErM9SCti3r1r3ydekT3Wq9sfEUMqeKY0KTC/e7jNBPxQ XPQ98I63OqXDVcgv5990GSFM3rCGb8IoW4nfQw0gF4gQFTJzXOXFtJhjBV1tG+J9mjsOuQ UVPotqIL8vbAl+zhege8t0fqVY4BoMLzPtSE+gGv5JlQYeY4Ya+Rt1/1YJnS1w== 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 4P0wvN1hSJzbp3; Mon, 23 Jan 2023 16:45:20 +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 30NGjKJs044419; Mon, 23 Jan 2023 16:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NGjKNK044418; Mon, 23 Jan 2023 16:45:20 GMT (envelope-from git) Date: Mon, 23 Jan 2023 16:45:20 GMT Message-Id: <202301231645.30NGjKNK044418@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 68efb54328a5 - stable/13 - dtrace: correct the aframes value for fbt provider List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 68efb54328a5affac0fd68970dbb890ba024dc43 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=68efb54328a5affac0fd68970dbb890ba024dc43 commit 68efb54328a5affac0fd68970dbb890ba024dc43 Author: Mitchell Horne AuthorDate: 2023-01-11 18:06:24 +0000 Commit: Mitchell Horne CommitDate: 2023-01-23 16:42:41 +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 (cherry picked from commit 36a9ce874b5988dc8615a4b1b3fb41eb9e06051d) --- 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;