From owner-dev-commits-src-main@freebsd.org Wed Mar 3 14:37:04 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 E624A56C787 for ; Wed, 3 Mar 2021 14:37:04 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 4DrGmJ2D2Gz3rKn for ; Wed, 3 Mar 2021 14:37:04 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wr1-f41.google.com with SMTP id d15so8697587wrv.5 for ; Wed, 03 Mar 2021 06:37:04 -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=Id9pCmCMHJWrTFKmTl/PJsb404xFqRp4IlA8syhA+84=; b=dK0qtj5yjmuUsWcAbMOSYUPE373PAYVkI0RR+6+AkY1VL+9sXaTEPEOEPib7JlhLLH yQuKEik8UaTB/8PFygADimY2mGdCKuazqM3HTT3ar04D/c1crRUCM3g4CNRw6IGUjP4O zCnTYMGXBbV3HdfgYiWxuB6VvlkfTt/Ol1HibdO0U9UIj5MRAJDYkcI1dTjb9DhmGwEe Bf5qBC/HzCvAshZz1qdJdLyIQQp7MLHjNteDSYGIhfeNJEZZFr4/INtij4Dzo3yg/Rtq bKVDEjfSzLtZ3ikb9kvbYUTFAHdiqd2ZObhLqNbI8hrBh3vzQHkB8Z9TKFwBtp9Ox3wt dADQ== X-Gm-Message-State: AOAM533NdgNMJGvbjst4v0J7hAITzn3wXDQQRHpRKPX1mmbvAIMEhgHD gEWc0+NJwiG2RVhzLRWatlkSrg== X-Google-Smtp-Source: ABdhPJxI0IEse/bqzqQFxDaI7mR5892YT3IpyHxRo6Ihz5wXRExwoPx3MxZiFHy7TS8w1fg/sxirvg== X-Received: by 2002:adf:e485:: with SMTP id i5mr3626325wrm.26.1614782222840; Wed, 03 Mar 2021 06:37: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 q25sm5978816wmq.15.2021.03.03.06.37.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Mar 2021 06:37:02 -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: Date: Wed, 3 Mar 2021 14:37:01 +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: 4DrGmJ2D2Gz3rKn X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.50 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.221.41:from]; FREEFALL_USER(0.00)[jrtc27]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[209.85.221.41:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.41:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.41:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-main] 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:37:05 -0000 On 3 Mar 2021, at 14:29, Jessica Clarke wrote: > 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) >=20 > Doesn't this mean ENTRY incorrectly also has the nop? Hm, right, the L in LENTRY means local not leaf. Isn't this a problem though? (L)ENTRY are perfectly legal to use for non-leaf assembly functions today. Shouldn't there be separate ones specifically for leaf functions if you want to treat them differently? Jess