From owner-svn-src-all@FreeBSD.ORG Tue Dec 23 16:06:27 2014 Return-Path: Delivered-To: svn-src-all@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 C87ED49B; Tue, 23 Dec 2014 16:06:27 +0000 (UTC) Received: from mail-ie0-x229.google.com (mail-ie0-x229.google.com [IPv6:2607:f8b0:4001:c03::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8A4EE64D13; Tue, 23 Dec 2014 16:06:27 +0000 (UTC) Received: by mail-ie0-f169.google.com with SMTP id y20so6296532ier.28; Tue, 23 Dec 2014 08:06:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=AaB8XjV16J9b+jG9w3s0gNrtNRFhFISCTez//B1mwwE=; b=iraSceAGaFBUTxLKmZLDSkvk44/1UpVZMVWvSTkaEhy7REW5hexMYbq4CisqTH3ss7 eOglirTFXey59netV4/qBlM5IhR6dwE87SD6QPc+dzX4HPlh/yapCDlOZEd5bbMEgLbV VSzIlRMXKKsRFhZTB6+zQjZgYkrQyuiSPUTMP+vDI4wLgTrfVeqAOZYa57Uts0aJLvsq Q/BaOB3EXc6wQ4LXvStelANcsyOxmpyxKcyAaS/T5CC8/PUDoM7KsRkpESDwtk5kYFWk gp0hQyZgzjpbZumrWA2U2KXkFnhvgyOJ2+IgiKuW8ekQWtXg0L9cWfkwS2HvbsU1NEa+ Oh8w== X-Received: by 10.107.5.7 with SMTP id 7mr26369996iof.1.1419350786794; Tue, 23 Dec 2014 08:06:26 -0800 (PST) Received: from charmander.home (TOROON0812W-LP130-04-1279423115.dsl.bell.ca. [76.66.114.139]) by mx.google.com with ESMTPSA id kv4sm6471196igb.13.2014.12.23.08.06.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Dec 2014 08:06:25 -0800 (PST) Sender: Mark Johnston Date: Tue, 23 Dec 2014 08:05:47 -0800 From: Mark Johnston To: Ian Lepore 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 Message-ID: <20141223160423.GA24447@charmander.home> References: <201412231538.sBNFcKrx091251@svn.freebsd.org> <1419349557.1018.134.camel@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1419349557.1018.134.camel@freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Dec 2014 16:06:27 -0000 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. -Mark