From owner-freebsd-virtualization@FreeBSD.ORG Wed May 21 09:57:11 2014 Return-Path: Delivered-To: freebsd-virtualization@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1AE2106 for ; Wed, 21 May 2014 09:57:11 +0000 (UTC) Received: from smtp.digiware.nl (smtp.digiware.nl [31.223.170.169]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 986A22665 for ; Wed, 21 May 2014 09:57:11 +0000 (UTC) Received: from rack1.digiware.nl (unknown [127.0.0.1]) by smtp.digiware.nl (Postfix) with ESMTP id 31A07153AC5; Wed, 21 May 2014 11:57:08 +0200 (CEST) X-Virus-Scanned: amavisd-new at digiware.nl Received: from smtp.digiware.nl ([127.0.0.1]) by rack1.digiware.nl (rack1.digiware.nl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pCx-0ArmnwOd; Wed, 21 May 2014 11:57:06 +0200 (CEST) Received: from [IPv6:2001:4cb8:3:1:5099:2185:4a0e:9ad8] (unknown [IPv6:2001:4cb8:3:1:5099:2185:4a0e:9ad8]) by smtp.digiware.nl (Postfix) with ESMTP id 92073153AC2; Wed, 21 May 2014 11:57:06 +0200 (CEST) Message-ID: <537C786E.3010106@digiware.nl> Date: Wed, 21 May 2014 11:57:02 +0200 From: Willem Jan Withagen Organization: Digiware Management b.v. User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Nils Beyer , freebsd-virtualization@freebsd.org Subject: Re: bhyve: svm (amd-v) update References: <53748481.8010108@FreeBSD.org> <537BC30C.4070208@digiware.nl> <537C5AF0.7070403@digiware.nl> <20140521093154.835069CC@hub.freebsd.org> In-Reply-To: <20140521093154.835069CC@hub.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-virtualization@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "Discussion of various virtualization techniques FreeBSD supports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 09:57:12 -0000 On 2014-05-21 11:31, Nils Beyer wrote: > Hi Willem, > > Willem Jan Withagen wrote: >> I'd be interested in the vlapic to if that helps the speed. >> But you can help me a lot if you give me the SVN commands to do what you >> described above. > > These were my steps: > > 0) mv /usr/src /usr/src.bak > > 1) svnlite co svn://svn.freebsd.org/base/projects/bhyve_svm /usr/src > > 2) cd /usr/src > > 3) patch -p4 < /tmp/bhyve_svm_HEAD_r263780.patch > > 4) svnlite merge svn://svn.freebsd.org/base/head > > one conflict in file "amdv.c" - enter "mf" (mine-full); in my previous > post, I mistakenly said "theirs-full"; what is, of course, wrong. > > 5) manually patch "amdv.c" with: > > <----------------------- SNIP -----------------------------> > Index: sys/amd64/vmm/amd/amdv.c > =================================================================== > --- sys/amd64/vmm/amd/amdv.c (revision 266491) > +++ sys/amd64/vmm/amd/amdv.c (working copy) > @@ -99,7 +99,7 @@ > } > > static void > -amd_iommu_add_device(void *domain, int bus, int slot, int func) > +amd_iommu_add_device(void *domain, uint16_t rid) > { > > printf("amd_iommu_add_device: not implemented\n"); > @@ -106,7 +106,7 @@ > } > > static void > -amd_iommu_remove_device(void *domain, int bus, int slot, int func) > +amd_iommu_remove_device(void *domain, uint16_t rid) > { > > printf("amd_iommu_remove_device: not implemented\n"); > <----------------------- SNIP -----------------------------> > > > 6) should be fine now to compile and to integrate your patches Thanx, Very helpfull... And lets see if we can get amd-v (back) up to speed as well. --WjW