From nobody Thu May 11 17:55:58 2023 X-Original-To: dev-commits-src-all@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 4QHKM26Kmrz49Xxk; Thu, 11 May 2023 17:55:58 +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 4QHKM25FMcz3Kqc; Thu, 11 May 2023 17:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683827758; 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=icokoyvmx+9GRXjzvHATO+TvITvhP9ayLbU/mDN6wyg=; b=X7TokrPQczazmWzhhVBy4yLNmvk9SCKiJIFuRkhmIzTROTXrX6ax8I6GLOskJS5YjgJsrJ E1ZCE2yc6f/XEVec8he2VCECgKrITkIW8vKpXZK6UOM9GqwhIgOYUJiKK5xHEF+lai1mav ZCmGDsedj+Kj2iVLmNz5X+1l4ZjYJPD8b2JwV22HfgpUNG7xTA4HxPfk3HjvEHQehf7AFH jqiQU5A4j97a2E/J0QRfVUppOwAYFYCKlxihsUHDZWE5EnhDBee57yfBpOYIS8ilcvULf0 y/GkDTltgL7rjopRHrDG7RKAnL4gKZauQZk0BAsXWlSqAYMsU/dfdAXsa1YoFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683827758; 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=icokoyvmx+9GRXjzvHATO+TvITvhP9ayLbU/mDN6wyg=; b=FuZ98cuSlmelsxysKR3DiT68L39ObivmtqWU6sQlnQXJQJ0lF15RG0ltHCTIZro7n9EbRJ QGlgVd6poe4x/6fyyoyHh2pQbgRgR+5SaWgO87fswfg979GYhKTYMzbO0HeP7ovn36pj9Y n2lQoKKoJsmxF9QSxO0gEnr8vrm4u+ez4knAqUPJ+QQbWO0RttI7aYuDtF2lk4D8MA7Xn8 quIk7bu7zEJ/BmoyRdZn2KohtQy6UHLmB5kpn+NtwSFb0V3I9VozoRXjcYxBusPELNC6c5 lWPSKNiOJq5mUexSmzd3jmuRgR34klPDLE+PCYn41NBKYHB9zG9/ISz7PSHP5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683827758; a=rsa-sha256; cv=none; b=e5HYFzOHbaxPmRoKUFU1fi41V3SXLAf0R8Mk/pKsoYcbpR5oX48Zj4YpzxNY4BfgXll8ka v+JO486/rZwPOBztKt9+sEF8j5a1GlDtIZ/+df0/0NjlO629zgXemvN7Guuex0F5VzqAfu otfQCOSLhqpi6M89J1BDkc2fgSms73KA/tbBU8lr05aDQq1iqRIeLKK0RlMAr9IbaTYNek RoFbTIYlNWHVvwPHCu0ucoO7/fYJ04i6Dd3oQcLH1nT+j636bJ5jpRE4RdVHK8fa23FHQ3 YNk8OQKXPr+JpzgToKlCHTN73B41viBq1jM4m7mID4iT71/kezXYZ1Qs5qugnQ== 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 4QHKM24DZxz12kt; Thu, 11 May 2023 17:55:58 +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 34BHtw0q004732; Thu, 11 May 2023 17:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BHtwo7004731; Thu, 11 May 2023 17:55:58 GMT (envelope-from git) Date: Thu, 11 May 2023 17:55:58 GMT Message-Id: <202305111755.34BHtwo7004731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: 90951695207f - main - fbt/x86: update FBT_AFRAMES to match the trap handlers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90951695207fb974ddc3493049812d5bf2131468 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=90951695207fb974ddc3493049812d5bf2131468 commit 90951695207fb974ddc3493049812d5bf2131468 Author: Chuck Silvers AuthorDate: 2023-05-11 01:22:15 +0000 Commit: Chuck Silvers CommitDate: 2023-05-11 17:50:15 +0000 fbt/x86: update FBT_AFRAMES to match the trap handlers Reviewed by: markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D40054 --- sys/cddl/dev/fbt/x86/fbt_isa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/cddl/dev/fbt/x86/fbt_isa.c b/sys/cddl/dev/fbt/x86/fbt_isa.c index 8c536335791c..e2f98fa47005 100644 --- a/sys/cddl/dev/fbt/x86/fbt_isa.c +++ b/sys/cddl/dev/fbt/x86/fbt_isa.c @@ -57,6 +57,8 @@ #define FBT_PATCHVAL 0xf0 #endif +#define FBT_AFRAMES 2 + int fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch __unused) { @@ -234,7 +236,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; @@ -328,7 +330,7 @@ again: 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;