From nobody Tue Aug 23 20:46:51 2022 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 4MC1Vg6p0Fz4ZFWZ; Tue, 23 Aug 2022 20:46:51 +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 4MC1Vg6Khzz3Yxw; Tue, 23 Aug 2022 20:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661287611; 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=CA5XLD0SJVQiPNc2wlcbuDHMzj5LwE3FyO4a3zQ40hQ=; b=hYzshT5wEbiIWi2gRLaCFIvPwShRm4ojvDQC/Z16u0HC53CgXLWkeOkxaZyKG3KYcVxC5A jyNZdD1xbDmsb06oAlfrQRK5WV8EOHT1kVD9tdLDFJ1q66zY7PLZYzeSgE4s4y5TuxqICn K61BZj044msPNqt1KQWhcQ5vQSOwZjpnNZWf4XE+q7AgBUERyGFuXzemyYaAA0Ru+y0Fsk OpS42xNFVTi4Vh6wPA1pVlG/VCh4KqkPU5cll4rEGNdk5nzFJ3GNKxHs0V2GJmDY4Dz6tv TViIIz5lsXJPYpz3EDgTUZIcwEh1tj8XZp8bUKzOt8RImBz32MwWVSc/iebq3g== 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 4MC1Vg57TTzjx4; Tue, 23 Aug 2022 20:46:51 +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 27NKkpZD049217; Tue, 23 Aug 2022 20:46:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27NKkpdD049216; Tue, 23 Aug 2022 20:46:51 GMT (envelope-from git) Date: Tue, 23 Aug 2022 20:46:51 GMT Message-Id: <202208232046.27NKkpdD049216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: edf2d935b50a - stable/13 - fbt/x86: Extract arg1 for return probes from the trapframe 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: edf2d935b50abefdf5f1dd9bb3670f74ce0f8698 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661287611; 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=CA5XLD0SJVQiPNc2wlcbuDHMzj5LwE3FyO4a3zQ40hQ=; b=YX9ZTM9325mYaSw7spHCqbWThhbLbO1DhtDudF/SIawTivOSttTfF2eBbjlDlPyez5Zzzb oG0D+Yx5Ov/7i8QTwJj9y7ASHKXqlcCXUE8+BOJEsBjGyzdAcYlyELeL59pgLiLMX+zL3f 15yoe5b6K3/jpHqMAyqa4WbpaNtRou49l3jMnorKnCMjim7sQdHv9qsonbhDY/jFbDeVX8 VoxEl56RuX+fj2JHavmBHl1QZfJZ/+H+NT1HDD2frj4w0mIYpQcMH7hHXdykFX1K3jm6AC uO+p0NDW7epRLa1uNYULBHMlRRlnvjBZh0WFuYJZ9ga8LO2vB3jmn6xUrB1iSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661287611; a=rsa-sha256; cv=none; b=ml9738tQbNq5Pjs9k0YJT7Sg+KqEvZVz5cL3G0CYdG4QViFjktBBPZeqi5Pnv2EBRGZuJm mhuLbI4sg9LJgZcgz4wzD29niGWneVmokWS3SSQYr3k2BY1qrt7ji/mTGBvkzPNbT07NFZ SZhW6ecRudLUfQE/msZzjC8MHucljolsIAgkLppUmwK1MGmry1C/MSQih87GsrlPkjYrBy ehTu92vfkqploU7XIdihAThWdUg0kDSUMbC2ZogvyZmmmv7MnXIASNL3vAPUBZ0K+7ddW0 KDH4avxIpTci6O4Q59ecPP3WOq4JSRAAeymyCD1cN8osAnMIxDB1eoa+3krA7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=edf2d935b50abefdf5f1dd9bb3670f74ce0f8698 commit edf2d935b50abefdf5f1dd9bb3670f74ce0f8698 Author: Mark Johnston AuthorDate: 2022-08-09 20:08:09 +0000 Commit: Mark Johnston CommitDate: 2022-08-23 20:03:02 +0000 fbt/x86: Extract arg1 for return probes from the trapframe dtrace invop handlers have access to the whole trapframe, just use that to extract %rax/%eax for return probes instead of relying on an additional parameter to the handler. No functional change intended. Sponsored by: The FreeBSD Foundation (cherry picked from commit a7aa3d4d758dc60894e7f9c99411a64837fd3c18) --- 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 74de00a3f00b..05ec87ab437f 100644 --- a/sys/cddl/dev/fbt/x86/fbt_isa.c +++ b/sys/cddl/dev/fbt/x86/fbt_isa.c @@ -61,19 +61,21 @@ #define FBT_RETURN "return" int -fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t rval) +fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch __unused) { solaris_cpu_t *cpu; uintptr_t *stack; - uintptr_t arg0, arg1, arg2, arg3, arg4; + uintptr_t arg0, arg1, arg2, arg3, arg4, rval; fbt_probe_t *fbt; int8_t fbtrval; #ifdef __amd64__ stack = (uintptr_t *)frame->tf_rsp; + rval = frame->tf_rax; #else /* Skip hardware-saved registers. */ stack = (uintptr_t *)frame->tf_isp + 3; + rval = frame->tf_eax; #endif cpu = &solaris_cpu[curcpu];