From owner-freebsd-dtrace@FreeBSD.ORG Wed May 7 04:47:24 2014 Return-Path: Delivered-To: freebsd-dtrace@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 44ECA46F for ; Wed, 7 May 2014 04:47:24 +0000 (UTC) Received: from nm3-vm0.bullet.mail.bf1.yahoo.com (nm3-vm0.bullet.mail.bf1.yahoo.com [98.139.212.154]) (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 E5C6FF6A for ; Wed, 7 May 2014 04:47:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1399437634; bh=baoabwdMqgL/UD5pNO0Onq/2YgmsX9+1byFHE1qevMg=; h=Received:Received:Received:X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:X-Rocket-Received:Content-Type:Mime-Version:Subject:From:In-Reply-To:Date:Cc:Message-Id:References:To:X-Mailer; b=jhs3c32PtFAo8TdaildmG7rDIEDvgoN8ZxHs5aLYxLwuXcDd25HC6zKt28s6le0G++30VXuS7nrdlYUutDYuJAyxUZ3NXElf9fFT9dUP8VAajB4hk2mCg73yg8FsTrgStHEvuoY6W/JhloijFT/u1CL8vxq/k9ySi7zoPNWIf5DvlspyaRyTvREMshRiywtiHYDWcY/0wVIThTd0o3186UtZ2pnVn5wpB0aspUZStFBVh3zSiaeLrPhMj5uW5qmhVWkCLWQ+VcPK0gtxlt2MYVs4Z5G4Ax+oNY4CQvHszZaR5ljIR8OW8HRjxSVFpF3soOCVC5uvygFaNhZZ0GVFRg== DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s2048; d=yahoo.com; b=GFNOQMhrSUbnRhDU4xftmkmSkRW+myYkwnALN+4oWEgsv8+vmBjfk645wNqno4HGEeAS3XdSI5wjVU1dBEAcRvshHT9zFQwE+Axn78fWFi07kldmOV1DlfrDZNXRpydDImAYO2avuXyIitQ9eFbXMVyuXXWW7XcGPNYtvyRzKDzIZiya8+3Jk6JItvKIHpUoIE/sYrIn5CGoRfORW1BqMzVEkSbbwxlGuQEfX5S7mPDBan2j+R99QcAGUFDFcK+OnG/DOCOde8OSdpvcODVeZkIOXTX96re1ycsk3aF/zqBGCbONjILXcQ09kyYdwcTdCw2UTyzJclaZXPnNKut1uQ==; Received: from [66.196.81.172] by nm3.bullet.mail.bf1.yahoo.com with NNFMP; 07 May 2014 04:40:34 -0000 Received: from [98.139.213.12] by tm18.bullet.mail.bf1.yahoo.com with NNFMP; 07 May 2014 04:40:34 -0000 Received: from [127.0.0.1] by smtp112.mail.bf1.yahoo.com with NNFMP; 07 May 2014 04:40:34 -0000 X-Yahoo-Newman-Id: 394760.96618.bm@smtp112.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: zcTZSccVM1kZ._GT4eLFBM4t_tP0Y6QEAjWwtwTqNTrmYo0 AwnhOzqYdST2krURsHglfdbdANCb5T4V4HlLIp7Vw3RIxocl4.t1lVU9IM_w 7toLam3lfLZ_x8ro6PCtG5qh_l5I86Fzvqce69PRWhQh1zvfKXVcKVHGZ5O4 JF10zCbfSge528nm2BrGm40TjQ3pd4hNBSAYHGJiB_ugIUeIehTJVYXp7_i5 YLz1ZPU.qFj_lYlMs7QQ.KqeCzHfFr_KH5khskxPDx225Jt4zveWFre7.tvL MUng_bWcMfB.XVOjACMuThSjEbm3NG91.bqVf12Ilknk3mtx0G_W3hXhDmiw 9l5Nu9LoQcJB_K4gd33k3M5YNgWBrhzeaYf5khTGoI40HwFIuuiy.aE3hojy rLE6qEK6uFn5RAmVTDNd9CgmFPpSagpum5x5rxVw0xVycHPFvDECZS4CI8YA 1lV.SopMrN926WjK4oSXaVmJjmFW6ivW33k2nQK6KvDfx33L0i83dFPHCVb_ KQL6Gz9JYWtP95SQH8yIz.YjwlF0zPWJzCly4oO5g29XkDjIw0UZLT12CMyD oX_IauqnKhiHlsQlc_N9HP0J1dfPQ5nMDbv7ALVKlZgU5KdCR0i7ZE2jzOt0 r7iRabvHUc13g0C1jjRSCc1H6xLLmpoocRvTriXGh4Z5w.e2CB_KKsbyuyQ- - X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf X-Rocket-Received: from [192.168.0.101] (pfg@190.157.126.109 with plain [98.138.105.21]) by smtp112.mail.bf1.yahoo.com with SMTP; 06 May 2014 21:40:34 -0700 PDT Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) Subject: Re: Importing the latest dis_tables.c From: Pedro Giffuni In-Reply-To: Date: Tue, 6 May 2014 23:40:30 -0500 Message-Id: <86D6EFA1-6636-462C-891F-CCEDC252B86F@freebsd.org> References: <5369A19B.9080505@freebsd.org> To: Peter Grehan X-Mailer: Apple Mail (2.1874) Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.18 Cc: "freebsd-dtrace@freebsd.org" X-BeenThere: freebsd-dtrace@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "A discussion list for developers working on DTrace in FreeBSD." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2014 04:47:24 -0000 Il giorno 06/mag/2014, alle ore 23:00, Mark Johnston = ha scritto: > On Tue, May 6, 2014 at 10:59 PM, Peter Grehan = wrote: >> Hi, >>=20 >> I'd like to pull in the latest version of dis_tables.c from = illumos-gate to >> pick up the recent work done there. This is mainly for using dtrace = on the >> bhyve kernel module since it can decode VT-x/SVM instructions, but is >> probably generally useful. >>=20 >>=20 >> = http://src.illumos.org/source/history/illumos-gate/usr/src/common/dis/i386= /dis_tables.c >>=20 >> What's the process for this ? Should I pull this into = vendor/illumos-sys, >> or just drop it directly into FreeBSD (which is what the previous = commits >> seemed to do) ? Any tips ? >=20 > FWIW, vendor-sys/illumos is merged to sys/cddl/opensolaris, but in > FreeBSD, dis_tables.c lives at sys/cddl/dev/dtrace/x86/dis_tables.c > for some reason. That is, it's not under the merge target, so merging > from vendor-sys/illumos might not be possible without first moving > dis_tables.{c,h} to sys/cddl/opensolaris/common/dis. >=20 > I think that's at least part of the reason dis_tables.c has been > updated directly in the past, so I don't think it would be problematic > to keep doing it that way until dis_tables.{c,h} are moved (assuming > that that's sufficient to start merging them from vendor-sys). I'm not > 100% sure of this though. >=20 Hmm =85 we have indeed been sloppy when merging DTrace stuff into the = tree: I can=92t seem to find that file in the vendor-sys area. It looks = like that file was just added, instead of copied from the vendor area. Looking at our history (before the file was moved) and comparing to the = illumos history: = http://src.illumos.org/source/history/illumos-gate/usr/src/common/dis/i386= /dis_tables.c It appears the last merge to that file that we brought is the AVX = support from Aug 2010 (this was still OpenSolaris): ab47273fedff893c8ae22ec39ffc666d4fa6fc8b (I so much hate git for using = checksums instead of revisions!) So you would have to bring at least 3 more illumos revisions up to the = one in Sept 2011. One of them brings their Dtrace support for KVM which = is interesting but you may not want it at this time. Perhaps these are the changes you need: = http://src.illumos.org/source/diff/illumos-gate/usr/src/common/dis/i386/di= s_tables.c?r1=3D/illumos-gate/usr/src/common/dis/i386/dis_tables.c@7aa76ff= c594f84c1c092911a84f85a79ddb44c73&r2=3D/illumos-gate/usr/src/common/dis/i3= 86/dis_tables.c@70dc7639cedb77623859b80d3b9e9b266e89c15f&format=3Du&full=3D= 0 Although not elegant, just bringing the patch would seem easier that = going through the vendor branch :( Pedro.=