From nobody Tue Aug 9 23:02:44 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 4M2T9x1Jy1z4Yc8L; Tue, 9 Aug 2022 23:02:45 +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 4M2T9x0l6vz3bct; Tue, 9 Aug 2022 23:02:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660086165; 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=6OPLONgvo0wym0WuZ0PY0iWpLLdVKwRqPDSUy/Kxuco=; b=IE6CIuvQiQLGldr159zpJhQ1/1n5G0xdRWFwbxaXofcWmS0E1qqOF8L5K9MyY66BU55qjK /bciz7cPJYqDzXgFsXCznscKcjPKU1IKglDaKIA/zwG3fUc7aYqhvURCKExx8fHx2Cwzzb bL0gjnlikDZuou88Lqc1tiPb4YWBb5KYXK/hbwaRdyr8+XhSmSl49GsshQnGJdm/1muQ99 zQpGyFn2h6ry46r0Rm37LWHIp2XR+tzvIMW4ae3xvC2m5SbANUpwab0tM2WdmOZiAsL7iv FLsqjBVrb5JY4aNVh93YyHFjaDz9+m31j7WmNMpkDVvPaBrAcBa/IAPFITOgHQ== 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 4M2T9w6tDFzpkR; Tue, 9 Aug 2022 23:02:44 +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 279N2iaK082030; Tue, 9 Aug 2022 23:02:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279N2iVS082029; Tue, 9 Aug 2022 23:02:44 GMT (envelope-from git) Date: Tue, 9 Aug 2022 23:02:44 GMT Message-Id: <202208092302.279N2iVS082029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a7aa3d4d758d - main - 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/main X-Git-Reftype: branch X-Git-Commit: a7aa3d4d758dc60894e7f9c99411a64837fd3c18 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660086165; 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=6OPLONgvo0wym0WuZ0PY0iWpLLdVKwRqPDSUy/Kxuco=; b=HcvtlkVzQkh8SGhAXiLjCiYzEKDrtMNvbXvVO06ekFgZ4W1i0uJ3GDZLPeV0LlYc2ZhBO5 8sAodXpr2dqG0pxsuW9kBTPHOZQ69d/SlWz3am8W+grH+fTZbW3n18Oo9tSB+x/XmzH0Qv ehmmxircnTqp5qUl8e9EWxBTqPN/tPMRMOvRHhvzWzZrO0gwGc0cKJKViptonkgZWum+Mz UEDTAcIGXsN3PbM+l96cGmb9LEel6LsFQUjdU3NSPcouKrQykcwiHhjVFtWuWZT3bnJayK JVDraqO0reJzPb8C0O8Xxu7lJT//greP3b+bRVBDXSJJiVmJpuEKtOaLuFuqXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660086165; a=rsa-sha256; cv=none; b=ZqYNa8/xpRpI0aLVW9cQx9QK2mYBKTdVtovZSeTsTH2N9v/d5HhWofEF1jhrMcpohxhfw2 QaJTJC8t5842bgBpl0SS7taJUp0n1+B/YPj0+Cv/gNCNRbsqpGpWuvO/GtJw/1aVsxgvfy n1mdhr0qNnTYUCeUr3XGNX/2rqmRby+sdms3St2lppDr/ie8dNAW6ZAq5Fad86UK5NjqJH D4u8giFIT+9GSVAhm/Cs3/mVuGnD2E+LGpTCAyuh/1D+VXRiryU5ZwthKs+/h2+k2xC/IL R7x4upKNVYorHw7NmhlNX/zE7W60zHoRc7GAVypkZ91dCRacaltEPVQrKJ5EZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a7aa3d4d758dc60894e7f9c99411a64837fd3c18 commit a7aa3d4d758dc60894e7f9c99411a64837fd3c18 Author: Mark Johnston AuthorDate: 2022-08-09 20:08:09 +0000 Commit: Mark Johnston CommitDate: 2022-08-09 22:34:01 +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. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- 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];