From owner-dev-commits-src-main@freebsd.org Wed Mar 3 14:29:03 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D0D6056C350 for ; Wed, 3 Mar 2021 14:29:03 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DrGb343Vvz3qdr for ; Wed, 3 Mar 2021 14:29:03 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wm1-f47.google.com with SMTP id e23so5343164wmh.3 for ; Wed, 03 Mar 2021 06:29:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=KfoTTHpSVeH7z+JopN9RXRL/LV5G+X6GVJMXIzgSJls=; b=oX2vl1d1OaCZTGPGC2NQK6xX+W+c4adeb6EYO/qy/rbDUkUI8B+ufubVXeQwQ+ZBuu d7fITF5SM/dNHTqBbrUf9NV426LFaQYLm5ZEQNsK8yXCj+/XkFk8sLlm8NrE+kS6WgPb Or3YA80y/zifIW1df3IgTKpIrVB7fuowHz/WWyFSd2L2ts9gp1ckd2nAM1So1uEgld0C nitYF3UipnTZVCIPIuh8nlLbMOy9eHdBfyiv+BvbdazPKJRsvwvOlZ3M5Q6n2VcXEHuR njWLRp2+LLFH5SIkoYaCOd40l+CZ5EXJ+kWn5Wk5TN+eQ+2lvY9nExwLcz0upCkhbI4J jjcg== X-Gm-Message-State: AOAM532wXNM0psxUcHXIsj3vzR0lIEKJECXOhQlVlN0OwILJF8f/sZL8 snpJqADgeMflksZHW8DskrD4JUsSujTXVw== X-Google-Smtp-Source: ABdhPJyguqmVXW5KwRZvV4KsuWf7Q9PkApi8Gb+F6GwFa8i95eLbsdPbvgmTJp7+eaoutNvX6+1aYQ== X-Received: by 2002:a1c:448a:: with SMTP id r132mr3138593wma.157.1614781742098; Wed, 03 Mar 2021 06:29:02 -0800 (PST) Received: from [192.168.149.251] (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id h62sm6862614wmf.37.2021.03.03.06.29.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Mar 2021 06:29:01 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: git: 28d945204ea1 - main - Handle functions that use a nop in the arm64 fbt From: Jessica Clarke In-Reply-To: <202103031426.123EQoM5082920@gitrepo.freebsd.org> Date: Wed, 3 Mar 2021 14:29:00 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202103031426.123EQoM5082920@gitrepo.freebsd.org> To: Andrew Turner X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4DrGb343Vvz3qdr X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Mar 2021 14:29:03 -0000 On 3 Mar 2021, at 14:26, Andrew Turner wrote: >=20 > The branch main has been updated by andrew: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D28d945204ea1014d7de6906af8470ed8= b3311335 >=20 > commit 28d945204ea1014d7de6906af8470ed8b3311335 > Author: Andrew Turner > AuthorDate: 2021-01-13 11:08:19 +0000 > Commit: Andrew Turner > CommitDate: 2021-03-03 14:18:03 +0000 >=20 > Handle functions that use a nop in the arm64 fbt >=20 > To trace leaf asm functions we can insert a single nop instruction = as > the first instruction in a function and trigger off this. >=20 > Reviewed by: gnn > Sponsored by: Innovate UK > Differential Revision: https://reviews.freebsd.org/D28132 > --- > sys/arm64/include/asm.h | 8 +++- > .../contrib/opensolaris/uts/common/sys/dtrace.h | 2 + > sys/cddl/dev/dtrace/aarch64/dtrace_subr.c | 5 +++ > sys/cddl/dev/fbt/aarch64/fbt_isa.c | 51 = ++++++++++++++-------- > 4 files changed, 46 insertions(+), 20 deletions(-) >=20 > diff --git a/sys/arm64/include/asm.h b/sys/arm64/include/asm.h > index 05e618500e59..32b79d256e80 100644 > --- a/sys/arm64/include/asm.h > +++ b/sys/arm64/include/asm.h > @@ -38,9 +38,15 @@ >=20 > #define _C_LABEL(x) x >=20 > +#ifdef KDTRACE_HOOKS > +#define DTRACE_NOP nop > +#else > +#define DTRACE_NOP > +#endif > + > #define LENTRY(sym) = \ > .text; .align 2; .type sym,#function; sym: \ > - .cfi_startproc > + .cfi_startproc; DTRACE_NOP > #define ENTRY(sym) = \ > .globl sym; LENTRY(sym) Doesn't this mean ENTRY incorrectly also has the nop? Jess