From owner-svn-src-head@FreeBSD.ORG Mon Dec 29 00:35:48 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BD8A3807; Mon, 29 Dec 2014 00:35:48 +0000 (UTC) Received: from vps.hungerhost.com (vps.hungerhost.com [216.38.53.176]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 68BAE644F9; Mon, 29 Dec 2014 00:35:48 +0000 (UTC) Received: from pool-96-250-5-187.nycmny.fios.verizon.net ([96.250.5.187]:51872 helo=[172.16.19.1]) by vps.hungerhost.com with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.82) (envelope-from ) id 1Y5OJF-0003Xb-S9; Sun, 28 Dec 2014 19:35:46 -0500 From: "George Neville-Neil" To: "Mark Johnston" Subject: Re: svn commit: r276142 - in head/sys: amd64/amd64 cddl/dev/dtrace/amd64 cddl/dev/dtrace/i386 cddl/dev/dtrace/mips cddl/dev/dtrace/powerpc i386/i386 mips/mips powerpc/aim sys Date: Sat, 27 Dec 2014 20:00:39 -1000 Message-ID: In-Reply-To: <20141223160423.GA24447@charmander.home> References: <201412231538.sBNFcKrx091251@svn.freebsd.org> <1419349557.1018.134.camel@freebsd.org> <20141223160423.GA24447@charmander.home> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Mailer: MailMate (1.8r5029) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vps.hungerhost.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - neville-neil.com X-Get-Message-Sender-Via: vps.hungerhost.com: authenticated_id: gnn@neville-neil.com Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Ian Lepore X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Dec 2014 00:35:48 -0000 On 23 Dec 2014, at 6:05, Mark Johnston wrote: > On Tue, Dec 23, 2014 at 08:45:57AM -0700, Ian Lepore wrote: >> On Tue, 2014-12-23 at 15:38 +0000, Mark Johnston wrote: >>> Author: markj >>> Date: Tue Dec 23 15:38:19 2014 >>> New Revision: 276142 >>> URL: https://svnweb.freebsd.org/changeset/base/276142 >>> >>> Log: >>> Restore the trap type argument to the DTrace trap hook, removed in >>> r268600. >>> It's redundant at the moment since it can be obtained from the >>> trapframe >>> on the architectures where DTrace is supported, but this won't be >>> the case >>> with ARM. >>> >>> Modified: >>> head/sys/amd64/amd64/trap.c >>> head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c >>> head/sys/cddl/dev/dtrace/i386/dtrace_subr.c >>> head/sys/cddl/dev/dtrace/mips/dtrace_subr.c >>> head/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c >>> head/sys/i386/i386/trap.c >>> head/sys/mips/mips/trap.c >>> head/sys/powerpc/aim/trap.c >>> head/sys/sys/dtrace_bsd.h >>> >> >> Wouldn't it have been easier to just add the field to the trapframe >> for >> arm? iirc we have an unused padding field in the struct already just >> for ABI alignment, it could go there. > > In this case, the extra argument will be the fault address AND'ed with > FAULT_TYPE_MASK, and the hook is only potentially called in the data > abort > handler, so this extra field would be unused for other exceptions (and > unused for data aborts unless DTrace is active). Maybe that's ok, but > restoring the extra hook argument seemed like a less intrusive way to > go > to me. > Actually I have re-patched my tree with the code from Howard Su, put on top of the work by Mark et al. I took the comment in the review to heart and added the type to the trapframe for ARM. I'm happy to go either way, though. It's trivial to change it to work with this. Best, George