From nobody Tue Oct 3 17:19:29 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 4S0Ph202Ryz4vlbZ; Tue, 3 Oct 2023 17:19:30 +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 4S0Ph16TfKz4Jtn; Tue, 3 Oct 2023 17:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696353569; 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=uTXw+HT5TUuKJ18eF37WGJUr7M4FR3J9DycOtD9mi1I=; b=J8l2EOGZTrVPKaZVer+ft++cTF6YKdqUJsKaj40ZpnGuI5vTfrJBK6zhg9TPRklrcSRXrl F9sUBZICRSUqqTTj+IbFWx9NyyNX07g3WVrdFyB5MaBZFjWzU1uU/2WxMu5thg1MEOuhC7 ZPt4F3Ub+Uf2LlvzNKCXcmrVr3ELJWLywtDhDnRNsEuZOa10rwWV8wjL0w6ftThmEO2lzj KAl11GAz4+oNXiWMcuYK6rirh221EmaLDZnB+E+AZnE+NMDYMAPz4D40TG33iJ1ZvjoUQv IakdX5pqeHZHP3sDOVZ5hPu6BOB2MjC/TYz2acC2qLob+Kei0SU3NwasHU9yFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696353569; a=rsa-sha256; cv=none; b=P1xFIR038VI4BFUS1CvwxWX8Ak16bkYTdXYDjq7bduwZk6yxQsc7zsErkXyxaU0dHYMqUs 6tLyRWxi/N83ctrUtY/jyN3IKl5iFaGTdwGrl9KRbdM2yncbJ7m+6sKLAQ2hSStGSvYiVR uJyiaFbI32+AttNSf5k5HU3l+G6bHD1dgIDcEPpGefWd06a2uliFCZ35oLQLnQa1e3Dgr7 3UxTc1mpdmHlBn1+wKCOPBoK9B4/XqNTO8J9wszAkhrxuvrdMAQ3qM9GxJ9GkrUEl9hv4Y fYVr+uhM0q1zAiyz9f15XUTiBh96pFaszJP3n0IK6jMlybd0k2/TfAkhHa9F1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696353569; 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=uTXw+HT5TUuKJ18eF37WGJUr7M4FR3J9DycOtD9mi1I=; b=ak2EbdbCIu8qNbL4uYzrOWOWb7p5v8hLPvUM+pwgf0xHFuD8irN0eEv3o2MdcSRiz/MKI5 pYfHGRqgN87lEOpWZ2hcuZ9IXNAjrVGDBP08KR7CClrjbuKsko19lp/fFhKSkNTYvFAIbe EybLnCL62RQRS9/T6v83XLPPow/98CZU8k2d8DadGod3V+OHkGp+jTUnk9QsnLW+50DXyO pM6vVb5FD/BfBKw5YYhfrAfR4J57yQJDFAHSAaTIAO3LWCj9qVTsPuDjbLNd4SsTfhVCUY lLH2k0etTfYlTugw00DpL4WeZcOul/LmEMBBdwQbiZfy0QwLHHs7ao5A9q7ooQ== 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 4S0Ph15QYrz13jF; Tue, 3 Oct 2023 17:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 393HJTAa068787; Tue, 3 Oct 2023 17:19:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393HJTuY068784; Tue, 3 Oct 2023 17:19:29 GMT (envelope-from git) Date: Tue, 3 Oct 2023 17:19:29 GMT Message-Id: <202310031719.393HJTuY068784@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: b4db386f9fa7 - main - dtrace: fix fbt regression for aarch64 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4db386f9fa7be9668aa09d14b0bbd048a7a7e89 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b4db386f9fa7be9668aa09d14b0bbd048a7a7e89 commit b4db386f9fa7be9668aa09d14b0bbd048a7a7e89 Author: Igor Ostapenko AuthorDate: 2023-10-03 16:48:00 +0000 Commit: Mark Johnston CommitDate: 2023-10-03 17:07:41 +0000 dtrace: fix fbt regression for aarch64 fbt computes incorrect instruction position for AArch64 kernel module symbol. The issue is with the for loop, it does an extra increment of instr pointer after the required instruction is found. Hence, a wrong instruction is targeted for patching. Signed-off-by: Igor Ostapenko Fixes: 980746e5cb26 ("fbt: simplify arm64 function-prologue parsing") Reviewed by: markj Pull Request: https://github.com/freebsd/freebsd-src/pull/855 MFC after: 1 week --- sys/cddl/dev/fbt/aarch64/fbt_isa.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c index 4094ea43a9fe..44690b97f77a 100644 --- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c +++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c @@ -90,7 +90,6 @@ fbt_provide_module_function(linker_file_t lf, int symindx, uint32_t *instr, *limit; const char *name; char *modname; - bool found; int offs; modname = opaque; @@ -119,16 +118,16 @@ fbt_provide_module_function(linker_file_t lf, int symindx, if ((*instr & BTI_MASK) == BTI_INSTR) instr++; - /* Look for stp (pre-indexed) operation */ - found = false; /* * If the first instruction is a nop it's a specially marked * asm function. We only support a nop first as it's not a normal * part of the function prologue. */ if (*instr == NOP_INSTR) - found = true; - for (; !found && instr < limit; instr++) { + goto found; + + /* Look for stp (pre-indexed) or sub operation */ + for (; instr < limit; instr++) { /* * Functions start with "stp xt1, xt2, [xn, ]!" or * "sub sp, sp, ". @@ -142,14 +141,14 @@ fbt_provide_module_function(linker_file_t lf, int symindx, * past the function prologue. */ if (((*instr >> ADDR_SHIFT) & ADDR_MASK) == 31) - found = true; + break; } else if ((*instr & SUB_MASK) == SUB_INSTR && ((*instr >> SUB_RD_SHIFT) & SUB_R_MASK) == 31 && ((*instr >> SUB_RN_SHIFT) & SUB_R_MASK) == 31) - found = true; + break; } - - if (!found) +found: + if (instr >= limit) return (0); fbt = malloc(sizeof (fbt_probe_t), M_FBT, M_WAITOK | M_ZERO);