From nobody Tue Oct 10 13:42:23 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 4S4cXH3h9Xz4wmmV; Tue, 10 Oct 2023 13:42:23 +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 4S4cXH3GRlz4KSn; Tue, 10 Oct 2023 13:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696945343; 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=Bbem8sUYqDtB9qoAFYdAwJ9I92WDlc4O1MKO9L1Rf+k=; b=IiIxhGbynU7pp/CKz1ZBw5o+xu5Jg4BgKkp/c3K3L5LHajJy3IZV4a6IESUswwi+kaVLkM iBFisAWMb1Eu7upuNYhQ5+pI2Qzv8hfhy5kH7/lMckcPclYQM8ntba7oEs12f532Dz+Hto /SXBySlvtfHHEhJIfVHFzwygmJUr+AeBeTYCxzYy5CYtX+8Lj1zptmqKo75VdAut8lOVPu pt/zg6qcpHrTFdVEj6f/Qa1JrtVEQMXXKPUhj1aOfMD9prBZlLgvanjGxTIh+UcwHFzQ+J 6p0gOL5PzBz3qafq0OPpjXzTjowZUMGBkMLFaHMCtpnf0OMr6pu343ylpO5F6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696945343; a=rsa-sha256; cv=none; b=CJAF5koguFhPaSaF2auYhVATyejRqK4SkCbe1c/ZPmjjlsdJOC7PndJ9Iv49UeY8VkSuDt UyBrJ02GEWewCul3eLCzsr6Z8XADNiMbJlvP29y9Cs1QA9Apyw1ORvWn2hEpc62SzVA0Nx 2ljYvsn7UetPDISzjCl/1Y9BADrRW+ebhPdKe6num/qkq6THH6OYenyp40jM45KW0iZfX9 XhVxdAYBNYv1pyCSBmlzgRGzVs8jB2rkzBfDGBlvoWwAqR89Bi3ZY/z6cMcpqpeoUqY0KF wClAyBe9Zwi994Iy9VZFSLi7trF7XH+IJcyHtJHeQSObaDT4SAajKP9T4hqw0w== 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=1696945343; 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=Bbem8sUYqDtB9qoAFYdAwJ9I92WDlc4O1MKO9L1Rf+k=; b=leFmjiZvpRAy2CWLUCKjo4ykQ5IENfdnkwD9WNKaTAKfvpJ4utLXQ6XGdBhMZWRh3uEJNL d9YIP17eIRkQaizZAMXEf4N4XkvFFOoTbpeINg5T6uIIFhrysDxoRHy1ahVk770dohREWv BDAueADfIDtqGdu9FBZR5u1XBKrZJr3l3U6DmjirbXNPoxmuZxV9MeMHS5/K7cN9jl+Tr2 yFPSOt+dHXI7YKFdy5jo6uvLph8+zE+QIX5um1OlL/SQl7UDrafGDJ7q3axtzSkwN+n6V0 5EIofZmh36D1wqtGGdaEMWsX8JeHBlIc7zX/NUCbkiaMpgrcRgcm+Fpw06/8FA== 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 4S4cXH2KPBzh1M; Tue, 10 Oct 2023 13:42:23 +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 39ADgNgH021467; Tue, 10 Oct 2023 13:42:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39ADgNXE021464; Tue, 10 Oct 2023 13:42:23 GMT (envelope-from git) Date: Tue, 10 Oct 2023 13:42:23 GMT Message-Id: <202310101342.39ADgNXE021464@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: 2ba605f32ac3 - stable/14 - dtrace: fix fbt regression for aarch64 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2ba605f32ac3c673ef0f0bee810a2696f1887488 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2ba605f32ac3c673ef0f0bee810a2696f1887488 commit 2ba605f32ac3c673ef0f0bee810a2696f1887488 Author: Igor Ostapenko AuthorDate: 2023-10-03 16:48:00 +0000 Commit: Mark Johnston CommitDate: 2023-10-10 13:41:39 +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 (cherry picked from commit b4db386f9fa7be9668aa09d14b0bbd048a7a7e89) --- 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);