From nobody Wed Jan 29 03:14:36 2025 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 4YjS1t6N46z5lgQs; Wed, 29 Jan 2025 03:14:42 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjS1t3Wvzz40S0; Wed, 29 Jan 2025 03:14:42 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x829.google.com with SMTP id d75a77b69052e-467725245a2so61832861cf.3; Tue, 28 Jan 2025 19:14:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738120480; x=1738725280; darn=freebsd.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=ztLVgZSIQS9LvYUuh73yQNmbEcy+aM7QKfTN8zFkJI0=; b=MEYc145131pzJlps4KmtGQx8SSzbyuE25RNN1NirwkNbP8Tn3feB2QS7spoxr3KKqF BfD6LbgSiwxj9iMSevKLrqJioyhPSVkDwOpx7WMuW/NfEEz2/mbZMH+XmFKrySmvy0MT D/lc4GrBYcY6Pip+T0jXLB10p6APakra7SfynITgvhCW3WnJTPRSP6JTZ6T6HHnFxQg5 fmMj+TBB+ud9UBMjg6Wmwow+yhxzB9E/ifT7pT/GW2SdfsxCa07yDeVLKcbyueeN3wRS gogSPBDOBcyqH0/rGxkPKZ0Qu4hiaKjaO7Q+AUCk09qhhfis/YpyYruc8+kovqVSO582 dYnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738120480; x=1738725280; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ztLVgZSIQS9LvYUuh73yQNmbEcy+aM7QKfTN8zFkJI0=; b=Uz4XEu4iJ8/BZJz79e9Jshz3G3+9Pg01bmGpB2li8GPyLWXywbi6fnSeLsmpTUqIk7 RT5uIIaayDrikIH5fZtvqgdVpvzcs1a0JMyYXZpRjEfP2O/xJ9hQdIPKXwV+ijmFwNws PKQ8Hbcuh45kyiy/Tg7HC7ikujjtpdWVHoHShxqlxh1iSOkpgQRy7bHgJ1EMZW5Kp/AL zXhHRCgJaRsid6Vf4ShAL/4LMTtGLs5TRJi8d6+UzlR4w4c0kcMONl5QlmCMIILHeO4a WwkVc434NJF55iheWKNo9nPKtV7v6Hy/PQDAV7e1u7bBFykcbrSZgkNQaUdsUwUUquo2 jtZw== X-Forwarded-Encrypted: i=1; AJvYcCUjkyRXd5/qfkyrMw6bVzga4Bs/s38AhJIXgn/RQ2lVkKEZnNg5kwG1QRqRkZ4F0mmqeuShXtrwJVFF5zT1mdHSGaOp@freebsd.org, AJvYcCVi1aMNmF8be+0B/lJwX7t2cvufkmXauU1xPUB2Wfv0JEZzJaUs7YDcUAGQfMSSJ113VLDUrLtFret8KXn9Ev4xxPUx4eI=@freebsd.org X-Gm-Message-State: AOJu0Ywz808LvCwPRzAD9gkk+w3m+oX4qeZZaUgEIjDyjpvEWdooec32 Az8Wwvh1Ybk39aBuReWb2fNx0dq1u5hOlPA7pJMV0zB/ZBYl8GfoZNQQpw== X-Gm-Gg: ASbGncsnX1vXPq7ZEF7csTd7GtIkyi6za7RXpHnPsfdWprbjIAqVtTEhItjvI8JHxSE J0V+M/4qRqlHnOLjfFXYHidv+gAftbZ6cvCXcJ6wGWpqSGOIFFJ5ethKPUd4PYT+bcNwY1c9iqv m3L+9N8T4GZ7t9PUYIL6JLZauZewZaXVBbZi4lskiDtFxbpCKdg5O1Tmty+bP0u92pOyS2HEsoT 9UsoIWtxzmlubJ3zgJulFymwE3rQb/q7S0bB20xgTOjd3eN1QbOBU56AOYM5+mtpppBbaQuy8qF zqwf1Epf78LdCywYqhMySRFWnnVn6lFog5TTWgj2 X-Google-Smtp-Source: AGHT+IEeDAwZujCoIeUoe3fEYbpuFdcs64CjlcsAQg9HvayRlZ6qMlpC13/rCTNVqRyU14M3nmzc1g== X-Received: by 2002:a05:6214:4188:b0:6d8:8a8f:75b0 with SMTP id 6a1803df08f44-6e243bb8863mr28233506d6.14.1738120480299; Tue, 28 Jan 2025 19:14:40 -0800 (PST) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e2057a890fsm51304076d6.88.2025.01.28.19.14.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2025 19:14:38 -0800 (PST) Date: Tue, 28 Jan 2025 22:14:36 -0500 From: Mark Johnston To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 70c067062217 - main - dtrace/arm64: Simplify dtrace_getarg() slightly Message-ID: References: <202501290221.50T2LXRS006289@gitrepo.freebsd.org> <8086E5AF-1350-47D8-9010-6DFFFF7FA8D3@freebsd.org> 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <8086E5AF-1350-47D8-9010-6DFFFF7FA8D3@freebsd.org> X-Rspamd-Queue-Id: 4YjS1t3Wvzz40S0 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] On Wed, Jan 29, 2025 at 03:06:20AM +0000, Jessica Clarke wrote: > On 29 Jan 2025, at 02:21, Mark Johnston wrote: > > > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=70c067062217a5295ed321427b91cfd857c18b77 > > > > commit 70c067062217a5295ed321427b91cfd857c18b77 > > Author: Mark Johnston > > AuthorDate: 2025-01-29 01:05:03 +0000 > > Commit: Mark Johnston > > CommitDate: 2025-01-29 01:05:03 +0000 > > > > dtrace/arm64: Simplify dtrace_getarg() slightly > > > > The use of memcpy here is redundant, and also incorrect since memcpy() > > might be instrumented by fbt or kinst. dtrace_bcopy() exists, but we > > don't need it. > > > > MFC after: 2 weeks > > Sponsored by: Innovate UK > > --- > > sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 4 +--- > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c > > index ff0e068006bd..3e36004c6f0d 100644 > > --- a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c > > +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c > > @@ -256,7 +256,6 @@ dtrace_getarg(int arg, int aframes __unused) > > return (tf->tf_x[arg]); > > } else { > > uintptr_t p; > > - uint64_t val; > > > > p = (tf->tf_sp + (arg - 8) * sizeof(uint64_t)); > > if ((p & 7) != 0) { > > @@ -269,8 +268,7 @@ dtrace_getarg(int arg, int aframes __unused) > > cpu_core[curcpu].cpuc_dtrace_illval = p; > > return (0); > > } > > - memcpy(&val, (void *)p, sizeof(uint64_t)); > > - return (val); > > + return (p); > > Doesn’t this change from dereferencing p to returning it? Surely p > should be a uint64_t * that is dereferenced? Yes, thank you, that was a stupid mistake on my part. I reverted it for now and will fix the problem properly tomorrow.